Merge branch '86Box:master' into master

CMakeLists.txt

@@ -36,7 +36,7 @@ if(MUNT_EXTERNAL)
 endif()
 
 project(86Box
-    VERSION 5.2
+    VERSION 6.0
     DESCRIPTION "Emulator of x86-based systems"
     HOMEPAGE_URL "https://86box.net"
     LANGUAGES C CXX)

README-UNIX-MODE-WITH-OSD.txt

@@ -0,0 +1,78 @@
+UNIX MODE WITH OSD
+
+86Box supports running on the linux framebuffer without QT and without X, making the pc appear as a nearly native old machine.
+
+running it that way is already supported but when doing it, 86box loses all menu and all abilities to mount floppies and CDs, it also becomes the owner of the entire pc with no way of quitting it or changing virtual console.
+
+to overcome this, an on screen display menu is available that allows doing everything the textual console (src/unix/unix.c) does;
+mount/unmount all supported media like floppy and cd
+hard reset the machine
+quit 86box
+seeing the current performance %
+
+key bindings:
+Right Control + F11 opens the osd
+
+while is open:
+arrows up, down moves the cursor
+enter does the action, at mount options it enters a list of appropriate files (*.img, *.iso)
+ESC goes back to main or closes the OSD
+
+current limitations:
+	OSD can mount images to first floppy and first cd, secondary devices are not supported
+	it does not show if an image is mounted or not
+	the option "version" does actully print it, but it can't be seen beacuse its printed under 86box display
+	extremely long filenames can overflow the blue window
+	the title does actually overflow the window width :)
+
+These are the steps to install a machine fully dedicated to 86Box and tuned to make it appear almost native.
+This works almost the same for on a Raspberry Pi
+
+
+1) install a vanilla Debian Trixie with netinst and without any graphical environment, or a "server" distro for RPI
+   depending on the machine speed, this will make boot time extremely short
+
+2) apt update if necessary
+
+3) install git and almost all required packages
+	apt install git build-essential cmake extra-cmake-modules pkg-config ninja-build libfreetype-dev libsdl2-dev libpng-dev libopenal-dev librtmidi-dev libfluidsynth-dev libsndfile1-dev libserialport-dev libevdev-dev libxkbcommon-dev libxkbcommon-x11-dev libslirp-dev
+	
+4) setup git and clone
+	git@github.com:86Box/86Box.git
+	git@github.com:86Box/roms.git
+
+5) build (128 => super speed, too much for a 2GB machine)
+	cd 86Box
+	mkdir build
+	cd build
+	cmake .. --preset regular -D QT=OFF -D PREFER_STATIC=ON
+	cmake --build regular -j 128
+	cd ../../
+	ln -s 86Box/build/regular/src/86Box 86Box.exe
+	
+6) boot
+	as root so it can take complete ownership of the linux framebuffer
+
+7) notes:
+- 86Box will complain to be unable to find readline, this is fine, we don't need the command line at all
+- ALSOFT will complain it can't connect to PipeWire, no problem, sounds will come from standard ALSA
+
+8) additional steps
+	add a new udev rule to automount any USB key to a known location so files in it can be listed in the OSD floppy/cd mount options
+
+	create /etc/udev/rules.d/99-automount.rules
+
+	with:
+	ACTION=="add", ENV{ID_BUS}=="usb", ENV{ID_TYPE}=="disk", ENV{ID_FS_TYPE}=="exfat", RUN+="/usr/bin/systemd-mount --no-block --automount=yes --collect /dev/%k '/mnt'"
+
+	replicate this line for each filesystem you expect the usb key to be formatted, in this example "exfat"
+	this is going to conflict if multiple keys are inserted, don't do it
+
+final step
+	configure some 86box vm using another pc with the GUI
+	copy the VM definitions to this new pc and manually launch 86box from the textual command line
+	optionally craft a boot menu to be shown in place of the login prompt or setup 86box as a debiasn service, it will start at boot
+	just make sure the pc will be accessible via ssh or some other way, autobooting 86box canà make difficult terminating it
+
+
+

bumpversion.sh

@@ -43,23 +43,33 @@ pretty_date() {
 
 # Patch files.
 patch_file() {
-	# Stop if the file doesn't exist.
-	[ ! -e "$1" ] && return
+	# Parse arguments.
+	desc="$1"
+	shift
+	pattern="$1"
+	shift
 
-	# Patch file.
-	if sed -i -r -e "$3" "$1"
-	then
-		echo "[-] Patched $2 on $1"
-	else
-		echo "[!] Patching $2 on $1 failed"
-	fi
+	# Patch the specified files.
+	for file in "$@"
+	do
+		# Skip file if it doesn't exist.
+		[ ! -e "$file" ] && continue
+
+		# Patch file.
+		if sed -i -r -e "$pattern" "$file"
+		then
+			echo "[-] Patched $desc in $file"
+		else
+			echo "[!] Patching $desc in $file failed"
+		fi
+	done
 }
-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/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'/'
-patch_file src/unix/assets/*.spec 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/'
-patch_file src/unix/assets/*.metainfo.xml release 's/(<release version=")[^"]+(" date=")[^"]+/\1'"$newversion"'\2'"$(date +%Y-%m-%d)"'/'
-patch_file debian/changelog 'changelog date' 's/>  .+/>  '"$(date -R)"'/'
-patch_file debian/changelog 'changelog version' 's/86box \(.+\)/86box \('"$newversion"'\)/'
+patch_file VERSION 's/^(\s*VERSION ).+/\1'"$newversion"'/' CMakeLists.txt
+patch_file version-string 's/(^\s*"version-string"\s*:\s*")[^"]+/\1'"$newversion"'/' vcpkg.json
+patch_file Version 's/(Version:\s+)[0-9].+/\1'"$newversion"'/' src/unix/assets/*.spec
+patch_file '%global romver' 's/(^%global\ romver\s+)[^\s]+/\1'"$romversion"'/' src/unix/assets/*.spec
+patch_file 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/' src/unix/assets/*.spec
+patch_file 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/' src/unix/assets/*.spec
+patch_file release 's/(<release version=")[^"]+(" date=")[^"]+/\1'"$newversion"'\2'"$(date +%Y-%m-%d)"'/' src/unix/assets/*.metainfo.xml
+patch_file 'changelog date' 's/>  .+/>  '"$(date -R)"'/' debian/changelog
+patch_file 'changelog version' 's/86box \(.+\)/86box \('"$newversion"'\)/' debian/changelog

debian/changelog

@@ -1,5 +1,5 @@
-86box (5.2) UNRELEASED; urgency=medium
+86box (6.0) UNRELEASED; urgency=medium
 
   * Bump release.
 
- -- Jasmine Iwanek <jriwanek@gmail.com>  Thu, 18 Sep 2025 04:25:57 +0200
+ -- Jasmine Iwanek <jriwanek@gmail.com>  Sun, 26 Oct 2025 17:41:47 +0100

src/86box.c

@@ -1083,7 +1083,10 @@ usage:
     /* 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);
+        // avoid strcpy global_cfg_path over itself (valgrind says it's bad...)
+        // path_append_filename(global_cfg_path, global_cfg_path, GLOBAL_CONFIG_FILE);
+        path_slash(global_cfg_path);
+        strcat(global_cfg_path, GLOBAL_CONFIG_FILE);
     } else {
         strncpy(global_cfg_path, global, sizeof(global_cfg_path) - 1);
     }

src/config.c

@@ -339,6 +339,7 @@ load_machine(void)
         { .old = "infinia7200", .new = "tc430hx", .new_bios = "infinia7200" },
         { .old = "dellvenus", .new = "vs440fx", .new_bios = "dellvenus" },
         { .old = "gw2kvenus", .new = "vs440fx", .new_bios = "gw2kvenus" },
+        { .old = "lgibmx7g", .new = "ms6119", .new_bios = "lgibmx7g" },
         { 0 }
     };
 
@@ -1501,7 +1502,7 @@ load_floppy_and_cdrom_drives(void)
         sprintf(temp, "cdrom_%02i_type", c + 1);
         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);
+        int cdrom_type = cdrom_get_from_internal_name(!strcmp(p, "goldstar") ? "goldstar_r560b" : p);
         if (cdrom_type == -1) {
             cdrom_type = cdrom_get_from_name(p);
             if (cdrom_type == -1)

src/device.c

@@ -396,143 +396,69 @@ device_available(const device_t *dev)
     return ret;
 }
 
-uint8_t
-device_get_bios_type(const device_t *dev, const char *internal_name)
+static const device_config_bios_t *
+device_get_bios(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->bios_type;
-                        bios++;
-                    }
+        while (config && (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 ROMs 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;
+                    bios++;
                 }
-                config++;
+
+                /* Unknown value, fall back to the default ROMs. */
+                if (strcmp(internal_name, config->default_string))
+                    return device_get_bios(dev, config->default_string);
             }
+            config++;
         }
     }
 
-    return 0;
+    return NULL;
+}
+
+uint8_t
+device_get_bios_type(const device_t *dev, const char *internal_name)
+{
+    const device_config_bios_t *bios = device_get_bios(dev, internal_name);
+    return bios ? bios->bios_type : 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;
+    const device_config_bios_t *bios = device_get_bios(dev, internal_name);
+    return bios ? bios->files_no : 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;
+    const device_config_bios_t *bios = device_get_bios(dev, internal_name);
+    return bios ? bios->local : 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++;
-                    }
-                }
-                config++;
-            }
-        }
-    }
-
-    return 0;
+    const device_config_bios_t *bios = device_get_bios(dev, internal_name);
+    return bios ? bios->size : 0;
 }
 
 const char *
-device_get_bios_file(const device_t *dev, const char *internal_name, int file_no)
+device_get_bios_file(const device_t *dev, const char *internal_name, unsigned int file_no)
 {
-    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)) {
-                            if (file_no < bios->files_no)
-                                return bios->files[file_no];
-                            else
-                                return NULL;
-                        }
-                        bios++;
-                    }
-                }
-                config++;
-            }
-        }
-    }
-
-    /* A NULL device is never available. */
-    return (NULL);
+    const device_config_bios_t *bios = device_get_bios(dev, internal_name);
+    return (bios && (file_no < bios->files_no)) ? bios->files[file_no] : NULL;
 }
 
 int

src/game/joystick_standard.c

@@ -235,6 +235,26 @@ joystick_standard_read_axis_2axis(UNUSED(void *priv), int axis)
     }
 }
 
+static int
+joystick_standard_read_axis_2axis_t1t2wa(UNUSED(void *priv), int axis)
+{
+    uint8_t gp = 0;
+
+    if (!JOYSTICK_PRESENT(gp, 0))
+        return AXIS_NOT_PRESENT;
+
+    switch (axis) {
+        case 0:
+            return joystick_state[gp][0].axis[0];
+        case 2:
+            return joystick_state[gp][0].axis[1];
+        case 1:
+        case 3:
+        default:
+            return 0;
+    }
+}
+
 #if 0
 // For later use
 static int
@@ -392,7 +412,7 @@ joystick_standard_a0_over(UNUSED(void *priv))
 }
 
 const joystick_t joystick_generic_paddle = {
-    .name          = "Generic Paddle Controller(s)",
+    .name          = "Generic paddle controller(s)",
     .internal_name = "generic_paddle",
     .init          = joystick_standard_init,
     .close         = joystick_standard_close,
@@ -825,7 +845,7 @@ const joystick_t joystick_4button_yoke_throttle = {
 };
 
 const joystick_t joystick_steering_wheel_2_button = {
-    .name          = "Steering Wheel (3-axis, 2-button)",
+    .name          = "Steering wheel (3-axis, 2-button)",
     .internal_name = "steering_wheel_2_button",
     .init          = joystick_standard_init,
     .close         = joystick_standard_close,
@@ -843,7 +863,7 @@ const joystick_t joystick_steering_wheel_2_button = {
 };
 
 const joystick_t joystick_steering_wheel_3_button = {
-    .name          = "Steering Wheel (3-axis, 3-button)",
+    .name          = "Steering wheel (3-axis, 3-button)",
     .internal_name = "steering_wheel_3_button",
     .init          = joystick_standard_init,
     .close         = joystick_standard_close,
@@ -861,7 +881,7 @@ const joystick_t joystick_steering_wheel_3_button = {
 };
 
 const joystick_t joystick_steering_wheel_4_button = {
-    .name          = "Steering Wheel (3-axis, 4-button)",
+    .name          = "Steering wheel (3-axis, 4-button)",
     .internal_name = "steering_wheel_4_button",
     .init          = joystick_standard_init,
     .close         = joystick_standard_close,
@@ -879,7 +899,7 @@ const joystick_t joystick_steering_wheel_4_button = {
 };
 
 const joystick_t joystick_tm_formula_t1t2 = {
-    .name          = "Thrustmaster Formula T1/T2 with Adaptor",
+    .name          = "Thrustmaster Formula T1/T2 with adapter",
     .internal_name = "thrustmaster_formula_t1t2",
     .init          = joystick_standard_init,
     .close         = joystick_standard_close,
@@ -898,19 +918,19 @@ const joystick_t joystick_tm_formula_t1t2 = {
 
 // TODO Validate this
 const joystick_t joystick_tm_formula_t1t2wa = {
-    .name          = "Thrustmaster Formula T1/T2 without Adaptor",
+    .name          = "Thrustmaster Formula T1/T2 without adapter",
     .internal_name = "thrustmaster_formula_t1t2wa",
     .init          = joystick_standard_init,
     .close         = joystick_standard_close,
     .read          = joystick_standard_read_4button,
     .write         = joystick_standard_write,
-    .read_axis     = joystick_standard_read_axis_3axis,
+    .read_axis     = joystick_standard_read_axis_2axis_t1t2wa,
     .a0_over       = joystick_standard_a0_over,
-    .axis_count    = 3,
+    .axis_count    = 2,
     .button_count  = 4,
     .pov_count     = 0,
     .max_joysticks = 1,
-    .axis_names    = { "Steering axis", "Accelerator axis", "Brake axis" },
+    .axis_names    = { "Steering axis", "Accelerator/Brake axis" },
     .button_names  = { "Shifter Up", "Shifter Down", "Top Console Switch", "Bottom Console Switch" },
     .pov_names     = { NULL }
 };

src/include/86box/device.h

@@ -213,7 +213,7 @@ extern uint8_t     device_get_bios_type(const device_t *dev, const char *interna
 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 const char *device_get_bios_file(const device_t *dev, const char *internal_name, unsigned int file_no);
 
 extern int device_is_valid(const device_t *, int mch);
 

src/include/86box/machine.h

@@ -971,9 +971,9 @@ extern const device_t  p54tp4xe_device;
 extern int             machine_at_p54tp4xe_init(const machine_t *);
 extern int             machine_at_exp8551_init(const machine_t *);
 #ifdef EMU_DEVICE_H
-extern const device_t hpvectravexxx_device;
+extern const device_t vectra52_device;
 #endif
-extern int             machine_at_hpvectravexxx_init(const machine_t *);
+extern int             machine_at_vectra52_init(const machine_t *);
 extern int             machine_at_vectra500mt_init(const machine_t *);
 extern int             machine_at_vectra54_init(const machine_t *);
 #ifdef EMU_DEVICE_H

src/include/86box/sound.h

@@ -177,6 +177,8 @@ extern const device_t sb_awe64_ide_device;
 extern const device_t sb_awe64_gold_device;
 
 /* Crystal CS423x */
+extern const device_t cs4232_device;
+extern const device_t cs4232_onboard_device;
 extern const device_t cs4235_device;
 extern const device_t cs4235_onboard_device;
 extern const device_t cs4236_onboard_device;

src/include/86box/unix_osd.h

@@ -0,0 +1,25 @@
+#ifndef _UNIX_OSD_H
+#define _UNIX_OSD_H
+
+#include <SDL.h>
+
+// state management
+extern void osd_init(void);
+extern void osd_deinit(void);
+extern int osd_open(SDL_Event event);
+extern int osd_close(SDL_Event event);
+
+// keyboard event handler
+extern int osd_handle(SDL_Event event);
+
+// draw the osd interface, if it's open
+extern void osd_present(void);
+
+// future ui
+extern void osd_ui_sb_update_icon_state(int tag, int state);
+extern void osd_ui_sb_update_icon(int tag, int active);
+extern void osd_ui_sb_update_icon_write(int tag, int active);
+extern void osd_ui_sb_update_icon_wp(int tag, int state);
+
+#endif /*_UNIX_OSD_H*/
+

src/include/86box/vid_svga.h

@@ -449,6 +449,8 @@ 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 float icd2047_getclock(int clock, void *priv);
+
 extern void  icd2061_write(void *priv, int val);
 extern float icd2061_getclock(int clock, void *priv);
 extern void  icd2061_set_ref_clock(void *priv, float ref_clock);
@@ -457,8 +459,13 @@ extern void  icd2061_set_ref_clock(void *priv, float ref_clock);
 #    define ics9161_write    icd2061_write
 #    define ics9161_getclock icd2061_getclock
 
+extern float ics1494_getclock(int clock, void *priv);
+
 extern float ics2494_getclock(int clock, void *priv);
 
+extern float ics90c64a_vclk_getclock(int clock, void *priv);
+extern float ics90c64a_mclk_getclock(int clock, void *priv);
+
 extern void   ics2595_write(void *priv, int strobe, int dat);
 extern double ics2595_getclock(void *priv);
 extern void   ics2595_setclock(void *priv, double clock);
@@ -507,6 +514,8 @@ extern const device_t att20c505_ramdac_device;
 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 ics1494m_540_device;
+extern const device_t ics1494m_540_radius_ht209_device;
 extern const device_t ics2494an_305_device;
 extern const device_t ics2494an_324_device;
 extern const device_t ati18810_28800_device;
@@ -516,7 +525,9 @@ 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 icd2047_20_device;
 extern const device_t icd2061_device;
+extern const device_t ics90c64a_903_device;
 extern const device_t ics9161_device;
 extern const device_t sc11483_ramdac_device;
 extern const device_t sc11487_ramdac_device;

src/machine/m_at_286.c

@@ -345,14 +345,14 @@ static const device_config_t pc900_config[] = {
         .name           = "bios",
         .description    = "BIOS Version",
         .type           = CONFIG_BIOS,
-        .default_string = "pc900_v207a",
+        .default_string = "pc900",
         .default_int    = 0,
         .file_filter    = "",
         .spinner        = { 0 },
         .bios           = {
             {
                 .name           = "BIOS V2.07A",
-                .internal_name  = "pc900_v207a",
+                .internal_name  = "pc900",
                 .bios_type      = BIOS_NORMAL,
                 .files_no       = 1,
                 .local          = 0,

src/machine/m_at_386dx.c

@@ -346,7 +346,7 @@ static const device_config_t dataexpert386wb_config[] = {
         .bios = {
             {
                 .name          = "AMIBIOS 050591",
-                .internal_name = "ami386wb",
+                .internal_name = "dataexpert386wb_050591",
                 .bios_type     = BIOS_NORMAL,
                 .files_no      = 1,
                 .local         = 0,
@@ -370,7 +370,7 @@ static const device_config_t dataexpert386wb_config[] = {
 };
 
 const device_t dataexpert386wb_device = {
-    .name          = "DataExpert 386WB",
+    .name          = "DataExpert 386C",
     .internal_name = "dataexpert386wb_device",
     .flags         = 0,
     .local         = 0,

src/machine/m_at_slot1.c

@@ -173,11 +173,11 @@ static const device_config_t lx6_config[] = {
                 .files_no      = 1,
                 .local         = 0,
                 .size          = 131072,
-                .files         = { "roms/machines/lx6/LX6C_LY.BIN", "" }
+                .files         = { "roms/machines/lx6/LX6C_LY.bin", "" }
             },
             {
                 .name          = "Award Modular BIOS v4.51PG - Revision PZ (Beta)",
-                .internal_name = "lx6_beta",
+                .internal_name = "lx6_pz",
                 .bios_type     = BIOS_NORMAL, 
                 .files_no      = 1,
                 .local         = 0,
@@ -766,7 +766,7 @@ static const device_config_t ms6119_config[] = {
         .bios           = {
             {
                 .name          = "AMIBIOS 6 (071595) - Revision 1.72 (Packard Bell Tacoma with logo)",
-                .internal_name = "tacoma_logo",
+                .internal_name = "tacoma_172",
                 .bios_type     = BIOS_NORMAL,
                 .files_no      = 1,
                 .local         = 0,

src/machine/m_at_socket4.c

@@ -181,7 +181,7 @@ static const device_config_t p5mp3_config[] = {
             },
             {
                 .name          = "Award Modular BIOS v4.51G - Revision 0402 (Beta)",
-                .internal_name = "p5mp3_beta",
+                .internal_name = "p5mp3_0402",
                 .bios_type     = BIOS_NORMAL,
                 .files_no      = 1,
                 .local         = 0,

src/machine/m_at_socket7.c

@@ -1480,7 +1480,7 @@ static const device_config_t an430tx_config[] = {
         .name           = "bios",
         .description    = "BIOS Version",
         .type           = CONFIG_BIOS,
-        .default_string = "pb79x",
+        .default_string = "an430tx",
         .default_int    = 0,
         .file_filter    = NULL,
         .spinner        = { 0 },
@@ -1488,7 +1488,7 @@ static const device_config_t an430tx_config[] = {
         .bios           = {
             {
                 .name          = "PhoenixBIOS 4.0 Release 6.0 - Revision P02-0011 (Sony Vaio PCV-130/150)",
-                .internal_name = "vaio150",
+                .internal_name = "pcv150",
                 .bios_type     = BIOS_NORMAL,
                 .files_no      = 5,
                 .local         = 0,
@@ -1499,7 +1499,7 @@ static const device_config_t an430tx_config[] = {
             },
             {
                 .name          = "PhoenixBIOS 4.0 Release 6.0 - Revision P09-0006 (Packard Bell PB79x)",
-                .internal_name = "pb79x",
+                .internal_name = "an430tx",
                 .bios_type     = BIOS_NORMAL,
                 .files_no      = 5,
                 .local         = 0,
@@ -1859,7 +1859,7 @@ static const device_config_t r534f_config[] = {
         .name           = "bios",
         .description    = "BIOS Version",
         .type           = CONFIG_BIOS,
-        .default_string = "r534f",
+        .default_string = "r534f_1998",
         .default_int    = 0,
         .file_filter    = NULL,
         .spinner        = { 0 },
@@ -1867,7 +1867,7 @@ static const device_config_t r534f_config[] = {
         .bios           = {
             {
                 .name          = "Award Modular BIOS v4.51PG - Revision 06/12/1998",
-                .internal_name = "r534f",
+                .internal_name = "r534f_1998",
                 .bios_type     = BIOS_NORMAL,
                 .files_no      = 1,
                 .local         = 0,
@@ -1876,7 +1876,7 @@ static const device_config_t r534f_config[] = {
             },
             {
                 .name          = "Award Modular BIOS v4.51PG - Revision 03/13/2000 (by Unicore Software)",
-                .internal_name = "r534f_unicore",
+                .internal_name = "r534f",
                 .bios_type     = BIOS_NORMAL,
                 .files_no      = 1,
                 .local         = 0,

src/machine/m_at_socket7_3v.c

@@ -158,38 +158,38 @@ machine_at_exp8551_init(const machine_t *model)
 }
 
 static void
-machine_at_hpvectravexxx_gpio_init(void)
+machine_at_vectra52_gpio_init(void)
 {
     uint32_t gpio = 0x40;
 
-     if (cpu_busspeed <= 40000000)
-      gpio |= 0x30;
-        else if ((cpu_busspeed > 40000000) && (cpu_busspeed <= 50000000))
+    if (cpu_busspeed <= 40000000)
+        gpio |= 0x30;
+    else if ((cpu_busspeed > 40000000) && (cpu_busspeed <= 50000000))
         gpio |= 0x00;
-        else if ((cpu_busspeed > 50000000) && (cpu_busspeed <= 60000000))
-         gpio |= 0x20;
-        else if (cpu_busspeed > 60000000)
+    else if ((cpu_busspeed > 50000000) && (cpu_busspeed <= 60000000))
+        gpio |= 0x20;
+    else if (cpu_busspeed > 60000000)
         gpio |= 0x10;
 
-        if (cpu_dmulti <= 1.5)
+    if (cpu_dmulti <= 1.5)
         gpio |= 0x82;
-        else if ((cpu_dmulti > 1.5) && (cpu_dmulti <= 2.0))
+    else if ((cpu_dmulti > 1.5) && (cpu_dmulti <= 2.0))
         gpio |= 0x02;
-        else if ((cpu_dmulti > 2.0) && (cpu_dmulti <= 2.5))
+    else if ((cpu_dmulti > 2.0) && (cpu_dmulti <= 2.5))
         gpio |= 0x00;
-        else if (cpu_dmulti > 2.5)
+    else if (cpu_dmulti > 2.5)
         gpio |= 0x80;
 
     machine_set_gpio_default(gpio);
 }
 
-static const device_config_t hpvectravexxx_config[] = {
+static const device_config_t vectra52_config[] = {
     // clang-format off
     {
         .name           = "bios",
         .description    = "BIOS Version",
         .type           = CONFIG_BIOS,
-        .default_string = "gu_07_05",
+        .default_string = "vectra52_0705",
         .default_int    = 0,
         .file_filter    = NULL,
         .spinner        = { 0 },
@@ -197,21 +197,21 @@ static const device_config_t hpvectravexxx_config[] = {
         .bios           = {
             {
                 .name          = "GU.07.02 (01/25/96)",
-                .internal_name = "gu_07_02",
+                .internal_name = "vectra52_0702",
                 .bios_type     = BIOS_NORMAL,
                 .files_no      = 1,
                 .local         = 0,
                 .size          = 131072,
-                .files         = { "roms/machines/hpvectravexxx/d3653.bin", "" }
+                .files         = { "roms/machines/vectra52/d3653.bin", "" }
             },
             {
                 .name          = "GU.07.05 (08/06/96)",
-                .internal_name = "gu_07_05",
+                .internal_name = "vectra52_0705",
                 .bios_type     = BIOS_NORMAL,
                 .files_no      = 1,
                 .local         = 0,
                 .size          = 131072,
-                .files         = { "roms/machines/hpvectravexxx/GU0705US.FUL", "" }
+                .files         = { "roms/machines/vectra52/GU0705US.FUL", "" }
             },
             { .files_no = 0 }
         }
@@ -220,9 +220,9 @@ static const device_config_t hpvectravexxx_config[] = {
     // clang-format on
 };
 
-const device_t hpvectravexxx_device = {
-    .name          = "HP Vectra VE 5/XXX Series 2",
-    .internal_name = "hpvectravexxx_device",
+const device_t vectra52_device = {
+    .name          = "HP Vectra VE 5/xxx Series 2",
+    .internal_name = "vectra52",
     .flags         = 0,
     .local         = 0,
     .init          = NULL,
@@ -231,11 +231,11 @@ const device_t hpvectravexxx_device = {
     .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
-    .config        = hpvectravexxx_config
+    .config        = vectra52_config
 };
 
 int
-machine_at_hpvectravexxx_init(const machine_t *model)
+machine_at_vectra52_init(const machine_t *model)
 {
 	int         ret = 0;
     const char *fn;
@@ -250,7 +250,7 @@ machine_at_hpvectravexxx_init(const machine_t *model)
     device_context_restore();
 
     machine_at_common_init_ex(model, 2);
-	machine_at_hpvectravexxx_gpio_init();
+	machine_at_vectra52_gpio_init();
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -435,6 +435,9 @@ machine_at_thor_gpio_init(void)
     else if (cpu_busspeed > 60000000)
         gpio |= 0xffff1000;
 
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        gpio |= 0xffff0400;
+
     machine_set_gpio_default(gpio);
 }
 
@@ -476,6 +479,9 @@ machine_at_thor_init(const machine_t *model)
     if (has_video && (gfxcard[0] == VID_INTERNAL))
         device_add(machine_get_vid_device(machine));
 
+    if (has_video && (sound_card_current[0] == SOUND_INTERNAL))
+        machine_snd = device_add(machine_get_snd_device(machine));
+
     device_add(&i430fx_device);
     device_add(&piix_device);
     device_add_params(&pc87306_device, (void *) PCX730X_AMI);
@@ -576,27 +582,6 @@ machine_at_monaco_gpio_init(void)
 {
     uint32_t gpio = 0xffffe0cf;
 
-    /* Return to this after CS4232 PnP is working. */
-    /* Register 0x0078 (Undocumented): */
-    /* Bit 5,4: Vibra 16S base address: 0 = 220h, 1 = 260h, 2 = 240h, 3 = 280h. */
-    /*device_context(machine_get_snd_device(machine));
-    addr = device_get_config_hex16("base");
-    switch (addr) {
-        case 0x0220:
-            gpio |= 0xffff00cf;
-            break;
-        case 0x0240:
-            gpio |= 0xffff00ef;
-            break;
-        case 0x0260:
-            gpio |= 0xffff00df;
-            break;
-        case 0x0280:
-            gpio |= 0xffff00ff;
-            break;
-    }
-    device_context_restore();*/
-
     /* Register 0x0079: */
     /* Bit 7: 0 = Clear password, 1 = Keep password. */
     /* Bit 6: 0 = NVRAM cleared by jumper, 1 = NVRAM normal. */
@@ -682,6 +667,9 @@ machine_at_endeavor_init(const machine_t *model)
     return ret;
 }
 
+/* The Monaco and Atlantis share the same GPIO config */
+#define machine_at_atlantis_gpio_init machine_at_monaco_gpio_init
+
 int
 machine_at_atlantis_init(const machine_t *model)
 {
@@ -695,6 +683,7 @@ machine_at_atlantis_init(const machine_t *model)
         return ret;
 
     machine_at_common_init_ex(model, 2);
+    machine_at_atlantis_gpio_init();
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);

src/machine/m_pcjr.c

@@ -832,8 +832,8 @@ static const device_config_t pcjr_config[] = {
         .bios           = { { 0 } }
     },
     {
-        .name           = "ir_reciever",
-        .description    = "Enable IR Reciever",
+        .name           = "ir_receiver",
+        .description    = "Enable IR Receiver",
         .type           = CONFIG_BINARY,
         .default_string = NULL,
         .default_int    = 0,
@@ -883,7 +883,7 @@ machine_pcjr_init(UNUSED(const machine_t *model))
 #endif
     pcjr->option_fdc   = 0;
 #if 0
-    pcjr->option_ir    = device_get_config_int("ir_reciever");
+    pcjr->option_ir    = device_get_config_int("ir_receiver");
 #else
     pcjr->option_ir    = 0;
 #endif

src/machine/m_xt.c

@@ -902,7 +902,7 @@ static const device_config_t dtk_config[] = {
         .name           = "bios",
         .description    = "BIOS Version",
         .type           = CONFIG_BIOS,
-        .default_string = "dtk_242",
+        .default_string = "dtk",
         .default_int    = 0,
         .file_filter    = NULL,
         .spinner        = { 0 },
@@ -919,7 +919,7 @@ static const device_config_t dtk_config[] = {
             },
             {
                 .name          = "2.42",
-                .internal_name = "dtk_242",
+                .internal_name = "dtk",
                 .bios_type     = BIOS_NORMAL,
                 .files_no      = 1,
                 .local         = 0,
@@ -1326,7 +1326,7 @@ static const device_config_t pc500plus_config[] = {
         .name       = "bios",
         .description    = "BIOS Version",
         .type           = CONFIG_BIOS,
-        .default_string = "pc500plus_404",
+        .default_string = "pc500plus",
         .default_int    = 0,
         .file_filter    = NULL,
         .spinner        = { 0 },
@@ -1342,7 +1342,7 @@ static const device_config_t pc500plus_config[] = {
             },
             {
                 .name          = "4.04",
-                .internal_name = "pc500plus_404",
+                .internal_name = "pc500plus",
                 .bios_type     = BIOS_NORMAL,
                 .files_no      = 1,
                 .local         = 0,
@@ -1445,14 +1445,14 @@ static const device_config_t pc700_config[] = {
         .name           = "bios",
         .description    = "BIOS Version",
         .type           = CONFIG_BIOS,
-        .default_string = "pc700_330",
+        .default_string = "pc700",
         .default_int    = 0,
         .file_filter    = NULL,
         .spinner        = { 0 },
         .bios           = {
             {
                 .name           = "3.30",
-                .internal_name  = "pc700_330",
+                .internal_name  = "pc700",
                 .bios_type      = BIOS_NORMAL,
                 .files_no       = 1,
                 .local          = 0,

src/machine/machine_table.c

@@ -10728,7 +10728,7 @@ const machine_t machines[] = {
     /* 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] PCChips M919",
+        .name              = "[UMC 8881] PC Chips M919",
         .internal_name     = "m919",
         .type              = MACHINE_TYPE_486_S3_PCI,
         .chipset           = MACHINE_CHIPSET_UMC_UM8881,
@@ -13332,49 +13332,6 @@ const machine_t machines[] = {
         .vid_device               = NULL,
         .snd_device               = NULL,
         .net_device               = NULL
-    },
-    {
-        .name              = "[i430FX] HP Vectra VE 5/XXX Series 2",
-        .internal_name     = "hpvectravexxx",
-        .type              = MACHINE_TYPE_SOCKET7_3V,
-        .chipset           = MACHINE_CHIPSET_INTEL_430FX,
-        .init              = machine_at_hpvectravexxx_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_VIDEO | MACHINE_APM,
-        .ram       = {
-            .min  = 8192,
-            .max  = 131072,
-            .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                   = &hpvectravexxx_device,
-		.kbd_device               = NULL,
-        .fdc_device               = NULL,
-        .sio_device               = NULL,
-        .vid_device               = &gd5436_onboard_pci_device,
-        .snd_device               = NULL,
-        .net_device               = NULL
     },
 	{
         .name              = "[i430FX] HP Vectra 500 Series xxx/MT",
@@ -13419,6 +13376,49 @@ const machine_t machines[] = {
         .snd_device               = NULL,
         .net_device               = NULL
     },
+    {
+        .name              = "[i430FX] HP Vectra VE 5/xxx Series 2",
+        .internal_name     = "vectra52",
+        .type              = MACHINE_TYPE_SOCKET7_3V,
+        .chipset           = MACHINE_CHIPSET_INTEL_430FX,
+        .init              = machine_at_vectra52_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_VIDEO | MACHINE_APM,
+        .ram       = {
+            .min  = 8192,
+            .max  = 131072,
+            .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                   = &vectra52_device,
+		.kbd_device               = NULL,
+        .fdc_device               = NULL,
+        .sio_device               = NULL,
+        .vid_device               = &gd5436_onboard_pci_device,
+        .snd_device               = NULL,
+        .net_device               = NULL
+    },
     /* Has a SM(S)C FDC37C932 Super I/O chip with on-chip KBC with AMI
        MegaKey (revision '5') KBC firmware. */
     {
@@ -13442,7 +13442,7 @@ const machine_t machines[] = {
             .max_multi   = 2.0
         },
         .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 8192,
             .max  = 131072,
@@ -13488,7 +13488,7 @@ const machine_t machines[] = {
             .max_multi   = 3.0
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM,  /* Machine has onboard sound: Crystal CS4232-KQ */
+        .flags     = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_SOUND | MACHINE_GAMEPORT | MACHINE_APM,  /* Machine has onboard sound: Crystal CS4232-KQ */
         .ram       = {
             .min  = 8192,
             .max  = 131072,
@@ -13507,7 +13507,7 @@ const machine_t machines[] = {
         .fdc_device               = NULL,
         .sio_device               = NULL,
         .vid_device               = &mach64ct_device_onboard,
-        .snd_device               = NULL,
+        .snd_device               = &cs4232_onboard_device,
         .net_device               = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
@@ -13534,7 +13534,7 @@ const machine_t machines[] = {
             .max_multi   = 3.0
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM | MACHINE_GAMEPORT, /* Machine has optional onboard sound: Crystal CS4232-KQ */
+        .flags     = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM | MACHINE_SOUND | MACHINE_GAMEPORT, /* Machine has optional onboard sound: Crystal CS4232-KQ */
         .ram       = {
             .min  = 8192,
             .max  = 131072,
@@ -13553,7 +13553,7 @@ const machine_t machines[] = {
         .fdc_device               = NULL,
         .sio_device               = NULL,
         .vid_device               = &s3_phoenix_trio64vplus_onboard_pci_device,
-        .snd_device               = NULL,
+        .snd_device               = &cs4232_onboard_device,
         .net_device               = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
@@ -13626,7 +13626,7 @@ const machine_t machines[] = {
             .max_multi   = 3.0
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM,  /* Machine has onboard sound: Crystal CS4232-KQ */
+        .flags     = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_SOUND | MACHINE_GAMEPORT | MACHINE_APM,  /* Machine has onboard sound: Crystal CS4232-KQ */
         .ram       = {
             .min  = 8192,
             .max  = 131072,
@@ -13645,7 +13645,7 @@ const machine_t machines[] = {
         .fdc_device               = NULL,
         .sio_device               = NULL,
         .vid_device               = &mach64ct_device_onboard,
-        .snd_device               = NULL,
+        .snd_device               = &cs4232_onboard_device,
         .net_device               = NULL
     },
     /* This has an AMIKey-2, which is type 'H'. */
@@ -13739,7 +13739,7 @@ const machine_t machines[] = {
     },
     /* Has a VIA VT82C42N KBC. */
     {
-        .name              = "[i430FX] PCPartner MB500N",
+        .name              = "[i430FX] PC Partner MB500N",
         .internal_name     = "mb500n",
         .type              = MACHINE_TYPE_SOCKET7_3V,
         .chipset           = MACHINE_CHIPSET_INTEL_430FX,
@@ -14416,7 +14416,7 @@ const machine_t machines[] = {
     },
     /* Has the ALi M1543 southbridge with on-chip KBC. */
     {
-        .name              = "[ALi ALADDiN IV+] PCChips M560",
+        .name              = "[ALi ALADDiN IV+] PC Chips M560",
         .internal_name     = "m560",
         .type              = MACHINE_TYPE_SOCKET7,
         .chipset           = MACHINE_CHIPSET_ALI_ALADDIN_IV_PLUS,
@@ -14436,7 +14436,7 @@ const machine_t machines[] = {
             .max_multi   = 3.0
         },
         .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 8192,
             .max  = 786432,
@@ -15069,7 +15069,7 @@ const machine_t machines[] = {
             .max_multi   = 3.5
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM | MACHINE_ACPI,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM,
         .ram       = {
             .min  = 16384,
             .max  = 49152,
@@ -15114,7 +15114,7 @@ const machine_t machines[] = {
             .max_multi   = 3.5
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM | MACHINE_ACPI,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM,
         .ram       = {
             .min  = 16384,
             .max  = 49152,
@@ -15501,7 +15501,7 @@ const machine_t machines[] = {
     /* This has the AMIKey 'H' firmware, possibly AMIKey-2. Photos show it with a BestKey, so it
        likely clones the behavior of AMIKey 'H'. */
     {
-        .name              = "[i430VX] PCPartner MB520N",
+        .name              = "[i430VX] PC Partner MB520N",
         .internal_name     = "mb520n",
         .type              = MACHINE_TYPE_SOCKET7,
         .chipset           = MACHINE_CHIPSET_INTEL_430VX,
@@ -15656,7 +15656,7 @@ const machine_t machines[] = {
             .max_multi   = 3.5
         },
         .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 8192,
             .max  = 262144,
@@ -15799,7 +15799,7 @@ const machine_t machines[] = {
             .max_multi   = 3.5
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_SOUND | MACHINE_GAMEPORT, /* Machine has internal video: ATI Mach64GT-B 3D Rage II */
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_SOUND | MACHINE_GAMEPORT, /* Machine has internal video: ATI Mach64GT-B 3D Rage II */
         .ram       = {
             .min  = 8192,
             .max  = 262144,
@@ -15844,7 +15844,7 @@ const machine_t machines[] = {
             .max_multi   = 3.5
         },
         .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 4096,
             .max  = 262144,
@@ -15895,7 +15895,7 @@ const machine_t machines[] = {
         },
         .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,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB,
         .ram       = {
             .min  = 8192,
             .max  = 262144,
@@ -15965,7 +15965,7 @@ const machine_t machines[] = {
     /* The BIOS sends KBC command BB and expects it to output a byte, which is AMI KBC behavior.
        A picture shows a VIA VT82C42N KBC though, so it could be a case of that KBC with AMI firmware. */
     {
-        .name              = "[i430TX] PCPartner MB540N",
+        .name              = "[i430TX] PC Partner MB540N",
         .internal_name     = "mb540n",
         .type              = MACHINE_TYPE_SOCKET7,
         .chipset           = MACHINE_CHIPSET_INTEL_430TX,
@@ -16029,7 +16029,7 @@ const machine_t machines[] = {
             .max_multi   = 5.5
         },
         .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 4096,
             .max  = 262144,
@@ -16297,7 +16297,7 @@ const machine_t machines[] = {
             .max_multi   = 3.0
         },
         .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 8192,
             .max  = 1572864,
@@ -16341,7 +16341,7 @@ const machine_t machines[] = {
             .max_multi   = 3.0
         },
         .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 8192,
             .max  = 1572864,
@@ -16387,7 +16387,7 @@ const machine_t machines[] = {
             .max_multi   = 3.0
         },
         .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 8192,
             .max  = 786432,
@@ -16434,7 +16434,7 @@ const machine_t machines[] = {
             .max_multi   = 3.0
         },
         .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 8192,
             .max  = 524288,
@@ -16481,7 +16481,7 @@ const machine_t machines[] = {
             .max_multi   = 5.5
         },
         .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 8192,
             .max  = 1048576,
@@ -16506,7 +16506,7 @@ const machine_t machines[] = {
     /* Has the VIA VT82C586B southbridge with on-chip KBC identical to the VIA
        VT82C42N. */
     {
-        .name              = "[VIA VP3] PCPartner VIA809DS",
+        .name              = "[VIA VP3] PC Partner VIA809DS",
         .internal_name     = "via809ds",
         .type              = MACHINE_TYPE_SOCKET7,
         .chipset           = MACHINE_CHIPSET_VIA_APOLLO_VP3,
@@ -16526,7 +16526,7 @@ const machine_t machines[] = {
             .max_multi   = 5.5
         },
         .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 8192,
             .max  = 1048576,
@@ -16730,7 +16730,7 @@ const machine_t machines[] = {
     /* Is the exact same as the Matsonic MS6260S. Has the ALi M1543C southbridge
        with on-chip KBC. */
     {
-        .name              = "[ALi ALADDiN V] PCChips M579",
+        .name              = "[ALi ALADDiN V] PC Chips M579",
         .internal_name     = "m579",
         .type              = MACHINE_TYPE_SOCKETS7,
         .chipset           = MACHINE_CHIPSET_ALI_ALADDIN_V,
@@ -16750,7 +16750,7 @@ const machine_t machines[] = {
             .max_multi   = 5.5
         },
         .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 */
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB, /* Machine has internal sound: C-Media CMI8330 */
         .ram       = {
             .min  = 8192,
             .max  = 1572864,
@@ -16888,7 +16888,7 @@ const machine_t machines[] = {
             .max_multi   = 5.5
         },
         .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 16384,
             .max  = 786432,
@@ -17586,7 +17586,7 @@ const machine_t machines[] = {
     },
     /* Has a VIA VT82C42N KBC. */
     {
-        .name              = "[i440FX] PCPartner MB600N",
+        .name              = "[i440FX] PC Partner MB600N",
         .internal_name     = "mb600n",
         .type              = MACHINE_TYPE_SOCKET8,
         .chipset           = MACHINE_CHIPSET_INTEL_440FX,
@@ -17633,7 +17633,7 @@ const machine_t machines[] = {
     /* ALi ALADDiN-PRO II */
     /* Has the ALi M1543C southbridge with on-chip KBC. */
     {
-        .name              = "[ALi ALADDiN-PRO II] PCChips M729",
+        .name              = "[ALi ALADDiN-PRO II] PC Chips M729",
         .internal_name     = "m729",
         .type              = MACHINE_TYPE_SLOT1,
         .chipset           = MACHINE_CHIPSET_ALI_ALADDIN_PRO_II,
@@ -17835,7 +17835,7 @@ const machine_t machines[] = {
             .max_multi   = 5.5
         },
         .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 8192,
             .max  = 1048576,
@@ -17880,7 +17880,7 @@ const machine_t machines[] = {
             .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 */
+        .flags     = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_USB, /* Video: ATi 3D Rage Pro, Network: 3Com 3C905, Sound: Crystal CS4236B */
         .ram       = {
             .min  = 8192,
             .max  = 786432,
@@ -17925,7 +17925,7 @@ const machine_t machines[] = {
             .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 sound: Yamaha YMF701 */
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB, /* Machine has internal sound: Yamaha YMF701 */
         .ram       = {
             .min  = 8192,
             .max  = 1048576,
@@ -18422,7 +18422,7 @@ const machine_t machines[] = {
             .max_multi   = 8.0
         },
         .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
-        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .flags     = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram       = {
             .min  = 8192,
             .max  = 786432,
@@ -18674,7 +18674,7 @@ const machine_t machines[] = {
     },
     /* Has the SiS (5)600 chipset with on-chip KBC. */
     {
-        .name              = "[SiS 5600] PCChips M747",
+        .name              = "[SiS 5600] PC Chips M747",
         .internal_name     = "m747",
         .type              = MACHINE_TYPE_SLOT1,
         .chipset           = MACHINE_CHIPSET_SIS_5600,
@@ -19554,7 +19554,7 @@ const machine_t machines[] = {
     /* Has an ITE IT8671F Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
     {
-        .name              = "[SMSC VictoryBX-66] PCChips M773",
+        .name              = "[SMSC VictoryBX-66] PC Chips M773",
         .internal_name     = "m773",
         .type              = MACHINE_TYPE_SOCKET370,
         .chipset           = MACHINE_CHIPSET_SMSC_VICTORYBX_66,
@@ -19601,7 +19601,7 @@ const machine_t machines[] = {
     /* Has the VIA VT82C586B southbridge with on-chip KBC identical to the VIA
        VT82C42N. */
     {
-        .name              = "[VIA Apollo Pro] PCPartner APAS3",
+        .name              = "[VIA Apollo Pro] PC Partner APAS3",
         .internal_name     = "apas3",
         .type              = MACHINE_TYPE_SOCKET370,
         .chipset           = MACHINE_CHIPSET_VIA_APOLLO_PRO,
@@ -20319,7 +20319,7 @@ machine_get_nvr_name_ex(int m)
 
     if (dev != NULL) {
         device_context(dev);
-        const char *bios = device_get_config_string("bios");
+        const char *bios = device_get_config_bios("bios");
         if ((bios != NULL) && (strcmp(bios, "") != 0))
             ret = bios;
         device_context_restore();

src/mem/mem.c

@@ -2316,7 +2316,38 @@ mem_mapping_recalc(uint64_t base, uint64_t size)
             if (start < map->base)
                 start = map->base;
 
-            for (i_c = i_s; i_c <= i_e; i_c += i_a) {
+            if (i_e == 0x00000000ULL) {
+                for (c = start; c < end; c += MEM_GRANULARITY_SIZE) {
+                    /* CPU */
+                    n = !!in_smm;
+                    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;
+
+                    /* 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;
+                }
+            } else  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));

src/mem/rom.c

@@ -643,27 +643,27 @@ bios_load(const char *fn1, const char *fn2, uint32_t addr, int sz, int off, int
 int
 bios_load_linear_combined(const char *fn1, const char *fn2, int sz, UNUSED(int off))
 {
-    return bios_load_linear(fn1, 0x000f0000, 131072, 128) && \
+    return bios_load_linear(fn1, 0x000f0000, 131072, 128) &&
         bios_load_aux_linear(fn2, 0x000e0000, sz - 65536, 128);
 }
 
 int
 bios_load_linear_combined2(const char *fn1, const char *fn2, const char *fn3, const char *fn4, const char *fn5, int sz, int off)
 {
-    return bios_load_linear(fn3, 0x000f0000, 262144, off) && \
-        bios_load_aux_linear(fn1, 0x000d0000, 65536, off) && \
-        bios_load_aux_linear(fn2, 0x000c0000, 65536, off) && \
-        bios_load_aux_linear(fn4, 0x000e0000, sz - 196608, off) && \
+    return bios_load_linear(fn3, 0x000f0000, 262144, off) &&
+        bios_load_aux_linear(fn1, 0x000d0000, 65536, off) &&
+        bios_load_aux_linear(fn2, 0x000c0000, 65536, off) &&
+        bios_load_aux_linear(fn4, 0x000e0000, sz - 196608, off) &&
         (!fn5 || bios_load_aux_linear(fn5, 0x000ec000, 16384, 0));
 }
 
 int
 bios_load_linear_combined2_ex(const char *fn1, const char *fn2, const char *fn3, const char *fn4, const char *fn5, int sz, int off)
 {
-    return bios_load_linear(fn3, 0x000e0000, 262144, off) && \
-        bios_load_aux_linear(fn1, 0x000c0000, 65536, off) && \
-        bios_load_aux_linear(fn2, 0x000d0000, 65536, off) && \
-        bios_load_aux_linear(fn4, 0x000f0000, sz - 196608, off) && \
+    return bios_load_linear(fn3, 0x000e0000, 262144, off) &&
+        bios_load_aux_linear(fn1, 0x000c0000, 65536, off) &&
+        bios_load_aux_linear(fn2, 0x000d0000, 65536, off) &&
+        bios_load_aux_linear(fn4, 0x000f0000, sz - 196608, off) &&
         (!fn5 || bios_load_aux_linear(fn5, 0x000fc000, 16384, 0));
 }
 

src/network/net_rtl8139.c

@@ -3257,14 +3257,9 @@ nic_init(const device_t *info)
     eep_data[1] = 0x10EC;
     eep_data[2] = 0x8139;
 
-    /* XXX: Get proper MAC addresses from real EEPROM dumps. OID taken from net_ne2000.c */
-#ifdef USE_REALTEK_OID
+    /* XXX: Get proper MAC addresses from real EEPROM dumps. OID is generic Realtek */
     eep_data[7] = 0xe000;
     eep_data[8] = 0x124c;
-#else
-    eep_data[7] = 0x1400;
-    eep_data[8] = 0x122a;
-#endif
     eep_data[9] = 0x1413;
 
     mac_bytes = (uint8_t *) &(eep_data[7]);

src/qt/languages/86box.pot

@@ -849,7 +849,7 @@ msgstr ""
 msgid "Invalid PCap device"
 msgstr ""
 
-msgid "Generic Paddle Controller(s)"
+msgid "Generic paddle controller(s)"
 msgstr ""
 
 msgid "2-axis, 1-button joystick(s)"
@@ -921,13 +921,13 @@ msgstr ""
 msgid "4-button flight yoke with throttle"
 msgstr ""
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr ""
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr ""
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr ""
 
 msgid "CH Flightstick"
@@ -1854,6 +1854,9 @@ msgstr ""
 msgid "VDE Socket:"
 msgstr ""
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr ""
 

src/qt/languages/cs-CZ.po

@@ -849,11 +849,11 @@ msgstr "Nebyla nalezena žádná PCap zařízení"
 msgid "Invalid PCap device"
 msgstr "Neplatné PCap zařízení"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Obecný otočný ovladač"
 
 msgid "2-axis, 1-button joystick(s)"
-msgstr "Joystick s 2 osami a 1 tlačítky"
+msgstr "Joystick s 2 osami a 1 tlačítkem"
 
 msgid "2-axis, 2-button joystick(s)"
 msgstr "Joystick s 2 osami a 2 tlačítky"
@@ -880,19 +880,19 @@ msgid "3-axis, 4-button joystick"
 msgstr "Joystick s 3 osami a 4 tlačítky"
 
 msgid "4-axis, 2-button joystick"
-msgstr "Joystick s 4 osami a 2 tlačítky"
+msgstr "Joystick se 4 osami a 2 tlačítky"
 
 msgid "4-axis, 3-button joystick"
-msgstr "Joystick s 4 osami a 3 tlačítky"
+msgstr "Joystick se 4 osami a 3 tlačítky"
 
 msgid "4-axis, 4-button joystick"
-msgstr "Joystick s 4 osami a 4 tlačítky"
+msgstr "Joystick se 4 osami a 4 tlačítky"
 
 msgid "2-button gamepad(s)"
-msgstr "Ovladač se 2 tlačítky"
+msgstr "Ovladač s 2 tlačítky"
 
 msgid "3-button gamepad"
-msgstr "Ovladač se 3 tlačítky"
+msgstr "Ovladač s 3 tlačítky"
 
 msgid "4-button gamepad"
 msgstr "Ovladač se 4 tlačítky"
@@ -904,10 +904,10 @@ msgid "Gravis PC GamePad"
 msgstr "Gravis PC GamePad"
 
 msgid "2-button flight yoke"
-msgstr "Letecký knipl se 2 tlačítky"
+msgstr "Letecký knipl s 2 tlačítky"
 
 msgid "3-button flight yoke"
-msgstr "Letecký knipl se32 tlačítky"
+msgstr "Letecký knipl s 3 tlačítky"
 
 msgid "4-button flight yoke"
 msgstr "Letecký knipl se 4 tlačítky"
@@ -919,15 +919,15 @@ msgid "3-button flight yoke with throttle"
 msgstr "Letecký knipl s 3 tlačítky a pákou"
 
 msgid "4-button flight yoke with throttle"
-msgstr "Letecký knipl s 4 tlačítky a pákou"
+msgstr "Letecký knipl se 4 tlačítky a pákou"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Volant (3 osy, 2 tlačítka)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Volant (3 osy, 3 tlačítka)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Volant (3 osy, 4 tlačítka)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 s adaptérem"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 bez adaptéru"
 
 msgid "None"
 msgstr "Žadné"
@@ -1852,7 +1852,10 @@ msgid "Adapter:"
 msgstr "Adaptér:"
 
 msgid "VDE Socket:"
-msgstr "Zásuvka VDE:"
+msgstr "VDE socket:"
+
+msgid "TAP Bridge Device:"
+msgstr "Zařízení TAP mostu:"
 
 msgid "86Box Unit Tester"
 msgstr "86Box Unit Tester"

src/qt/languages/de-DE.po

@@ -849,8 +849,8 @@ msgstr "Keine PCap-Geräte gefunden"
 msgid "Invalid PCap device"
 msgstr "Ungültiges PCap-Gerät"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Generischer Paddel-Controller(s)"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "2-Achsen-, 1-Tasten-Joystick(s)"
@@ -921,13 +921,13 @@ msgstr "3-Tasten-Steuerhorn mit Schubregler"
 msgid "4-button flight yoke with throttle"
 msgstr "4-Tasten-Steuerhorn mit Schubregler"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Lenkrad (3-Achsen, 2-Tasten)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Lenkrad (3-Achsen, 3-Tasten)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Lenkrad (3-Achsen, 4-Tasten)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 mit Adapter"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 ohne Adapter"
 
 msgid "None"
 msgstr "Ohne"
@@ -1854,6 +1854,9 @@ msgstr "Adapter:"
 msgid "VDE Socket:"
 msgstr "VDE Anschluss:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "86Box-Gerätetester"
 

src/qt/languages/es-ES.po

@@ -849,8 +849,8 @@ msgstr "No se encontraron dispositivos PCap"
 msgid "Invalid PCap device"
 msgstr "Dispositivo PCap inválido"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Controlador(es) de paleta genérico(s)"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "Mando(s) de 2 ejes, 1 botones"
@@ -921,13 +921,13 @@ msgstr "Yugo de vuelo de 3 botones con acelerador"
 msgid "4-button flight yoke with throttle"
 msgstr "Yugo de vuelo de 4 botones con acelerador"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Volante (de 3 ejes, 2 botones)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Volante (de 3 ejes, 3 botones)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Volante (de 3 ejes, 4 botones)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 con adaptador"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 sin adaptador"
 
 msgid "None"
 msgstr "Ninguno"
@@ -1854,6 +1854,9 @@ msgstr "Adaptador:"
 msgid "VDE Socket:"
 msgstr "Toma VDE:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "Comprobador de unidad 86Box"
 

src/qt/languages/fi-FI.po

@@ -849,8 +849,8 @@ msgstr "PCap-laitteita ei löytynyt"
 msgid "Invalid PCap device"
 msgstr "Virheellinen PCap-laite"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Yleinen melainohjain"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "2-akseliset 1-painikkeiset peliohjaimet"
@@ -921,13 +921,13 @@ msgstr "3-painikkeinen lento-ohjain kaasuvivulla"
 msgid "4-button flight yoke with throttle"
 msgstr "4-painikkeinen lento-ohjain kaasuvivulla"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "ratti (3-akselinen, 2-painikkeinen)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "ratti (3-akselinen, 3-painikkeinen)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "ratti (3-akselinen, 4-painikkeinen)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 adapterilla"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 ilman adapteria"
 
 msgid "None"
 msgstr "Ei mikään"
@@ -1854,6 +1854,9 @@ msgstr "Sovitin:"
 msgid "VDE Socket:"
 msgstr "VDE-socket:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "86Box Unit Tester"
 

src/qt/languages/fr-FR.po

@@ -849,8 +849,8 @@ msgstr "Aucun dispositif PCap trouvé"
 msgid "Invalid PCap device"
 msgstr "Dispositif PCap invalide"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Contrôleur(s) à palette générique(s)"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "Manette(s) avec 2 axes, 1 boutons"
@@ -921,13 +921,13 @@ msgstr "Manette de vol à 3 boutons avec manette des gaz"
 msgid "4-button flight yoke with throttle"
 msgstr "Manette de vol à 4 boutons avec manette des gaz"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Volant (3 axes, 2 boutons)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Volant (3 axes, 3 boutons)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Volant (3 axes, 4 boutons)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ 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 "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 avec adaptateur"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 sans adaptateur"
 
 msgid "None"
 msgstr "Aucun"
@@ -1854,6 +1854,9 @@ msgstr "Adaptateur:"
 msgid "VDE Socket:"
 msgstr "Prise VDE:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "Testeur d'unité de 86Box"
 

src/qt/languages/hr-HR.po

@@ -849,8 +849,8 @@ msgstr "Nema PCap uređaja"
 msgid "Invalid PCap device"
 msgstr "Nevažeći PCap uređaj"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Generički kontroleri s lopaticama"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "Palica za igru s 2 osi, 1 tipke"
@@ -921,13 +921,13 @@ msgstr "Jaram za letenje s 3 tipke i gasom"
 msgid "4-button flight yoke with throttle"
 msgstr "Jaram za letenje s 4 tipke i gasom"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Volan (3 osi, 2 tipke)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Volan (3 osi, 3 tipke)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Volan (3 osi, 4 tipke)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 s adapterom"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 bez adaptera"
 
 msgid "None"
 msgstr "Bez"
@@ -1854,6 +1854,9 @@ msgstr "Adapter:"
 msgid "VDE Socket:"
 msgstr "VDE utičnica:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "Jedinični ispitivač 86Box-a"
 

src/qt/languages/it-IT.po

@@ -849,8 +849,8 @@ msgstr "Nessun dispositivo PCap trovato"
 msgid "Invalid PCap device"
 msgstr "Dispositivo PCap non valido"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Controller generico/i a paletta"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "Joystick a 2 assi, 1 pulsanti"
@@ -921,13 +921,13 @@ msgstr "Barra di comando a 4 pulsanti con acceleratore"
 msgid "4-button flight yoke with throttle"
 msgstr "Barra di comando a 4 pulsanti con acceleratore"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Volante (3 assi, 2 pulsanti)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Volante (3 assi, 3 pulsanti)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Volante (3 assi, 4 pulsanti)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Sistema di controllo Thrustmaster Flight"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Sistema di controllo timone"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 con adattatore"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 senza adattatore"
 
 msgid "None"
 msgstr "Nessuno"
@@ -1854,6 +1854,9 @@ msgstr "Adattatore:"
 msgid "VDE Socket:"
 msgstr "Presa VDE:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "Tester di unità 86Box"
 

src/qt/languages/ja-JP.po

@@ -849,8 +849,8 @@ msgstr "PCapデバイスがありません"
 msgid "Invalid PCap device"
 msgstr "不正なPCapデバイス"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "汎用パドルコントローラー"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "ジョイスティック(2軸、1ボタン)"
@@ -921,13 +921,13 @@ msgstr "3ボタン式フライトヨーク(スロットル付き)"
 msgid "4-button flight yoke with throttle"
 msgstr "4ボタン式フライトヨーク(スロットル付き)"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "ステアリングホイール(3軸、2ボタン)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "ステアリングホイール(3軸、3ボタン)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "ステアリングホイール(3軸、4ボタン)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "アダプター付き Thrustmaster Formula T1/T2"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "アダプターなし Thrustmaster Formula T1/T2"
 
 msgid "None"
 msgstr "なし"
@@ -1854,6 +1854,9 @@ msgstr "アダプター:"
 msgid "VDE Socket:"
 msgstr "VDEソケット:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "86Boxユニットテスター"
 

src/qt/languages/ko-KR.po

@@ -849,8 +849,8 @@ msgstr "PCap 장치가 없습니다"
 msgid "Invalid PCap device"
 msgstr "PCap 장치가 올바르지 않습니다"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "일반 패들 컨트롤러"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "2축, 1버튼 조이스틱"
@@ -921,13 +921,13 @@ msgstr "3버튼 비행 조종간과 스로틀"
 msgid "4-button flight yoke with throttle"
 msgstr "4버튼 비행 조종간과 스로틀"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "조타륜 (3축, 2버튼)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "조타륜 (3축, 3버튼)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "조타륜 (3축, 4버튼)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "어댑터 포함 Thrustmaster Formula T1/T2"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "어댑터 미포함 Thrustmaster Formula T1/T2"
 
 msgid "None"
 msgstr "없음"
@@ -1854,6 +1854,9 @@ msgstr "어댑터:"
 msgid "VDE Socket:"
 msgstr "VDE 소켓:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "86Box 유닛 테스터"
 

src/qt/languages/nb-NO.po

@@ -849,8 +849,8 @@ msgstr "Ingen PCap-enheter funnet"
 msgid "Invalid PCap device"
 msgstr "Ugyldig PCap-enhet"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Generisk padle-kontroller(e)"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "2-akset, 1-knapps styrespak(er)"
@@ -921,13 +921,13 @@ msgstr "3-knapps flystyre med gass"
 msgid "4-button flight yoke with throttle"
 msgstr "4-knapps flystyre med gass"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Ratt (3-akset, 3-knapps)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Ratt (3-akset, 3-knapps)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Ratt (3-akset, 4-knapps)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Ror-kontrollsystem"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 med adapter"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 uten adapter"
 
 msgid "None"
 msgstr "Ingen"
@@ -1854,6 +1854,9 @@ msgstr "Adapter:"
 msgid "VDE Socket:"
 msgstr "VDE-kontakt:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "86Box-enhetstester"
 

src/qt/languages/nl-NL.po

@@ -235,7 +235,7 @@ msgid "&New image..."
 msgstr "&Nieuw imagebestand..."
 
 msgid "&Existing image..."
-msgstr "&Bestaande imagebestand..."
+msgstr "&Bestaand imagebestand..."
 
 msgid "Existing image (&Write-protected)..."
 msgstr "Bestaand imagebestand (&Schrijfbeveiligd)..."
@@ -849,8 +849,8 @@ msgstr "Geen PCap-apparaten gevonden"
 msgid "Invalid PCap device"
 msgstr "Ongeldig PCap-apparaat"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Generieke peddelcontroller(s)"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "Joystick(s) met 2 assen en 1 knoppen"
@@ -921,13 +921,13 @@ msgstr "3-kops stuurknuppel met gashendel"
 msgid "4-button flight yoke with throttle"
 msgstr "4-kops stuurknuppel met gashendel"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Stuurwiel (3 assen, 2 knoppen)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Stuurwiel (3 assen, 3 knoppen)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Stuurwiel (3 assen, 4 knoppen)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control systeem"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Roer Control Systeem"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 met adapter"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 zonder adapter"
 
 msgid "None"
 msgstr "Geen"
@@ -1854,6 +1854,9 @@ msgstr "Adapter:"
 msgid "VDE Socket:"
 msgstr "VDE-socket:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "86Box Apparaattester"
 

src/qt/languages/pl-PL.po

@@ -849,14 +849,14 @@ msgstr "Nie znaleziono urządzeń PCap"
 msgid "Invalid PCap device"
 msgstr "Nieprawidłowe urządzenie PCap"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Generyczny kontroler paddle"
 
 msgid "2-axis, 1-button joystick(s)"
-msgstr "Joysticki 2-osiowe, 1-przyciskowe"
+msgstr "Joystick(i) 2-osiowe, 1-przyciskowe"
 
 msgid "2-axis, 2-button joystick(s)"
-msgstr "Joysticki 2-osiowe, 2-przyciskowe"
+msgstr "Joystick(i) 2-osiowe, 2-przyciskowe"
 
 msgid "2-axis, 3-button joystick"
 msgstr "Joystick 2-osiowy, 3-przyciskowy"
@@ -892,13 +892,13 @@ msgid "2-button gamepad(s)"
 msgstr "Pad(y) z dwoma przyciskami"
 
 msgid "3-button gamepad"
-msgstr "Pad z trzy przyciskami"
+msgstr "Pad z trzema przyciskami"
 
 msgid "4-button gamepad"
 msgstr "Pad z czterema przyciskami"
 
 msgid "6-button gamepad"
-msgstr "Pad z sześć przyciskami"
+msgstr "Pad z sześcioma przyciskami"
 
 msgid "Gravis PC GamePad"
 msgstr "Gravis PC GamePad"
@@ -921,13 +921,13 @@ msgstr "Wolant z trzema przyciskami i przepustnicą"
 msgid "4-button flight yoke with throttle"
 msgstr "Wolant z czterema przyciskami i przepustnicą"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Kierownica (3 osie, 2 przyciski)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Kierownica (3 osie, 3 przyciski)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Kierownica (3 osie, 4 przyciski)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 z adapterem"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 bez adaptera"
 
 msgid "None"
 msgstr "Żaden"
@@ -1854,6 +1854,9 @@ msgstr "Adapter:"
 msgid "VDE Socket:"
 msgstr "Gniazdo VDE:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "Tester urządzeń 86Box"
 
@@ -3049,19 +3052,19 @@ msgid "Export EDID"
 msgstr "Eksportuj EDID"
 
 msgid "EDID file \"%ls\" is too large."
-msgstr "Plik EDID \"%ls\" jest zbyt duży."
+msgstr "Plik EDID „%ls” jest zbyt duży."
 
 msgid "OpenGL input scale"
-msgstr "Skala wejściowa OpenGL"
+msgstr "Skala wejścia OpenGL"
 
 msgid "OpenGL input stretch mode"
-msgstr "Tryb rozciągania wejściowego OpenGL"
+msgstr "Tryb rozciągania wejścia OpenGL"
 
 msgid "Color scheme"
 msgstr "Schemat kolorów"
 
 msgid "Light"
-msgstr "Światło"
+msgstr "Jasny"
 
 msgid "Dark"
 msgstr "Ciemny"

src/qt/languages/pt-BR.po

@@ -849,8 +849,8 @@ msgstr "Nenhum dispositivo PCap encontrado"
 msgid "Invalid PCap device"
 msgstr "Dispositivo PCap inválido"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Controlador(es) genérico(s) de pá"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "Joystick(s) de 2 eixos, 1 botões"
@@ -921,13 +921,13 @@ msgstr "Manche de voo de 3 botões com acelerador"
 msgid "4-button flight yoke with throttle"
 msgstr "Manche de voo de 4 botões com acelerador"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Volante (3 eixos, 2 botões)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Volante (3 eixos, 3 botões)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Volante (3 eixos, 4 botões)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Sistema de Controle de Voo Thrustmaster"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "SCV Thrustmaster + Sistema de Controle de Leme"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 com adaptador"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 sem adaptador"
 
 msgid "None"
 msgstr "Nenhum"
@@ -1854,6 +1854,9 @@ msgstr "Adaptador:"
 msgid "VDE Socket:"
 msgstr "Soquete VDE:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "Testador de unidade 86Box"
 

src/qt/languages/pt-PT.po

@@ -849,8 +849,8 @@ msgstr "Não foi encontrado um dispositivo PCap"
 msgid "Invalid PCap device"
 msgstr "Dispositivo PCap inválido"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "COntrolador(es) genérico(s) tipo pá"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "Joystick(s) de 2 eixos, 1 botões"
@@ -921,13 +921,13 @@ msgstr "Manípulo de voo de 3 botões com acelerador"
 msgid "4-button flight yoke with throttle"
 msgstr "Manípulo de voo de 4 botões com acelerador"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Volante (de 3 eixos, 2 botões)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Volante (de 3 eixos, 3 botões)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Volante (de 3 eixos, 4 botões)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 com adaptador"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 sem adaptador"
 
 msgid "None"
 msgstr "Nenhum"
@@ -1854,6 +1854,9 @@ msgstr "Adaptador:"
 msgid "VDE Socket:"
 msgstr "Tomada VDE:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "Testador de unidades 86Box"
 

src/qt/languages/ru-RU.po

@@ -849,8 +849,8 @@ msgstr "Устройства PCap не найдены"
 msgid "Invalid PCap device"
 msgstr "Неверное устройство PCap"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Стандартный контроллер-колесо"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "2-осевой, 1-кнопочный джойстик"
@@ -904,30 +904,30 @@ msgid "Gravis PC GamePad"
 msgstr "Gravis PC GamePad"
 
 msgid "2-button flight yoke"
-msgstr "2-кнопочный flight yoke"
+msgstr "2-кнопочный штурвал"
 
 msgid "3-button flight yoke"
-msgstr "3-кнопочный flight yoke"
+msgstr "3-кнопочный штурвал"
 
 msgid "4-button flight yoke"
-msgstr "4-кнопочный flight yoke"
+msgstr "4-кнопочный штурвал"
 
 msgid "2-button flight yoke with throttle"
-msgstr "2-кнопочный flight yoke с дросселем"
+msgstr "2-кнопочный штурвал с дросселем"
 
 msgid "3-button flight yoke with throttle"
-msgstr "3-кнопочный flight yoke с дросселем"
+msgstr "3-кнопочный штурвал с дросселем"
 
 msgid "4-button flight yoke with throttle"
-msgstr "4-кнопочный flight yoke с дросселем"
+msgstr "4-кнопочный штурвал с дросселем"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Руль (3-осевой, 2-кнопочный)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Руль (3-осевой, 3-кнопочный)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Руль (3-осевой, 4-кнопочный)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Система управления полётом Thrustmaster"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Система управления рулем"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 с адаптером"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 без адаптера"
 
 msgid "None"
 msgstr "Нет"
@@ -1854,6 +1854,9 @@ msgstr "Адаптер:"
 msgid "VDE Socket:"
 msgstr "VDE сокет:"
 
+msgid "TAP Bridge Device:"
+msgstr "Устройство моста TAP:"
+
 msgid "86Box Unit Tester"
 msgstr "Модульный Тестер 86Box"
 

src/qt/languages/sk-SK.po

@@ -849,8 +849,8 @@ msgstr "Neboli nájdené žiadne PCap zariadenia"
 msgid "Invalid PCap device"
 msgstr "Neplatné PCap zariadenie"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Generický ovládač pádla"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "2-osový, 1-tlačidlový joystick"
@@ -921,13 +921,13 @@ msgstr "Letecký knipl s 3 tlačidlami a pákou"
 msgid "4-button flight yoke with throttle"
 msgstr "Letecký knipl s 4 tlačidlami a pákou"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Volant (3 osy, 2 tlačítka)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Volant (3 osy, 3 tlačítka)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Volant (3 osy, 4 tlačítka)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 s adaptérom"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 bez adaptéru"
 
 msgid "None"
 msgstr "Žiadne"
@@ -1854,6 +1854,9 @@ msgstr "Adaptér:"
 msgid "VDE Socket:"
 msgstr "Zásuvka VDE:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "86Box Unit Tester"
 

src/qt/languages/sl-SI.po

@@ -849,8 +849,8 @@ msgstr "Najdena ni bila nobena naprava PCap"
 msgid "Invalid PCap device"
 msgstr "Neveljavna naprava PCap"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Generični krmilnik z lopatico"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "Igralna palica z 2 osema, 1 gumboma"
@@ -921,13 +921,13 @@ msgstr "Letalski krmilni drog s 3 gumbi z ročico za plin"
 msgid "4-button flight yoke with throttle"
 msgstr "Letalski krmilni drog s 4 gumbi z ročico za plin"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Volan s 3 osmi, 2 gumbi"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Volan s 3 osmi, 3 gumbi"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Volan s 3 osmi, 4 gumbi"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 s pretvornikom"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 brez pretvornika"
 
 msgid "None"
 msgstr "Brez"
@@ -1854,6 +1854,9 @@ msgstr "Mrežna kartica:"
 msgid "VDE Socket:"
 msgstr "Vtičnica VDE:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "Tester enote 86Box"
 

src/qt/languages/sv-SE.po

@@ -849,8 +849,8 @@ msgstr "Inga PCap-enheter hittade"
 msgid "Invalid PCap device"
 msgstr "Ogiltig PCap-enhet"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Generisk paddelkontroll(er)"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "Styrspak med 2 axlar och 1 knappar"
@@ -921,13 +921,13 @@ msgstr "Styrspak med tre knappar och gas"
 msgid "4-button flight yoke with throttle"
 msgstr "Styrspak med fyra knappar och gas"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "ratt (tre axlar, två knappar)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "ratt (tre axlar, tre knappar)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "ratt (tre axlar, fyra knappar)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 med adapter"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 utan adapter"
 
 msgid "None"
 msgstr "Ingen"
@@ -1854,6 +1854,9 @@ msgstr "Adapter:"
 msgid "VDE Socket:"
 msgstr "VDE-sockel:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "86Box enhetsprövare"
 

src/qt/languages/tr-TR.po

@@ -849,8 +849,8 @@ msgstr "Herhangi bir PCap cihazı bulunamadı"
 msgid "Invalid PCap device"
 msgstr "Geçersiz PCap cihazı"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Genel kürek kontrol cihazları"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "2 eksenli, 1 düğmeli oyun kolları"
@@ -921,13 +921,13 @@ msgstr "3 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 "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "direksiyonu (3 eksenli, 2 düğmeli)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "direksiyonu (3 eksenli, 3 düğmeli)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "direksiyonu (3 eksenli, 4 düğmeli)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Adaptörlü Thrustmaster Formula T1/T2"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Adaptörsüz Thrustmaster Formula T1/T2"
 
 msgid "None"
 msgstr "Hiçbiri"
@@ -1854,6 +1854,9 @@ msgstr "Adaptör:"
 msgid "VDE Socket:"
 msgstr "VDE Soketi:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "86Box Test Cihazı"
 

src/qt/languages/uk-UA.po

@@ -849,8 +849,8 @@ msgstr "Пристрої PCap не знайдені"
 msgid "Invalid PCap device"
 msgstr "Невірний пристрій PCap"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Загальний контролер(и) весла"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "2-осьовий, 1-кнопковий джойстик"
@@ -921,13 +921,13 @@ msgstr "3-кнопковий flight yoke з дроселем"
 msgid "4-button flight yoke with throttle"
 msgstr "4-кнопковий flight yoke з дроселем"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Кермо (3-осьове, 2-кнопкове)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Кермо (3-осьове, 3-кнопкове)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Кермо (3-осьове, 4-кнопкове)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Система управління польотом Thrustmaster"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Система управління кермом"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 з адаптером"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 без адаптера"
 
 msgid "None"
 msgstr "Ні"
@@ -1854,6 +1854,9 @@ msgstr "Адаптер:"
 msgid "VDE Socket:"
 msgstr "VDE сокет:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "Тестер блоків 86Box"
 

src/qt/languages/vi-VN.po

@@ -849,8 +849,8 @@ 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 "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "Bộ điều khiển dạng mái chèo thông dụng"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "Cần điều khiển hai trục, một nút"
@@ -921,13 +921,13 @@ msgstr "Vô lăng máy bay ba 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 "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "Vô lăng (ba trục, hai nút)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "Vô lăng (ba trục, ba nút)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "Vô lăng (ba trục, bốn nút)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Hệ thống bánh lái"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "Thrustmaster Formula T1/T2 kèm bộ chuyển đổi"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "Thrustmaster Formula T1/T2 không kèm bộ chuyển đổi"
 
 msgid "None"
 msgstr "Không có"
@@ -1854,6 +1854,9 @@ msgstr "Bộ chuyển đổi:"
 msgid "VDE Socket:"
 msgstr "Ổ cắm VDE:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "Trình kiểm tra đơn vị 86box"
 

src/qt/languages/zh-CN.po

@@ -849,8 +849,8 @@ msgstr "未找到 PCap 设备"
 msgid "Invalid PCap device"
 msgstr "无效 PCap 设备"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "通用桨式控制器"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "2 轴, 1 键操纵杆"
@@ -921,13 +921,13 @@ msgstr "3 按钮带油门飞行摇杆"
 msgid "4-button flight yoke with throttle"
 msgstr "4 按钮带油门飞行摇杆"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "方向盘 (3 轴, 2 键)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "方向盘 (3 轴, 3 键)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "方向盘 (3 轴, 4 键)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "带适配器 Thrustmaster Formula T1/T2"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "不带适配器 Thrustmaster Formula T1/T2"
 
 msgid "None"
 msgstr "无"
@@ -1854,6 +1854,9 @@ msgstr "适配器:"
 msgid "VDE Socket:"
 msgstr "VDE 套接字:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "86Box 装置测试仪"
 

src/qt/languages/zh-TW.po

@@ -849,8 +849,8 @@ msgstr "未找到 PCap 裝置"
 msgid "Invalid PCap device"
 msgstr "無效 PCap 裝置"
 
-msgid "Generic Paddle Controller(s)"
-msgstr ""
+msgid "Generic paddle controller(s)"
+msgstr "通用槳式控制器"
 
 msgid "2-axis, 1-button joystick(s)"
 msgstr "2 軸, 1 鍵搖桿"
@@ -921,13 +921,13 @@ msgstr "3 按鈕帶油門飛行搖桿"
 msgid "4-button flight yoke with throttle"
 msgstr "4 按鈕帶油門飛行搖桿"
 
-msgid "Steering Wheel (3-axis, 2-button)"
+msgid "Steering wheel (3-axis, 2-button)"
 msgstr "方向盤 (3 軸, 2 鍵搖桿)"
 
-msgid "Steering Wheel (3-axis, 3-button)"
+msgid "Steering wheel (3-axis, 3-button)"
 msgstr "方向盤 (3 軸, 3 鍵搖桿)"
 
-msgid "Steering Wheel (3-axis, 4-button)"
+msgid "Steering wheel (3-axis, 4-button)"
 msgstr "方向盤 (3 軸, 4 鍵搖桿)"
 
 msgid "CH Flightstick"
@@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System"
 msgid "Thrustmaster FCS + Rudder Control System"
 msgstr "Thrustmaster FCS + Rudder Control System"
 
-msgid "Thrustmaster Formula T1/T2 with Adaptor"
-msgstr "Thrustmaster Formula T1/T2 with Adaptor"
+msgid "Thrustmaster Formula T1/T2 with adapter"
+msgstr "附轉接器 Thrustmaster Formula T1/T2"
 
-msgid "Thrustmaster Formula T1/T2 without Adaptor"
-msgstr "Thrustmaster Formula T1/T2 without Adaptor"
+msgid "Thrustmaster Formula T1/T2 without adapter"
+msgstr "不附轉接器 Thrustmaster Formula T1/T2"
 
 msgid "None"
 msgstr "無"
@@ -1854,6 +1854,9 @@ msgstr "配接器:"
 msgid "VDE Socket:"
 msgstr "VDE 插座:"
 
+msgid "TAP Bridge Device:"
+msgstr ""
+
 msgid "86Box Unit Tester"
 msgstr "86Box 單元測試器"
 

src/qt/qt_openglrenderer.cpp

@@ -1715,12 +1715,12 @@ OpenGLRenderer::render()
         plat_tempfile(fn, NULL, (char*)".png");
         strcat(path, fn);
 
-        unsigned char *rgb = (unsigned char *) calloc(1, (size_t) width * height * 3);
+        unsigned char *rgb = (unsigned char *) calloc(1, (size_t) width * height * 4);
         
         glw.glFinish();
         glw.glReadPixels(window_rect.x, window_rect.y, width, height, GL_RGB, GL_UNSIGNED_BYTE, rgb);
 
-        QImage image(rgb, width, height, QImage::Format_RGB888);
+        QImage image((uchar*)rgb, width, height, width * 3, QImage::Format_RGB888);
         image.mirrored(false, true).save(path, "png");
         monitors[r_monitor_index].mon_screenshots--;
         free(rgb);

src/qt/qt_openglshaderconfig.cpp

@@ -27,6 +27,7 @@ OpenGLShaderConfig::OpenGLShaderConfig(QWidget *parent, glslp_t* shader)
 
     for (int i = 0; i < currentShader->num_parameters; i++) {
         auto spinBox = new QDoubleSpinBox;
+        spinBox->setDecimals(3);
         spinBox->setObjectName(currentShader->parameters[i].id);
         spinBox->setRange(currentShader->parameters[i].min, currentShader->parameters[i].max);
         spinBox->setValue(currentShader->parameters[i].value);

src/qt/qt_settingsinput.ui

@@ -30,7 +30,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2">
+   <item row="0" column="1">
     <widget class="QComboBox" name="comboBoxKeyboard">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -43,7 +43,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="3">
+   <item row="0" column="2">
     <widget class="QPushButton" name="pushButtonConfigureKeyboard">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -63,7 +63,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="2">
+   <item row="1" column="1">
     <widget class="QComboBox" name="comboBoxMouse">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -76,7 +76,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="3">
+   <item row="1" column="2">
     <widget class="QPushButton" name="pushButtonConfigureMouse">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -96,40 +96,50 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1" colspan="2">
+   <item row="2" column="1">
     <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 name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </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 row="3" column="0" colspan="3">
+    <layout class="QHBoxLayout" name="joystickButtonsLayout">
+     <item>
+      <widget class="QPushButton" name="pushButtonJoystick01">
+       <property name="text">
+        <string>Joystick 1...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonJoystick02">
+       <property name="text">
+        <string>Joystick 2...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonJoystick03">
+       <property name="text">
+        <string>Joystick 3...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonJoystick04">
+       <property name="text">
+        <string>Joystick 4...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item row="4" column="0">
     <widget class="QLabel" name="labelKeys">
@@ -138,7 +148,7 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="4">
+   <item row="5" column="0" colspan="3">
     <widget class="QTableWidget" name="tableKeys">
      <property name="editTriggers">
       <set>QAbstractItemView::NoEditTriggers</set>
@@ -157,25 +167,54 @@
      </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 row="6" column="0" colspan="3">
+    <layout class="QHBoxLayout" name="keybindButtonsLayout">
+     <item>
+      <spacer name="keybindButtonsHorizontalSpacer">
+       <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="pushButtonClearBind">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Clear binding</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonBind">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Bind</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>

src/qt/qt_settingsnetwork.ui

@@ -158,11 +158,11 @@
        <item row="6" column="0">
         <widget class="QLabel" name="labelBridgeTAPNIC1">
          <property name="text">
-          <string>TAP Bridge Device</string>
+          <string>TAP Bridge Device:</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="1" colspan="2">
+       <item row="6" column="1">
         <widget class="QLineEdit" name="bridgeTAPNIC1">
          <property name="maxLength">
           <number>127</number>
@@ -373,11 +373,11 @@
        <item row="6" column="0">
         <widget class="QLabel" name="labelBridgeTAPNIC2">
          <property name="text">
-          <string>TAP Bridge Device</string>
+          <string>TAP Bridge Device:</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="1" colspan="2">
+       <item row="6" column="1">
         <widget class="QLineEdit" name="bridgeTAPNIC2">
          <property name="maxLength">
           <number>127</number>
@@ -588,11 +588,11 @@
        <item row="6" column="0">
         <widget class="QLabel" name="labelBridgeTAPNIC3">
          <property name="text">
-          <string>TAP Bridge Device</string>
+          <string>TAP Bridge Device:</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="1" colspan="2">
+       <item row="6" column="1">
         <widget class="QLineEdit" name="bridgeTAPNIC3">
          <property name="maxLength">
           <number>127</number>
@@ -803,11 +803,11 @@
        <item row="6" column="0">
         <widget class="QLabel" name="labelBridgeTAPNIC4">
          <property name="text">
-          <string>TAP Bridge Device</string>
+          <string>TAP Bridge Device:</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="1" colspan="2">
+       <item row="6" column="1">
         <widget class="QLineEdit" name="bridgeTAPNIC4">
          <property name="maxLength">
           <number>127</number>

src/qt/qt_settingsports.ui

@@ -228,6 +228,12 @@
        <property name="text">
         <string>Serial port passthrough 1</string>
        </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
       </widget>
      </item>
      <item row="0" column="1">
@@ -242,6 +248,12 @@
        <property name="text">
         <string>Serial port passthrough 2</string>
        </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
       </widget>
      </item>
      <item row="1" column="1">
@@ -256,6 +268,12 @@
        <property name="text">
         <string>Serial port passthrough 3</string>
        </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
       </widget>
      </item>
      <item row="2" column="1">
@@ -270,6 +288,12 @@
        <property name="text">
         <string>Serial port passthrough 4</string>
        </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
       </widget>
      </item>
      <item row="3" column="1">
@@ -279,20 +303,7 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
-      <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="5" column="0" colspan="2">
+     <item row="4" column="0" colspan="2">
       <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Vertical</enum>

src/qt/qt_settingssound.ui

@@ -46,7 +46,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="3">
+   <item row="0" column="2">
     <widget class="QPushButton" name="pushButtonConfigureSoundCard1">
      <property name="text">
       <string>Configure</string>
@@ -73,7 +73,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="3">
+   <item row="1" column="2">
     <widget class="QPushButton" name="pushButtonConfigureSoundCard2">
      <property name="text">
       <string>Configure</string>
@@ -100,7 +100,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="3">
+   <item row="2" column="2">
     <widget class="QPushButton" name="pushButtonConfigureSoundCard3">
      <property name="text">
       <string>Configure</string>
@@ -127,7 +127,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="3">
+   <item row="3" column="2">
     <widget class="QPushButton" name="pushButtonConfigureSoundCard4">
      <property name="text">
       <string>Configure</string>
@@ -154,7 +154,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="3">
+   <item row="4" column="2">
     <widget class="QPushButton" name="pushButtonConfigureMidiOut">
      <property name="text">
       <string>Configure</string>
@@ -181,35 +181,35 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="3">
+   <item row="5" column="2">
     <widget class="QPushButton" name="pushButtonConfigureMidiIn">
      <property name="text">
       <string>Configure</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item row="6" column="0" colspan="2">
     <widget class="QCheckBox" name="checkBoxMPU401">
      <property name="text">
       <string>Standalone MPU-401</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="3">
+   <item row="6" column="2">
     <widget class="QPushButton" name="pushButtonConfigureMPU401">
      <property name="text">
       <string>Configure</string>
      </property>
     </widget>
    </item>
-   <item row="10" column="0">
+   <item row="10" column="0" colspan="2">
     <widget class="QCheckBox" name="checkBoxFloat32">
      <property name="text">
       <string>Use FLOAT32 sound</string>
      </property>
     </widget>
    </item>
-   <item row="11" column="0">
+   <item row="11" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
@@ -238,7 +238,7 @@
      </layout>
     </widget>
    </item>
-   <item row="12" column="0">
+   <item row="12" column="0" colspan="3">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>

src/qt/qt_settingsstoragecontrollers.ui

@@ -40,6 +40,12 @@
        <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">
@@ -61,6 +67,12 @@
        <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="1" column="2">

src/sound/snd_ad1848.c

@@ -521,7 +521,7 @@ readonly_x:
                     }
                     if (ad1848->type == AD1848_TYPE_CS4231) /* I23 is reserved and read-only on CS4231 non-A */
                         goto readonly_i;
-                    if ((ad1848->type >= AD1848_TYPE_CS4232) || (ad1848->type <= AD1848_TYPE_CS4236)) /* I23 bits 7-1 are read-only on CS4231A/4232/4236 non-B, Win2k relies on this for detection */
+                    if ((ad1848->type >= AD1848_TYPE_CS4232) && (ad1848->type <= AD1848_TYPE_CS4236)) /* I23 bits 7-1 are read-only on CS4231A/4232/4236 non-B, Win2k relies on this for detection */
                         val = (val & 0x01);
                     break;
 

src/sound/snd_cs423x.c

@@ -40,6 +40,7 @@
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
 
+#define PNP_ROM_CS4232       "roms/sound/crystal/CS4232.BIN"
 #define PNP_ROM_CS4236B      "roms/sound/crystal/PNPISA01.BIN"
 
 #define CRYSTAL_NOEEPROM 0x100
@@ -88,6 +89,20 @@ static const uint8_t slam_init_key[32] = { 0x96, 0x35, 0x9A, 0xCD, 0xE6, 0xF3, 0
                                            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 cs4232_default[] = {
+    // clang-format off
+    /* Chip configuration */
+    0x00, /* external decode length */
+    0x48, /* reserved */
+    0x75, 0xb9, 0xfc, /* IRQ routing */
+    0x10, 0x03, /* DMA routing */
+
+    /* Default PnP data */
+    0x0e, 0x63, 0x42, 0x32, 0x00, 0x00, 0x00, 0x01, 0x00 /* hinted by documentation to be just the header */
+    // clang-format on
+};
+
 static const uint8_t cs4236_default[] = {
     // clang-format off
     /* Chip configuration */
@@ -388,9 +403,17 @@ 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)) {
+            /* Intel Atlantis, Holly, Monaco, Morrison and Thor BIOSes use several undocumented values */
+            /* 0x25, 0x60, 0x69, 0x86, 0xE2, 0xFE and 0xFF were observed on these BIOSes */
+            /* CS4232 likely accepts any written value to end RAM writes */
+            if ((val == 0x00) || (val == 0x40) || (dev->type == CRYSTAL_CS4232)) {
                 cs423x_log("CS423x: RAM end\n");
                 dev->ram_dl = CRYSTAL_RAM_CMD;
+                /* CS4232 resource data at 0x2090/2091 is written backwards */
+                if (dev->type == CRYSTAL_CS4232) {
+                    dev->ram_data[0x2090] = 0x00;
+                    dev->ram_data[0x2091] = 0x48;
+                }
 
                 /* Update PnP state and resource data. */
                 dev->pnp_size = (dev->type >= CRYSTAL_CS4236) ? 384 : 256; /* we don't know the length */
@@ -808,6 +831,10 @@ static void
 cs423x_load_defaults(cs423x_t *dev, uint8_t *dest)
 {
     switch (dev->type) {
+        case CRYSTAL_CS4232:
+            memcpy(dest, cs4232_default, sizeof(cs4232_default));
+            dev->pnp_size = 9; /* header-only PnP ROM size */
+            break;
         case CRYSTAL_CS4236:
         case CRYSTAL_CS4236B:
         case CRYSTAL_CS4237B:
@@ -841,7 +868,11 @@ cs423x_reset(void *priv)
     memset(dev->ram_data, 0, sizeof(dev->ram_data));
 
     /* Load default configuration data to RAM. */
-    cs423x_load_defaults(dev, &dev->ram_data[0x4000]);
+    /* CS4232 uses 0x2090 as the initial RAM location instead of 0x4000 */
+    if (dev->type == CRYSTAL_CS4232)
+        cs423x_load_defaults(dev, &dev->ram_data[0x2090]);
+    else
+        cs423x_load_defaults(dev, &dev->ram_data[0x4000]);
 
     if (dev->eeprom) {
         /* Load EEPROM data to RAM if the magic bytes are present. */
@@ -850,7 +881,10 @@ cs423x_reset(void *priv)
             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);
+            if (dev->type == CRYSTAL_CS4232)
+                memcpy(&dev->ram_data[0x2090], &dev->eeprom_data[4], sizeof(dev->eeprom_data) - 4);
+            else
+                memcpy(&dev->ram_data[0x4000], &dev->eeprom_data[4], sizeof(dev->eeprom_data) - 4);
         } else {
             cs423x_log("CS423x: EEPROM data invalid, ignoring\n");
         }
@@ -890,6 +924,7 @@ cs423x_init(const device_t *info)
     dev->type = info->local & 0xff;
     cs423x_log("CS423x: init(%02X)\n", dev->type);
     switch (dev->type) {
+        case CRYSTAL_CS4232:
         case CRYSTAL_CS4236:
         case CRYSTAL_CS4236B:
         case CRYSTAL_CS4237B:
@@ -897,29 +932,46 @@ cs423x_init(const device_t *info)
         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);
+            dev->ad1848_type = (dev->type >= CRYSTAL_CS4235) ? AD1848_TYPE_CS4235 : ((dev->type >= CRYSTAL_CS4236B) ? AD1848_TYPE_CS4236B : (dev->type >= CRYSTAL_CS4236) ? AD1848_TYPE_CS4236 : AD1848_TYPE_CS4232);
 
             /* 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;
+            /* Same EEPROM structure on CS4236+. CS4232 is different. */
+            if (dev->type == CRYSTAL_CS4232)
+                dev->pnp_offset = 0x2097;
+            else
+                dev->pnp_offset = 0x4013;
 
             if (!(info->local & CRYSTAL_NOEEPROM)) {
                 /* Start a new EEPROM with the default configuration data. */
                 cs423x_load_defaults(dev, &dev->eeprom_data[4]);
 
                 /* 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);
+                if (dev->type == CRYSTAL_CS4232) {
+                    FILE *fp = rom_fopen(PNP_ROM_CS4232, "rb");
+                    if (fp) {
+                        uint16_t eeprom_pnp_offset = (dev->pnp_offset & 0x0f) + 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;
+                    }
                 } else {
-                    dev->pnp_size = 0;
+                    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;
+                    }
                 }
 
                 /* Populate EEPROM header if the PnP ROM was loaded. */
@@ -932,6 +984,10 @@ cs423x_init(const device_t *info)
 
                 /* Patch PnP ROM and set EEPROM file name. */
                 switch (dev->type) {
+                    case CRYSTAL_CS4232:
+                        dev->nvr_path = "cs4232.nvr";
+                        break;
+
                     case CRYSTAL_CS4236:
                         if (dev->pnp_size) {
                             dev->eeprom_data[26] = 0x36;
@@ -1042,6 +1098,12 @@ cs423x_close(void *priv)
     free(dev);
 }
 
+static int
+cs4232_available(void)
+{
+    return rom_present(PNP_ROM_CS4232);
+}
+
 static int
 cs423x_available(void)
 {
@@ -1056,6 +1118,34 @@ cs423x_speed_changed(void *priv)
     ad1848_speed_changed(&dev->ad1848);
 }
 
+const device_t cs4232_device = {
+    .name          = "Crystal CS4232",
+    .internal_name = "cs4232",
+    .flags         = DEVICE_ISA16,
+    .local         = CRYSTAL_CS4232,
+    .init          = cs423x_init,
+    .close         = cs423x_close,
+    .reset         = cs423x_reset,
+    .available     = cs4232_available,
+    .speed_changed = cs423x_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t cs4232_onboard_device = {
+    .name          = "Crystal CS4232 (On-Board)",
+    .internal_name = "cs4232_onboard",
+    .flags         = DEVICE_ISA16,
+    .local         = CRYSTAL_CS4232 | CRYSTAL_NOEEPROM,
+    .init          = cs423x_init,
+    .close         = cs423x_close,
+    .reset         = cs423x_reset,
+    .available     = cs423x_available,
+    .speed_changed = cs423x_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
 const device_t cs4235_device = {
     .name          = "Crystal CS4235",
     .internal_name = "cs4235",

src/sound/snd_ymf71x.c

@@ -6,7 +6,7 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Yamaha YMF-71x (OPL3-SA2/3) audio controller emulation.
+ *          Yamaha YMF71x (OPL3-SA2/3) audio controller emulation.
  *
  * Authors: Cacodemon345
  *          Eluan Costa Miranda <eluancm@gmail.com>
@@ -74,7 +74,7 @@ static const uint8_t ymf71x_init_key[32] = { 0xB1, 0xD8, 0x6C, 0x36, 0x9B, 0x4D,
                                              0x33, 0x19, 0x8C, 0x46, 0xA3, 0x51, 0xA8, 0x54 };
 
 /* Reversed attenuation values borrowed from snd_sb.c */
-/* YMF-71x master volume attenuation is -30dB when all bits are 1, 0dB when all bits are 0 */
+/* YMF71x master volume attenuation is -30dB when all bits are 1, 0dB when all bits are 0 */
 static const double ymf71x_att_2dbstep_4bits[] = {
       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,  164.0
@@ -836,7 +836,7 @@ static const device_config_t ymf71x_config[] = {
 };
 
 const device_t ymf715_onboard_device = {
-    .name          = "Yamaha YMF-715 Onboard (OPL3-SA3)",
+    .name          = "Yamaha YMF715 (OPL3-SA3) (On-Board)",
     .internal_name = "ymf715_onboard",
     .flags         = DEVICE_ISA16,
     .local         = 0x102,
@@ -850,7 +850,7 @@ const device_t ymf715_onboard_device = {
 };
 
 const device_t ymf718_device = {
-    .name          = "Yamaha YMF-718 (OPL3-SA2)",
+    .name          = "Yamaha YMF718 (OPL3-SA2)",
     .internal_name = "ymf718",
     .flags         = DEVICE_ISA16,
     .local         = 0x01,
@@ -864,7 +864,7 @@ const device_t ymf718_device = {
 };
 
 const device_t ymf719_device = {
-    .name          = "Yamaha YMF-719 (OPL3-SA3)",
+    .name          = "Yamaha YMF719 (OPL3-SA3)",
     .internal_name = "ymf719",
     .flags         = DEVICE_ISA16,
     .local         = 0x02,

src/sound/sound.c

@@ -140,6 +140,7 @@ static const SOUND_CARD sound_cards[] = {
     { &azt2316a_device              },
     { &azt1605_device               },
     { &sb_goldfinch_device          },
+    { &cs4232_device                },
     { &cs4235_device                },
     { &cs4236b_device               },
     { &gus_device                   },
@@ -849,4 +850,4 @@ sound_fdd_thread_end(void)
             sound_fdd_start_event = NULL;
         }
     }
-}
+}

src/unix/CMakeLists.txt

@@ -44,6 +44,7 @@ endif()
 
 add_library(ui OBJECT
     unix_sdl.c
+    unix_osd.c
     unix_cdrom.c
     dummy_cdrom_ioctl.c
 )

src/unix/assets/86Box.spec

@@ -12,10 +12,10 @@
 # After a successful build, you can install the RPMs as follows:
 #  sudo dnf install RPMS/$(uname -m)/86Box-3* RPMS/noarch/86Box-roms*
 
-%global romver 4.1
+%global romver 5.2
 
 Name:		86Box
-Version:	5.2
+Version:	6.0
 Release:	1%{?dist}
 Summary:	Classic PC emulator
 License:	GPLv2+
@@ -121,5 +121,5 @@ popd
 %{_datadir}/%{name}/roms
 
 %changelog
-* Sat Aug 31 Jasmine Iwanek <jriwanek[AT]gmail.com> 5.2-1
+* Sat Aug 31 Jasmine Iwanek <jriwanek[AT]gmail.com> 6.0-1
 - Bump release

src/unix/assets/net.86box.86Box.metainfo.xml

@@ -11,7 +11,7 @@
     </categories>
     <launchable type="desktop-id">net.86box.86Box.desktop</launchable>
     <releases>
-      <release version="5.2" date="2025-09-18"/>
+      <release version="6.0" date="2025-10-26"/>
     </releases>
     <content_rating type="oars-1.1" />
     <description>

src/unix/unix.c

@@ -41,6 +41,7 @@
 #include <86box/device.h>
 #include <86box/gameport.h>
 #include <86box/unix_sdl.h>
+#include <86box/unix_osd.h>
 #include "cpu.h"
 #include <86box/timer.h>
 #include <86box/nvr.h>
@@ -52,6 +53,8 @@
 #define __USE_GNU 1 /* shouldn't be done, yet it is */
 #include <pthread.h>
 
+extern SDL_Window         *sdl_win;
+
 static int      first_use = 1;
 static uint64_t StartingTime;
 static uint64_t Frequency;
@@ -72,6 +75,10 @@ SDL_threadID    eventthread;
 static int      exit_event         = 0;
 static int      fullscreen_pending = 0;
 
+// Two keys to be pressed together to open the OSD, variables to make them configurable in future
+static uint16_t osd_open_first_key = SDL_SCANCODE_RCTRL;
+static uint16_t osd_open_second_key = SDL_SCANCODE_F11;
+
 static const uint16_t sdl_to_xt[0x200] = {
     [SDL_SCANCODE_ESCAPE]       = 0x01,
     [SDL_SCANCODE_1]            = 0x02,
@@ -291,7 +298,7 @@ plat_get_string(int i)
         case STRING_MONITOR_SLEEP:
             return L"Monitor in sleep mode";
         case STRING_EDID_TOO_LARGE:
-            return "EDID file \"%ls\" is too large.";
+            return L"EDID file \"%ls\" is too large.";
     }
     return L"";
 }
@@ -480,22 +487,24 @@ plat_remove(char *path)
     remove(path);
 }
 
-void
-ui_sb_update_icon_state(UNUSED(int tag), UNUSED(int state))
+void ui_sb_update_icon_state(int tag, int state)
 {
-    /* No-op. */
+    osd_ui_sb_update_icon_state(tag, state);
 }
 
-void
-ui_sb_update_icon(UNUSED(int tag), UNUSED(int active))
+void ui_sb_update_icon(int tag, int active)
 {
-    /* No-op. */
+    osd_ui_sb_update_icon(tag, active);
 }
 
-void
-ui_sb_update_icon_write(UNUSED(int tag), UNUSED(int active))
+void ui_sb_update_icon_write(int tag, int active)
 {
-    /* No-op. */
+    osd_ui_sb_update_icon_write(tag, active);
+}
+
+void ui_sb_update_icon_wp(int tag, int state)
+{
+    osd_ui_sb_update_icon_wp(tag, state);
 }
 
 void
@@ -541,7 +550,6 @@ path_get_dirname(char *dest, const char *path)
         *dest++ = *path++;
     *dest = '\0';
 }
-volatile int cpu_thread_run = 1;
 
 void
 ui_sb_set_text_w(UNUSED(wchar_t *wstr))
@@ -561,6 +569,8 @@ strnicmp(const char *s1, const char *s2, size_t n)
     return strncasecmp(s1, s2, n);
 }
 
+volatile int cpu_thread_run = 1;
+
 void
 main_thread(UNUSED(void *param))
 {
@@ -574,15 +584,20 @@ main_thread(UNUSED(void *param))
     // title_update = 1;
     old_time = SDL_GetTicks();
     drawits = frames = 0;
-    while (!is_quit && cpu_thread_run) {
+    while (!is_quit && cpu_thread_run)
+    {
         /* See if it is time to run a frame of code. */
         new_time = SDL_GetTicks();
+
 #ifdef USE_GDBSTUB
         if (gdbstub_next_asap && (drawits <= 0))
             drawits = 10;
         else
-#endif
             drawits += (new_time - old_time);
+#else
+        drawits += (new_time - old_time);
+#endif
+
         old_time = new_time;
         if (drawits > 0 && !dopause) {
             /* Yes, so do one frame now. */
@@ -599,15 +614,18 @@ main_thread(UNUSED(void *param))
                 nvr_dosave = 0;
                 frames     = 0;
             }
-        } else /* Just so we dont overload the host OS. */
+        }
+        else /* Just so we dont overload the host OS. */
             SDL_Delay(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, 0);
             else
                 plat_resize(scrnsz_x, scrnsz_y, 0);
+
             atomic_store(&doresize_monitors[0], 1);
         }
     }
@@ -760,8 +778,6 @@ ui_sb_set_ready(UNUSED(int ready))
     /* No-op. */
 }
 
-char *xargv[512];
-
 // From musl.
 char *
 local_strsep(char **str, const char *sep)
@@ -922,7 +938,7 @@ plat_get_vmm_dir(char *outbuf, const size_t len)
 }
 
 bool
-process_media_commands_3(uint8_t *id, char *fn, uint8_t *wp, int cmdargc)
+process_media_commands_3(uint8_t *id, char *fn, uint8_t *wp, char **xargv, int cmdargc)
 {
     bool err = false;
 
@@ -958,6 +974,7 @@ process_media_commands_3(uint8_t *id, char *fn, uint8_t *wp, int cmdargc)
         fn[strlen(fn) - 1] = '\0';
     return err;
 }
+
 char *(*f_readline)(const char *)          = NULL;
 int (*f_add_history)(const char *)         = NULL;
 void (*f_rl_callback_handler_remove)(void) = NULL;
@@ -968,11 +985,6 @@ 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, UNUSED(void *param))
 {
@@ -981,67 +993,50 @@ timer_onesec(uint32_t interval, UNUSED(void *param))
 }
 
 void
-monitor_thread(UNUSED(void *param))
+unix_executeLine(char *line)
 {
-#ifndef USE_CLI
-    if (isatty(fileno(stdin)) && isatty(fileno(stdout))) {
-        char  *line = NULL;
-        size_t n;
+    if (line) {
+        char *xargv[512];
+        int   cmdargc = 0;
+        char *linecpy, *linespn;
 
-        printf("86Box monitor console.\n");
-        while (!exit_event) {
-            if (feof(stdin))
+        linecpy = linespn = strdup(line);
+        linecpy[strcspn(linecpy, "\r\n")] = 0;
+
+        if (!linecpy) {
+            return;
+        }
+
+        if (f_add_history)
+            f_add_history(linecpy);
+
+        memset(xargv, 0, sizeof(xargv));
+        while (1) {
+            xargv[cmdargc++] = local_strsep(&linespn, " ");
+            if (xargv[cmdargc - 1] == NULL || cmdargc >= 512)
                 break;
-#ifdef ENABLE_READLINE
-            if (f_readline)
-                line = f_readline("(86Box) ");
-            else {
-#endif
-                printf("(86Box) ");
-                (void) !getline(&line, &n, stdin);
-#ifdef ENABLE_READLINE
-            }
-#endif
-            if (line) {
-                int   cmdargc = 0;
-                char *linecpy;
-
-                line[strcspn(line, "\r\n")] = '\0';
-                linecpy                     = strdup(line);
-                if (!linecpy) {
-                    free(line);
-                    line = NULL;
-                    continue;
-                }
-                if (f_add_history)
-                    f_add_history(line);
-                memset(xargv, 0, sizeof(xargv));
-                while (1) {
-                    xargv[cmdargc++] = local_strsep(&linecpy, " ");
-                    if (xargv[cmdargc - 1] == NULL || cmdargc >= 512)
-                        break;
-                }
-                cmdargc--;
-                if (strncasecmp(xargv[0], "help", 4) == 0) {
-                    printf(
-                        "fddload <id> <filename> <wp> - Load floppy disk image into drive <id>.\n"
-                        "cdload <id> <filename> - Load CD-ROM image into 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"
-                        "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"
-                        "pause - pause the the emulated system.\n"
-                        "fullscreen - toggle fullscreen.\n"
-                        "version - print version and license information.\n"
-                        "exit - exit 86Box.\n");
-                } else if (strncasecmp(xargv[0], "exit", 4) == 0) {
-                    exit_event = 1;
-                } else if (strncasecmp(xargv[0], "version", 7) == 0) {
+        }
+        cmdargc--;
+        if (strncasecmp(xargv[0], "help", 4) == 0) {
+            printf(
+                "fddload <id> <filename> <wp> - Load floppy disk image into drive <id>.\n"
+                "cdload <id> <filename> - Load CD-ROM image into 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"
+                "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"
+                "pause - pause the the emulated system.\n"
+                "fullscreen - toggle fullscreen.\n"
+                "version - print version and license information.\n"
+                "exit - exit 86Box.\n");
+        } else if (strncasecmp(xargv[0], "exit", 4) == 0) {
+            exit_event = 1;
+        } else if (strncasecmp(xargv[0], "version", 7) == 0) {
 #    ifndef EMU_GIT_HASH
 #        define EMU_GIT_HASH "0000000"
 #    endif
@@ -1064,169 +1059,191 @@ monitor_thread(UNUSED(void *param))
 #        define DYNAREC_STR "no dynarec"
 #    endif
 
-                    printf(
-                        "%s v%s [%s] [%s, %s]\n\n"
-                        "An emulator of old computers\n"
-                        "Authors: 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"
-                        "With previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\n"
-                        "Released under the GNU General Public License version 2 or later. See LICENSE for more information.\n",
-                        EMU_NAME, EMU_VERSION_FULL, EMU_GIT_HASH, ARCH_STR, DYNAREC_STR);
-                } else if (strncasecmp(xargv[0], "fullscreen", 10) == 0) {
-                    video_fullscreen   = video_fullscreen ? 0 : 1;
-                    fullscreen_pending = 1;
-                } else if (strncasecmp(xargv[0], "pause", 5) == 0) {
-                    plat_pause(dopause ^ 1);
-                    printf("%s", dopause ? "Paused.\n" : "Unpaused.\n");
-                } else if (strncasecmp(xargv[0], "hardreset", 9) == 0) {
-                    pc_reset_hard();
-                } else if (strncasecmp(xargv[0], "cdload", 6) == 0 && cmdargc >= 3) {
-                    uint8_t id;
-                    bool    err = false;
-                    char    fn[PATH_MAX];
+            printf(
+                "%s v%s [%s] [%s, %s]\n\n"
+                "An emulator of old computers\n"
+                "Authors: 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"
+                "With previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\n"
+                "Released under the GNU General Public License version 2 or later. See LICENSE for more information.\n",
+                EMU_NAME, EMU_VERSION_FULL, EMU_GIT_HASH, ARCH_STR, DYNAREC_STR);
+        } else if (strncasecmp(xargv[0], "fullscreen", 10) == 0) {
+            video_fullscreen   = video_fullscreen ? 0 : 1;
+            fullscreen_pending = 1;
+        } else if (strncasecmp(xargv[0], "pause", 5) == 0) {
+            plat_pause(dopause ^ 1);
+            printf("%s", dopause ? "Paused.\n" : "Unpaused.\n");
+        } else if (strncasecmp(xargv[0], "hardreset", 9) == 0) {
+            pc_reset_hard();
+        } else if (strncasecmp(xargv[0], "cdload", 6) == 0 && cmdargc >= 3) {
+            uint8_t id;
+            bool    err = false;
+            char    fn[PATH_MAX];
 
-                    if (!xargv[2] || !xargv[1]) {
-                        free(line);
-                        free(linecpy);
-                        line = NULL;
-                        continue;
+            if (!xargv[2] || !xargv[1]) {
+                free(linecpy);
+                return;
+            }
+            id = atoi(xargv[1]);
+            memset(fn, 0, sizeof(fn));
+            if (xargv[2][0] == '\'' || xargv[2][0] == '"') {
+                int curarg = 2;
+
+                for (curarg = 2; curarg < cmdargc; curarg++) {
+                    if (strlen(fn) + strlen(xargv[curarg]) >= PATH_MAX) {
+                        err = true;
+                        fprintf(stderr, "Path name too long.\n");
                     }
-                    id = atoi(xargv[1]);
-                    memset(fn, 0, sizeof(fn));
-                    if (xargv[2][0] == '\'' || xargv[2][0] == '"') {
-                        int curarg = 2;
-
-                        for (curarg = 2; curarg < cmdargc; curarg++) {
-                            if (strlen(fn) + strlen(xargv[curarg]) >= PATH_MAX) {
-                                err = true;
-                                fprintf(stderr, "Path name too long.\n");
-                            }
-                            strcat(fn, xargv[curarg] + (xargv[curarg][0] == '\'' || xargv[curarg][0] == '"'));
-                            if (fn[strlen(fn) - 1] == '\''
-                                || fn[strlen(fn) - 1] == '"') {
-                                break;
-                            }
-                            strcat(fn, " ");
+                    else
+                    {
+                        strcat(fn, xargv[curarg] + (xargv[curarg][0] == '\'' || xargv[curarg][0] == '"'));
+                        if (fn[strlen(fn) - 1] == '\''
+                            || fn[strlen(fn) - 1] == '"') {
+                            break;
                         }
-                    } else {
-                        if (strlen(xargv[2]) < PATH_MAX) {
-                            strcpy(fn, xargv[2]);
-                        } else {
-                            fprintf(stderr, "Path name too long.\n");
-                        }
-                    }
-                    if (!err) {
-
-                        if (fn[strlen(fn) - 1] == '\''
-                            || fn[strlen(fn) - 1] == '"')
-                            fn[strlen(fn) - 1] = '\0';
-                        printf("Inserting disc into CD-ROM drive %hhu: %s\n", id, fn);
-                        cdrom_mount(id, fn);
-                    }
-                } else if (strncasecmp(xargv[0], "fddeject", 8) == 0 && cmdargc >= 2) {
-                    floppy_eject(atoi(xargv[1]));
-                } else if (strncasecmp(xargv[0], "cdeject", 8) == 0 && cmdargc >= 2) {
-                    cdrom_mount(atoi(xargv[1]), "");
-                } else if (strncasecmp(xargv[0], "moeject", 8) == 0 && cmdargc >= 2) {
-                    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], "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;
-                    bool    err = false;
-                    char    fn[PATH_MAX];
-
-                    memset(fn, 0, sizeof(fn));
-
-                    if (!xargv[2] || !xargv[1]) {
-                        free(line);
-                        free(linecpy);
-                        line = NULL;
-                        continue;
-                    }
-                    err = process_media_commands_3(&id, fn, &wp, cmdargc);
-                    if (!err) {
-                        if (fn[strlen(fn) - 1] == '\''
-                            || fn[strlen(fn) - 1] == '"')
-                            fn[strlen(fn) - 1] = '\0';
-                        printf("Inserting disk into floppy drive %c: %s\n", id + 'A', fn);
-                        floppy_mount(id, fn, wp);
-                    }
-                } else if (strncasecmp(xargv[0], "moload", 7) == 0 && cmdargc >= 4) {
-                    uint8_t id;
-                    uint8_t wp;
-                    bool    err = false;
-                    char    fn[PATH_MAX];
-
-                    memset(fn, 0, sizeof(fn));
-
-                    if (!xargv[2] || !xargv[1]) {
-                        free(line);
-                        free(linecpy);
-                        line = NULL;
-                        continue;
-                    }
-                    err = process_media_commands_3(&id, fn, &wp, cmdargc);
-                    if (!err) {
-                        if (fn[strlen(fn) - 1] == '\''
-                            || fn[strlen(fn) - 1] == '"')
-                            fn[strlen(fn) - 1] = '\0';
-                        printf("Inserting into mo drive %hhu: %s\n", id, fn);
-                        mo_mount(id, fn, wp);
-                    }
-                } else if (strncasecmp(xargv[0], "cartload", 7) == 0 && cmdargc >= 4) {
-                    uint8_t id;
-                    uint8_t wp;
-                    bool    err = false;
-                    char    fn[PATH_MAX];
-
-                    memset(fn, 0, sizeof(fn));
-
-                    if (!xargv[2] || !xargv[1]) {
-                        free(line);
-                        free(linecpy);
-                        line = NULL;
-                        continue;
-                    }
-                    err = process_media_commands_3(&id, fn, &wp, cmdargc);
-                    if (!err) {
-                        if (fn[strlen(fn) - 1] == '\''
-                            || fn[strlen(fn) - 1] == '"')
-                            fn[strlen(fn) - 1] = '\0';
-                        printf("Inserting tape into cartridge holder %hhu: %s\n", id, fn);
-                        cartridge_mount(id, fn, wp);
-                    }
-                } else if (strncasecmp(xargv[0], "rdiskload", 7) == 0 && cmdargc >= 4) {
-                    uint8_t id;
-                    uint8_t wp;
-                    bool    err = false;
-                    char    fn[PATH_MAX];
-
-                    memset(fn, 0, sizeof(fn));
-
-                    if (!xargv[2] || !xargv[1]) {
-                        free(line);
-                        free(linecpy);
-                        line = NULL;
-                        continue;
-                    }
-                    err = process_media_commands_3(&id, fn, &wp, cmdargc);
-                    if (!err) {
-                        if (fn[strlen(fn) - 1] == '\''
-                            || fn[strlen(fn) - 1] == '"')
-                            fn[strlen(fn) - 1] = '\0';
-                        printf("Inserting disk into removable disk drive %c: %s\n", id + 'A', fn);
-                        rdisk_mount(id, fn, wp);
+                        strcat(fn, " ");
                     }
                 }
-                free(line);
-                free(linecpy);
-                line = NULL;
+            } else {
+                if (strlen(xargv[2]) < PATH_MAX) {
+                    strncpy(fn, xargv[2], PATH_MAX-1);
+                } else {
+                    fprintf(stderr, "Path name too long.\n");
+                }
             }
+            if (!err) {
+
+                if (fn[strlen(fn) - 1] == '\''
+                    || fn[strlen(fn) - 1] == '"')
+                    fn[strlen(fn) - 1] = '\0';
+                printf("Inserting disc into CD-ROM drive %hhu: %s\n", id, fn);
+                cdrom_mount(id, fn);
+            }
+        } else if (strncasecmp(xargv[0], "fddeject", 8) == 0 && cmdargc >= 2) {
+            floppy_eject(atoi(xargv[1]));
+        } else if (strncasecmp(xargv[0], "cdeject", 8) == 0 && cmdargc >= 2) {
+            cdrom_mount(atoi(xargv[1]), "");
+        } else if (strncasecmp(xargv[0], "moeject", 8) == 0 && cmdargc >= 2) {
+            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], "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;
+            bool    err = false;
+            char    fn[PATH_MAX];
+
+            memset(fn, 0, sizeof(fn));
+
+            if (!xargv[2] || !xargv[1]) {
+                free(linecpy);
+                return;
+            }
+            err = process_media_commands_3(&id, fn, &wp, xargv, cmdargc);
+            if (!err) {
+                if (fn[strlen(fn) - 1] == '\''
+                    || fn[strlen(fn) - 1] == '"')
+                    fn[strlen(fn) - 1] = '\0';
+                printf("Inserting disk into floppy drive %c: %s\n", id + 'A', fn);
+                floppy_mount(id, fn, wp);
+            }
+        } else if (strncasecmp(xargv[0], "moload", 7) == 0 && cmdargc >= 4) {
+            uint8_t id;
+            uint8_t wp;
+            bool    err = false;
+            char    fn[PATH_MAX];
+
+            memset(fn, 0, sizeof(fn));
+
+            if (!xargv[2] || !xargv[1]) {
+                free(linecpy);
+                return;
+            }
+            err = process_media_commands_3(&id, fn, &wp, xargv, cmdargc);
+            if (!err) {
+                if (fn[strlen(fn) - 1] == '\''
+                    || fn[strlen(fn) - 1] == '"')
+                    fn[strlen(fn) - 1] = '\0';
+                printf("Inserting into mo drive %hhu: %s\n", id, fn);
+                mo_mount(id, fn, wp);
+            }
+        } else if (strncasecmp(xargv[0], "cartload", 7) == 0 && cmdargc >= 4) {
+            uint8_t id;
+            uint8_t wp;
+            bool    err = false;
+            char    fn[PATH_MAX];
+
+            memset(fn, 0, sizeof(fn));
+
+            if (!xargv[2] || !xargv[1]) {
+                free(linecpy);
+                return;
+            }
+            err = process_media_commands_3(&id, fn, &wp, xargv, cmdargc);
+            if (!err) {
+                if (fn[strlen(fn) - 1] == '\''
+                    || fn[strlen(fn) - 1] == '"')
+                    fn[strlen(fn) - 1] = '\0';
+                printf("Inserting tape into cartridge holder %hhu: %s\n", id, fn);
+                cartridge_mount(id, fn, wp);
+            }
+        } else if (strncasecmp(xargv[0], "rdiskload", 7) == 0 && cmdargc >= 4) {
+            uint8_t id;
+            uint8_t wp;
+            bool    err = false;
+            char    fn[PATH_MAX];
+
+            memset(fn, 0, sizeof(fn));
+
+            if (!xargv[2] || !xargv[1]) {
+                free(linecpy);
+                return;
+            }
+            err = process_media_commands_3(&id, fn, &wp, xargv, cmdargc);
+            if (!err) {
+                if (fn[strlen(fn) - 1] == '\''
+                    || fn[strlen(fn) - 1] == '"')
+                    fn[strlen(fn) - 1] = '\0';
+                printf("Inserting disk into removable disk drive %c: %s\n", id + 'A', fn);
+                rdisk_mount(id, fn, wp);
+            }
+        }
+        free(linecpy);
+    }
+}
+
+void
+monitor_thread(UNUSED(void *param))
+{
+#ifndef USE_CLI
+    if (isatty(fileno(stdin)) && isatty(fileno(stdout))) {
+        char  *line = NULL;
+        size_t n;
+
+        printf("86Box monitor console.\n");
+        while (!exit_event)
+        {
+            if (feof(stdin))
+                break;
+
+#ifdef ENABLE_READLINE
+            if (f_readline)
+                line = f_readline("(86Box) ");
+            else {
+#endif
+                printf("(86Box) ");
+                (void) !getline(&line, &n, stdin);
+#ifdef ENABLE_READLINE
+            }
+#endif
+
+            unix_executeLine(line);
+
+            free(line);
+            line = NULL;
         }
     }
 #endif
@@ -1283,106 +1300,41 @@ main(int argc, char **argv)
     plat_pause(0);
 
     /* Initialize the rendering window, or fullscreen. */
-
     do_start();
+
 #ifndef USE_CLI
     thread_create(monitor_thread, NULL);
 #endif
+
     SDL_AddTimer(1000, timer_onesec, NULL);
-    while (!is_quit) {
+    while (!is_quit)
+    {
         static int mouse_inside = 0;
+        static int osd_first_key_pressed = 0;
+        static int flag_osd_open = 0;
 
-        while (SDL_PollEvent(&event)) {
-            switch (event.type) {
-                case SDL_QUIT:
-                    exit_event = 1;
-                    break;
-                case SDL_MOUSEWHEEL:
+        while (SDL_PollEvent(&event))
+        {
+            if (flag_osd_open == 1)
+            {
+                // route almost everything to the OSD
+                switch (event.type)
+                {
+                    case SDL_QUIT:
                     {
-                        if (mouse_capture || video_fullscreen) {
-                            if (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED) {
-                                event.wheel.x *= -1;
-                                event.wheel.y *= -1;
-                            }
-                            SDL_LockMutex(mousemutex);
-                            mouse_set_z(event.wheel.y);
-                            SDL_UnlockMutex(mousemutex);
-                        }
+                        exit_event = 1;
                         break;
                     }
-                case SDL_MOUSEMOTION:
-                    {
-                        if (mouse_capture || video_fullscreen) {
-                            SDL_LockMutex(mousemutex);
-                            mouse_scale(event.motion.xrel, event.motion.yrel);
-                            SDL_UnlockMutex(mousemutex);
-                        }
-                        break;
-                    }
-                case SDL_MOUSEBUTTONDOWN:
-                case SDL_MOUSEBUTTONUP:
-                    {
-                        if ((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;
-                                case SDL_BUTTON_X1:
-                                    buttonmask = 8;
-                                    break;
-                                case SDL_BUTTON_X2:
-                                    buttonmask = 16;
-                                    break;
-                            }
-                            SDL_LockMutex(mousemutex);
-                            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);
-                            SDL_UnlockMutex(mousemutex);
-                        }
-                        break;
-                    }
-                case SDL_RENDER_DEVICE_RESET:
-                case SDL_RENDER_TARGETS_RESET:
+                    case SDL_RENDER_DEVICE_RESET:
+                    case SDL_RENDER_TARGETS_RESET:
                     {
                         extern void sdl_reinit_texture(void);
 
+                        printf("reinit tex\n");
                         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);
-                    }
-                case SDL_WINDOWEVENT:
+                    case SDL_WINDOWEVENT:
                     {
                         switch (event.window.event) {
                             case SDL_WINDOWEVENT_ENTER:
@@ -1392,9 +1344,190 @@ main(int argc, char **argv)
                                 mouse_inside = 0;
                                 break;
                         }
+                        break;
                     }
+                    default:
+                    {
+                        // route everything else
+                        flag_osd_open = osd_handle(event);
+
+                        if (flag_osd_open == 0)
+                        {
+                            // close it
+                            osd_close(event);
+                        }
+
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                switch (event.type)
+                {
+                    case SDL_QUIT:
+                        exit_event = 1;
+                        break;
+                    case SDL_MOUSEWHEEL:
+                        {
+                            if (mouse_capture || video_fullscreen) {
+                                if (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED) {
+                                    event.wheel.x *= -1;
+                                    event.wheel.y *= -1;
+                                }
+                                SDL_LockMutex(mousemutex);
+                                mouse_set_z(event.wheel.y);
+                                SDL_UnlockMutex(mousemutex);
+                            }
+                            break;
+                        }
+                    case SDL_MOUSEMOTION:
+                        {
+                            if (mouse_capture || video_fullscreen) {
+                                SDL_LockMutex(mousemutex);
+                                mouse_scale(event.motion.xrel, event.motion.yrel);
+                                SDL_UnlockMutex(mousemutex);
+                            }
+                            break;
+                        }
+                    /* Touch events */
+                    case SDL_FINGERDOWN:
+                        {
+                            // Trap these but ignore them for now
+                            break;
+                        }
+                    case SDL_FINGERUP:
+                        {
+                            // Trap these but ignore them for now
+                            break;
+                        }
+                    case SDL_FINGERMOTION:
+                        {
+                            // See SDL_TouchFingerEvent
+                            if (mouse_capture || video_fullscreen) {
+                                SDL_LockMutex(mousemutex);
+
+                                // Real multiplier is the window size
+                                int w, h;
+                                SDL_GetWindowSize(sdl_win, &w, &h);
+
+                                mouse_scale((int)(event.tfinger.dx * w), (int)(event.tfinger.dy * h));
+                                SDL_UnlockMutex(mousemutex);
+                            }
+                            break;
+                        }
+
+                    case SDL_MOUSEBUTTONDOWN:
+                    case SDL_MOUSEBUTTONUP:
+                        {
+                            if ((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;
+                                    case SDL_BUTTON_X1:
+                                        buttonmask = 8;
+                                        break;
+                                    case SDL_BUTTON_X2:
+                                        buttonmask = 16;
+                                        break;
+                                    default:
+                                        printf("Unknown mouse button %d\n", event.button.button);
+                                }
+                                SDL_LockMutex(mousemutex);
+                                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);
+                                SDL_UnlockMutex(mousemutex);
+                            }
+                            break;
+                        }
+                    case SDL_RENDER_DEVICE_RESET:
+                    case SDL_RENDER_TARGETS_RESET:
+                        {
+                            extern void sdl_reinit_texture(void);
+
+                            sdl_reinit_texture();
+                            break;
+                        }
+                    case SDL_KEYDOWN:
+                    case SDL_KEYUP:
+                        {
+                            uint16_t xtkey = 0;
+
+                            if (event.key.keysym.scancode == osd_open_first_key)
+                            {
+                                if (event.type == SDL_KEYDOWN)
+                                    osd_first_key_pressed = 1;
+                                else
+                                    osd_first_key_pressed = 0;
+                            }
+                            else if (osd_first_key_pressed && event.type == SDL_KEYDOWN && event.key.keysym.scancode == osd_open_second_key)
+                            {
+                                // open OSD!
+                                flag_osd_open = osd_open(event);
+
+                                // we can assume alt-gr has been released, tell this also to the virtual machine
+                                osd_first_key_pressed = 0;
+                                keyboard_input(0, sdl_to_xt[osd_open_first_key]);
+                                break;
+                            }
+                            else
+                            {
+                                // invalidate osd_first_key_pressed is something happens between its keydown and keydown for G
+                                osd_first_key_pressed = 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;
+                            }
+                            break;
+                        }
+                    default:
+                    {
+                        // printf("Unhandled SDL event: %d\n", event.type);
+                        break;
+                    }
+                }
             }
         }
+
         if (blitreq) {
             extern void sdl_blit(int x, int y, int w, int h);
             sdl_blit(params.x, params.y, params.w, params.h);

src/unix/unix_cdrom.c

@@ -43,13 +43,14 @@ cassette_mount(char *fn, uint8_t wp)
     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);
-#if 0
-    media_menu_update_cassette();
-#endif
+
     ui_sb_update_tip(SB_CASSETTE);
+
     config_save();
 }
 
@@ -58,11 +59,11 @@ cassette_eject(void)
 {
     pc_cas_set_fname(cassette, NULL);
     memset(cassette_fname, 0x00, sizeof(cassette_fname));
+
     ui_sb_update_icon_state(SB_CASSETTE, 1);
-#if 0
-    media_menu_update_cassette();
-#endif
+
     ui_sb_update_tip(SB_CASSETTE);
+
     config_save();
 }
 
@@ -71,11 +72,11 @@ 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);
-#if 0
-    media_menu_update_cartridge(id);
-#endif
+
     ui_sb_update_tip(SB_CARTRIDGE | id);
+
     config_save();
 }
 
@@ -83,11 +84,11 @@ void
 cartridge_eject(uint8_t id)
 {
     cart_close(id);
+
     ui_sb_update_icon_state(SB_CARTRIDGE | id, 1);
-#if 0
-    media_menu_update_cartridge(id);
-#endif
+
     ui_sb_update_tip(SB_CARTRIDGE | id);
+
     config_save();
 }
 
@@ -97,11 +98,11 @@ 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);
-#if 0
-    media_menu_update_floppy(id);
-#endif
+
     ui_sb_update_tip(SB_FLOPPY | id);
+
     config_save();
 }
 
@@ -109,11 +110,11 @@ void
 floppy_eject(uint8_t id)
 {
     fdd_close(id);
+
     ui_sb_update_icon_state(SB_FLOPPY | id, 1);
-#if 0
-    media_menu_update_floppy(id);
-#endif
+
     ui_sb_update_tip(SB_FLOPPY | id);
+
     config_save();
 }
 
@@ -128,34 +129,16 @@ plat_cdrom_ui_update(uint8_t id, UNUSED(uint8_t reload))
         ui_sb_update_icon_state(SB_CDROM | id, 0);
     }
 
-#if 0
-    media_menu_update_cdrom(id);
-#endif
     ui_sb_update_tip(SB_CDROM | id);
 }
 
 void
 cdrom_mount(uint8_t id, char *fn)
 {
-    strcpy(cdrom[id].prev_image_path, cdrom[id].image_path);
-    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] = '/';
-    image_open(&(cdrom[id]), fn);
-    /* Signal media change to the emulated machine. */
-    if (cdrom[id].insert)
-        cdrom[id].insert(cdrom[id].priv);
-    if (cdrom[id].image_path[0] == 0x00)
-        ui_sb_update_icon_state(SB_CDROM | id, 0);
-    else
-        ui_sb_update_icon_state(SB_CDROM | id, 1);
-#if 0
-    media_menu_update_cdrom(id);
-#endif
-    ui_sb_update_tip(SB_CDROM | id);
+    int ret = cdrom_load( &(cdrom[id]), fn, 0);
+
+    plat_cdrom_ui_update(id, 0);
+
     config_save();
 }
 
@@ -171,9 +154,7 @@ mo_eject(uint8_t id)
     }
 
     ui_sb_update_icon_state(SB_MO | id, 1);
-#if 0
-    media_menu_update_mo(id);
-#endif
+
     ui_sb_update_tip(SB_MO | id);
     config_save();
 }
@@ -188,9 +169,7 @@ mo_mount(uint8_t id, char *fn, uint8_t wp)
     mo_load(dev, fn, 0);
 
     ui_sb_update_icon_state(SB_MO | id, strlen(mo_drives[id].image_path) ? 0 : 1);
-#if 0
-    media_menu_update_mo(id);
-#endif
+
     ui_sb_update_tip(SB_MO | id);
 
     config_save();
@@ -208,9 +187,6 @@ mo_reload(uint8_t id)
         ui_sb_update_icon_state(SB_MO | id, 0);
     }
 
-#if 0
-    media_menu_update_mo(id);
-#endif
     ui_sb_update_tip(SB_MO | id);
 
     config_save();
@@ -228,10 +204,9 @@ rdisk_eject(uint8_t id)
     }
 
     ui_sb_update_icon_state(SB_RDISK | id, 1);
-#if 0
-    media_menu_update_rdisk(id);
-#endif
+
     ui_sb_update_tip(SB_RDISK | id);
+
     config_save();
 }
 
@@ -245,9 +220,7 @@ rdisk_mount(uint8_t id, char *fn, uint8_t wp)
     rdisk_load(dev, fn, 0);
 
     ui_sb_update_icon_state(SB_RDISK | id, strlen(rdisk_drives[id].image_path) ? 0 : 1);
-#if 0
-    media_menu_update_rdisk(id);
-#endif
+
     ui_sb_update_tip(SB_RDISK | id);
 
     config_save();
@@ -265,9 +238,6 @@ rdisk_reload(uint8_t id)
         ui_sb_update_icon_state(SB_RDISK | id, 0);
     }
 
-#if 0
-    media_menu_update_rdisk(id);
-#endif
     ui_sb_update_tip(SB_RDISK | id);
 
     config_save();

src/unix/unix_osd.c

@@ -0,0 +1,563 @@
+#include <SDL.h>
+#include <SDL_messagebox.h>
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <dirent.h>
+#include <string.h>
+#include <sys/param.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/version.h>
+#include <86box/unix_sdl.h>
+#include <86box/unix_osd.h>
+#include <86box/unix_osd_font.h>
+
+static int SCREEN_W = 640;
+static int SCREEN_H = 480;
+static int BOX_W = 240;
+static int BOX_H = 160;
+#define LINE_HEIGHT 16
+#define TITLE_HEIGHT 16
+#define CHAR_W 8
+#define CHAR_H 8
+
+// this makes the osd embeddable in the 86box main sdl loop
+#define OSD_INSIDE_MAIN_LOOP
+
+// interface to SDL environment
+extern SDL_Window         *sdl_win;
+extern SDL_Renderer       *sdl_render;
+extern SDL_mutex          *sdl_mutex;
+
+// interface back to main unix monitor implementation
+extern void unix_executeLine(char *line);
+
+// interface to the currently set window title, this can't be seen normally in a fullscreen setup
+extern wchar_t sdl_win_title[512];
+char sdl_win_title_mb[512] = "";
+
+static SDL_Texture *font_texture = NULL;
+
+typedef enum {
+    STATE_MENU,
+    STATE_FILESELECT_FLOPPY,
+    STATE_FILESELECT_CD,
+    STATE_FILESELECT_RDISK,
+    STATE_FILESELECT_CART,
+    STATE_FILESELECT_MO
+} AppState;
+
+static const char *menu_items[] = {
+    "fddload - Load floppy disk image",
+    "cdload - Load CD-ROM image",
+    "rdiskload - Load removable disk image",
+    "cartload - Load cartridge image",
+    "moload - Load MO image",
+    "fddeject - eject disk from floppy drive",
+    "cdeject - eject disc from CD-ROM drive",
+    "rdiskeject - eject removable disk",
+    "carteject - eject cartridge",
+    "moeject - eject image from MO drive",
+    "hardreset - hard reset the emulated system",
+    // "pause - pause the the emulated system",
+    "fullscreen - toggle fullscreen",
+    "version - print version and license information",
+    "exit - exit 86Box",
+    "close OSD"
+};
+#define MENU_ITEMS (sizeof(menu_items) / sizeof(menu_items[0]))
+
+// chars per cols and rows
+static int font_cols = 16;
+
+static int selected = 0;
+static int file_selected = 0;
+static int scroll_offset = 0;
+
+static int osd_is_open = 0;
+static AppState state = STATE_MENU;
+
+static char files[100][1024];
+static int file_count = 0;
+
+static int max_visible = 0;
+
+void reset_iso_files(void)
+{
+    file_selected = 0;
+    scroll_offset = 0;
+
+    file_count = 0;
+    memset(files, 0, sizeof(files));
+}
+
+static int endswith(char *s1, char *mask)
+{
+    int ss = strlen(s1);
+    int sm = strlen(mask);
+    return ss >= sm && strncasecmp(s1+ss-sm, mask, sm) == 0;
+}
+
+int load_iso_files(char *basedir, char files[][1024], int max_files, char *mask)
+{
+    DIR *d;
+    struct dirent *dir;
+    int count = file_count;
+    d = opendir(basedir);
+    if (!d)
+        return file_count;
+
+    while ((dir = readdir(d)) != NULL && count < max_files)
+    {
+        if (endswith(dir->d_name, mask))
+        {
+            strcpy(files[count], basedir);
+            strcat(files[count], "/");
+            strcat(files[count], dir->d_name);
+
+            count++;
+        }
+    }
+
+    closedir(d);
+
+    return count;
+}
+
+void draw_text(SDL_Renderer *renderer, const char *text, int x, int y, SDL_Color color)
+{
+    if (!font_texture)
+        return;
+
+    SDL_SetTextureColorMod(font_texture, color.r, color.g, color.b);
+
+    int i = 0;
+    while (text[i])
+    {
+        unsigned char c = text[i];
+        int tx = (c % font_cols) * CHAR_W;
+        int ty = (c / font_cols) * CHAR_H;
+        SDL_Rect src = {tx, ty, CHAR_W, CHAR_H};
+        SDL_Rect dst = {x + i * CHAR_W, y, CHAR_W, CHAR_H};
+        SDL_RenderCopy(renderer, font_texture, &src, &dst);
+        i++;
+    }
+}
+
+void draw_box_with_border(SDL_Renderer *renderer, SDL_Rect box)
+{
+    SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255);
+    SDL_RenderDrawRect(renderer, &box);
+
+    SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
+    SDL_Rect inner = {box.x + 2, box.y + 2, box.w - 4, box.h - 4};
+    SDL_RenderDrawRect(renderer, &inner);
+
+    SDL_SetRenderDrawColor(renderer, 0, 0, 128, 255);
+    SDL_RenderFillRect(renderer, &inner);
+}
+
+
+void draw_menu(SDL_Renderer *renderer, int selected)
+{
+    int x0 = (SCREEN_W - BOX_W) / 2;
+    int y0 = (SCREEN_H - BOX_H) / 2;
+    SDL_Rect box = {x0, y0, BOX_W, BOX_H};
+    draw_box_with_border(renderer, box);
+
+    draw_text(renderer, "MAIN MENU", x0 + 20, y0 + 5, (SDL_Color){255,255,255,255});
+
+    wcstombs(sdl_win_title_mb, sdl_win_title, 256);
+    draw_text(renderer, sdl_win_title_mb, x0 + 120, y0 + 5, (SDL_Color){255,255,255,255});
+
+    for (int i = 0; i < MENU_ITEMS; i++)
+    {
+        int tx = x0 + 20;
+        int ty = y0 + TITLE_HEIGHT + i * LINE_HEIGHT;
+
+        SDL_Color textColor;
+        SDL_Rect bgRect = {tx - 5, ty - 2, BOX_W - 20, LINE_HEIGHT};
+
+        if (i == selected) {
+            SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
+            SDL_RenderFillRect(renderer, &bgRect);
+            textColor = (SDL_Color){0, 0, 0, 255};
+        } else {
+            textColor = (SDL_Color){255, 255, 0, 255};
+        }
+
+        draw_text(renderer, menu_items[i], tx, ty, textColor);
+    }
+
+#ifndef OSD_INSIDE_MAIN_LOOP
+    SDL_RenderPresent(renderer);
+#endif
+}
+
+void draw_file_selector(SDL_Renderer *renderer,
+                        char *title,
+                        char files[][1024], int file_count,
+                        int selected, int scroll_offset, int max_visible)
+{
+    int x0 = (SCREEN_W - BOX_W) / 2;
+    int y0 = (SCREEN_H - BOX_H) / 2;
+    SDL_Rect box = {x0, y0, BOX_W, BOX_H};
+    draw_box_with_border(renderer, box);
+
+    draw_text(renderer, title, x0 + 20, y0 + 5, (SDL_Color){255,255,255,255});
+
+    if (file_count == 0) {
+        draw_text(renderer, "No files.",
+                  x0 + 20, y0 + TITLE_HEIGHT + 10,
+                  (SDL_Color){255, 255, 0, 255});
+    } else {
+        for (int i = 0; i < max_visible && (i + scroll_offset) < file_count; i++) {
+            int index = i + scroll_offset;
+            int tx = x0 + 20;
+            int ty = y0 + TITLE_HEIGHT + i * LINE_HEIGHT;
+
+            SDL_Color textColor;
+            SDL_Rect bgRect = {tx - 5, ty - 2, 200, LINE_HEIGHT};
+
+            if (index == selected) {
+                SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
+                SDL_RenderFillRect(renderer, &bgRect);
+                textColor = (SDL_Color){0, 0, 0, 255};
+            } else {
+                textColor = (SDL_Color){255, 255, 0, 255};
+            }
+
+            draw_text(renderer, files[index], tx, ty, textColor);
+        }
+    }
+
+#ifndef OSD_INSIDE_MAIN_LOOP
+    SDL_RenderPresent(renderer);
+#endif
+}
+
+void osd_init(void)
+{
+    // debug: fprintf(stderr, "OSD INIT\n");
+
+    if (font_texture == NULL)
+    {
+        // debug: fprintf(stderr, "OSD INIT FONT\n");
+
+        // Carica font bitmap (font.bmp 128x128, 16x16 caratteri, 8x8 ciascuno)
+        SDL_RWops *rwop  = SDL_RWFromConstMem(_________font_bmp, _________font_bmp_len);
+        if (!rwop)
+        {
+            fprintf(stderr, "Cannot create a new SDL RW stream: %s\n", SDL_GetError());
+            return;
+        }
+
+        // auto-closes the stream
+        SDL_Surface *font_surface = SDL_LoadBMP_RW(rwop, 1);
+        if (!font_surface) {
+            fprintf(stderr, "Cannot create a surface using RW stream: %s\n", SDL_GetError());
+            return;
+        }
+
+        // Imposta trasparenza sul nero puro
+        SDL_SetColorKey(font_surface, SDL_TRUE, SDL_MapRGB(font_surface->format, 0, 0, 0));
+        font_texture = SDL_CreateTextureFromSurface(sdl_render, font_surface);
+        SDL_FreeSurface(font_surface);
+    }
+}
+
+void osd_deinit(void)
+{
+    // nothing to do
+    // debug: fprintf(stderr, "OSD DEINIT\n");
+
+    // will be implicitly freed on exit
+    // SDL_DestroyTexture(font_texture);
+
+    font_texture = NULL;
+}
+
+int osd_open(SDL_Event event)
+{
+    // ok opened
+    // debug: fprintf(stderr, "OSD OPEN\n");
+
+    SDL_GetWindowSize(sdl_win, &SCREEN_W, &SCREEN_H);
+    BOX_W = (SCREEN_W / 4) * 3;
+    BOX_H = (SCREEN_H / 4) * 3;
+
+    max_visible = (BOX_H - TITLE_HEIGHT) / LINE_HEIGHT;
+
+    osd_is_open = 1;
+
+    return 1;
+}
+
+int osd_close(SDL_Event event)
+{
+    // ok closed
+    // debug: fprintf(stderr, "OSD CLOSE\n");
+
+    osd_is_open = 0;
+
+    return 1;
+}
+
+static void osd_cmd_run(char *c)
+{
+    char *l = calloc(strlen(c)+2, 1);
+    strcpy(l, c);
+    unix_executeLine(l);
+    free(l);
+}
+
+void osd_present(void)
+{
+    // shortcut
+    if (!osd_is_open)
+        return;
+
+#ifndef OSD_INSIDE_MAIN_LOOP
+    SDL_LockMutex(sdl_mutex);
+#endif
+
+    if (state == STATE_MENU) {
+        draw_menu(sdl_render, selected);
+    }
+    else if (state == STATE_FILESELECT_FLOPPY) {
+        draw_file_selector(sdl_render, "SELECT FLOPPY IMAGE", files, file_count, file_selected, scroll_offset, max_visible);
+    }
+    else if (state == STATE_FILESELECT_CD) {
+        draw_file_selector(sdl_render, "SELECT CD ISO IMAGE", files, file_count, file_selected, scroll_offset, max_visible);
+    }
+    else if (state == STATE_FILESELECT_RDISK) {
+        draw_file_selector(sdl_render, "SELECT REMOVABLE DISK IMAGE", files, file_count, file_selected, scroll_offset, max_visible);
+    }
+    else if (state == STATE_FILESELECT_CART) {
+        draw_file_selector(sdl_render, "SELECT CARTRIDGE IMAGE", files, file_count, file_selected, scroll_offset, max_visible);
+    }
+    else if (state == STATE_FILESELECT_MO) {
+        draw_file_selector(sdl_render, "SELECT MO IMAGE", files, file_count, file_selected, scroll_offset, max_visible);
+    }
+
+
+#ifndef OSD_INSIDE_MAIN_LOOP
+    SDL_UnlockMutex(sdl_mutex);
+#endif
+}
+
+int osd_handle(SDL_Event event)
+{
+    // debug: fprintf(stderr, "OSD HANDLE\n");
+
+    if (event.type == SDL_KEYUP)
+    {
+        if (event.key.keysym.scancode == SDL_SCANCODE_ESCAPE)
+        {
+            if (state == STATE_MENU)
+            {
+                // Close the OSD
+                // debug: fprintf(stderr, "OSD HANDLE: escape\n");
+                return 0;
+            }
+            else
+            {
+                // Back to Main and keep it open
+                state = STATE_MENU;
+                return 1;
+            }
+        }
+
+        if (state == STATE_MENU)
+        {
+            switch (event.key.keysym.sym)
+            {
+                case SDLK_UP:
+                    selected = (selected - 1 + MENU_ITEMS) % MENU_ITEMS;
+                    break;
+
+                case SDLK_DOWN:
+                    selected = (selected + 1) % MENU_ITEMS;
+                    break;
+
+                case SDLK_RETURN:
+                case SDLK_KP_ENTER:
+                    switch (selected)
+                    {
+                        case 0 : // "fddload - Load floppy disk image",
+                            reset_iso_files();
+                            file_count = load_iso_files(".", files, 100, ".img");
+                            file_count = load_iso_files("/mnt", files, 100, ".img");
+                            file_count = load_iso_files("/mnt/usbkey", files, 100, ".img");
+                            state = STATE_FILESELECT_FLOPPY;
+                            break;
+
+                        case 1 : // "cdload - Load CD-ROM image",
+                            reset_iso_files();
+                            file_count = load_iso_files(".", files, 100, ".iso");
+                            file_count = load_iso_files("/mnt", files, 100, ".iso");
+                            file_count = load_iso_files("/mnt/usbkey", files, 100, ".iso");
+                            state = STATE_FILESELECT_CD;
+                            break;
+
+                        case 2 : // "rdiskload - Load removable disk image",
+                            reset_iso_files();
+                            file_count = load_iso_files(".", files, 100, ".img");
+                            file_count = load_iso_files("/mnt", files, 100, ".img");
+                            file_count = load_iso_files("/mnt/usbkey", files, 100, ".img");
+                            state = STATE_FILESELECT_RDISK;
+                            break;
+
+                        case 3 : // "cartload - Load cartridge image",
+                            reset_iso_files();
+                            file_count = load_iso_files(".", files, 100, ".img");
+                            file_count = load_iso_files("/mnt", files, 100, ".img");
+                            file_count = load_iso_files("/mnt/usbkey", files, 100, ".img");
+                            state = STATE_FILESELECT_CART;
+                            break;
+
+                        case 4 : // "moload - Load MO image",
+                            reset_iso_files();
+                            file_count = load_iso_files(".", files, 100, ".img");
+                            file_count = load_iso_files("/mnt", files, 100, ".img");
+                            file_count = load_iso_files("/mnt/usbkey", files, 100, ".img");
+                            state = STATE_FILESELECT_MO;
+                            break;
+
+                        case 5 : // "fddeject - eject disk from floppy drive",
+                            osd_cmd_run("fddeject 0");
+                            return 0;
+
+                        case 6 : // "cdeject - eject disc from CD-ROM drive",
+                            osd_cmd_run("cdeject 0");
+                            return 0;
+
+                        case 7 : // "rdiskeject - eject removable disk",
+                            osd_cmd_run("rdiskeject 0");
+                            return 0;
+
+                        case 8 : // "carteject - eject cartridge",
+                            osd_cmd_run("carteject 0");
+                            return 0;
+
+                        case 9 : // "moeject - eject image from MO drive",
+                            osd_cmd_run("moeject 0");
+                            return 0;
+
+                        case 10 : // "hardreset - hard reset the emulated system",
+                            osd_cmd_run("hardreset");
+                            return 0;
+
+                        /* better not pause ourself, we will be unable to get out of it
+                        case 11 : // "pause - pause the the emulated system",
+                            osd_cmd_run("pause");
+                            return 0;
+                        */
+
+                        case 11 : // "fullscreen - toggle fullscreen",
+                            osd_cmd_run("fullscreen");
+                            return 0;
+
+                        case 12 : // "version - print version and license information",
+                            osd_cmd_run("version");
+                            return 0;
+
+                        case 13 : // "exit - exit 86Box",
+                            osd_cmd_run("exit");
+                            return 0;
+
+                        case 14 : // "close OSD"
+                            // return zero does directly close the OSD
+                            return 0;
+                    }
+                    break;
+            }
+        }
+        else if (state == STATE_FILESELECT_FLOPPY || state == STATE_FILESELECT_CD || state == STATE_FILESELECT_RDISK || state == STATE_FILESELECT_CART || state == STATE_FILESELECT_MO)
+        {
+            if (file_count == 0)
+            {
+                // no files, there is nothing else to do
+                if (event.key.keysym.sym == SDLK_ESCAPE) {
+                    state = STATE_MENU;
+                }
+            }
+            else
+            {
+                switch (event.key.keysym.sym) {
+                    case SDLK_UP:
+                        if (file_selected > 0) {
+                            file_selected--;
+                            if (file_selected < scroll_offset) {
+                                scroll_offset--;
+                            }
+                        }
+                        break;
+                    case SDLK_DOWN:
+                        if (file_selected < file_count - 1) {
+                            file_selected++;
+                            if (file_selected >= scroll_offset + max_visible) {
+                                scroll_offset++;
+                            }
+                        }
+                        break;
+
+                    case SDLK_RETURN:
+                    case SDLK_KP_ENTER:
+                    {
+                        char cmd[1280] = "";
+
+                        if (state == STATE_FILESELECT_FLOPPY)
+                            sprintf(cmd, "fddload 0 %s 0", files[file_selected]);
+                        if (state == STATE_FILESELECT_CD)
+                            sprintf(cmd, "cdload 0 %s", files[file_selected]);
+                        if (state == STATE_FILESELECT_RDISK)
+                            sprintf(cmd, "rdiskload 0 %s 0", files[file_selected]);
+                        if (state == STATE_FILESELECT_CART)
+                            sprintf(cmd, "cartload 0 %s 0", files[file_selected]);
+                        if (state == STATE_FILESELECT_MO)
+                            sprintf(cmd, "moload 0 %s 0", files[file_selected]);
+
+                        unix_executeLine(cmd);
+                        state = STATE_MENU;
+                    }
+                        return 0;
+
+                    case SDLK_ESCAPE:
+                        state = STATE_MENU;
+                        break;
+                }
+            }
+        }
+    }
+
+    // Keep it open
+    return 1;
+}
+
+void osd_ui_sb_update_icon_state(UNUSED(int tag), UNUSED(int state))
+{
+}
+
+void osd_ui_sb_update_icon(UNUSED(int tag), UNUSED(int active))
+{
+}
+
+void osd_ui_sb_update_icon_write(UNUSED(int tag), UNUSED(int active))
+{
+}
+
+void osd_ui_sb_update_icon_wp(UNUSED(int tag), UNUSED(int state))
+{
+}

src/unix/unix_sdl.c

@@ -16,6 +16,7 @@
 #include <86box/video.h>
 #include <86box/ui.h>
 #include <86box/version.h>
+#include <86box/unix_osd.h>
 #include <86box/unix_sdl.h>
 
 #define RENDERER_FULL_SCREEN 1
@@ -45,7 +46,7 @@ static int          cur_wy      = 0;
 static int          cur_ww      = 0;
 static int          cur_wh      = 0;
 static volatile int sdl_enabled = 1;
-static SDL_mutex   *sdl_mutex   = NULL;
+SDL_mutex          *sdl_mutex   = NULL;
 int                 mouse_capture;
 int                 title_set         = 0;
 int                 resize_pending    = 0;
@@ -189,6 +190,9 @@ sdl_real_blit(SDL_Rect *r_src)
     if (ret)
         fprintf(stderr, "SDL: unable to copy texture to renderer (%s)\n", SDL_GetError());
 
+    // give the osd an opportunity to draw itself
+    osd_present();
+
     SDL_RenderPresent(sdl_render);
 }
 
@@ -214,6 +218,7 @@ sdl_blit(int x, int y, int w, int h)
             sdl_resize(resize_w, resize_h);
         resize_pending = 0;
     }
+
     r_src.x = x;
     r_src.y = y;
     r_src.w = w;
@@ -314,6 +319,7 @@ sdl_select_best_hw_driver(void)
 void
 sdl_reinit_texture(void)
 {
+    osd_deinit();
     sdl_destroy_texture();
 
     if (sdl_flags & RENDERER_HARDWARE) {
@@ -324,6 +330,7 @@ sdl_reinit_texture(void)
 
     sdl_tex = SDL_CreateTexture(sdl_render, SDL_PIXELFORMAT_ARGB8888,
                                 SDL_TEXTUREACCESS_STREAMING, 2048, 2048);
+    osd_init();
 }
 
 void
@@ -412,6 +419,10 @@ sdl_init_common(int flags)
         return (0);
     }
 
+    // Ensure mouse and touchpads behaves the same for us, dunno if these really do something
+    SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "1");
+    SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "1");
+
     if (flags & RENDERER_HARDWARE) {
         if (flags & RENDERER_OPENGL) {
             SDL_SetHint(SDL_HINT_RENDER_DRIVER, "OpenGL");

src/video/CMakeLists.txt

@@ -38,9 +38,12 @@ add_library(vid OBJECT
 
     # Clock generator chips 
     clockgen/vid_clockgen_av9194.c 
+    clockgen/vid_clockgen_icd2047.c
     clockgen/vid_clockgen_icd2061.c
+    clockgen/vid_clockgen_ics1494.c 
     clockgen/vid_clockgen_ics2494.c 
     clockgen/vid_clockgen_ics2595.c
+    clockgen/vid_clockgen_ics90c64a.c
 
     # DDC / monitor identification stuff
     vid_ddc.c

src/video/clockgen/vid_clockgen_icd2047.c

@@ -0,0 +1,131 @@
+/*
+ * 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.
+ *
+ *          ICD2047 clock generator emulation.
+ *
+ *          Used by the V7 chips.
+ *
+ * Authors: TheCollector1995.
+ *
+ *          Copyright 2025 TheCollector1995.
+ */
+#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 icd2047_t {
+    float freq[32];
+} icd2047_t;
+
+#ifdef ENABLE_ICD2047_LOG
+int icd2047_do_log = ENABLE_ICD2047_LOG;
+
+static void
+icd2047_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (icd2047_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define icd2047_log(fmt, ...)
+#endif
+
+float
+icd2047_getclock(int clock, void *priv)
+{
+    const icd2047_t *icd2047 = (icd2047_t *) priv;
+
+    if (clock > 31)
+        clock = 31;
+
+    return icd2047->freq[clock];
+}
+
+static void *
+icd2047_init(const device_t *info)
+{
+    icd2047_t *icd2047 = (icd2047_t *) malloc(sizeof(icd2047_t));
+    memset(icd2047, 0, sizeof(icd2047_t));
+
+    switch (info->local) {
+        case 20:
+            /* ICD2047-20 for Headland series */
+            icd2047->freq[0x00] = 25175000.0;
+            icd2047->freq[0x01] = 28322000.0;
+            icd2047->freq[0x02] = 40000000.0;
+            icd2047->freq[0x03] = 32500000.0;
+            icd2047->freq[0x04] = 50350000.0;
+            icd2047->freq[0x05] = 65000000.0;
+            icd2047->freq[0x06] = 38000000.0;
+            icd2047->freq[0x07] = 44900000.0;
+            icd2047->freq[0x08] = 25175000.0;
+            icd2047->freq[0x09] = 28322000.0;
+            icd2047->freq[0x0a] = 80000000.0;
+            icd2047->freq[0x0b] = 32500000.0;
+            icd2047->freq[0x0c] = 50350000.0;
+            icd2047->freq[0x0d] = 65000000.0;
+            icd2047->freq[0x0e] = 76000000.0;
+            icd2047->freq[0x0f] = 44900000.0;
+            icd2047->freq[0x10] = 25175000.0;
+            icd2047->freq[0x11] = 44900000.0;
+            icd2047->freq[0x12] = 28322000.0;
+            icd2047->freq[0x13] = 38000000.0;
+            icd2047->freq[0x14] = 40000000.0;
+            icd2047->freq[0x15] = 46000000.0;
+            icd2047->freq[0x16] = 48000000.0;
+            icd2047->freq[0x17] = 60000000.0;
+            icd2047->freq[0x18] = 65000000.0;
+            icd2047->freq[0x19] = 72000000.0;
+            icd2047->freq[0x1a] = 74000000.0;
+            icd2047->freq[0x1b] = 76000000.0;
+            icd2047->freq[0x1c] = 78000000.0;
+            icd2047->freq[0x1d] = 80000000.0;
+            icd2047->freq[0x1e] = 100000000.0;
+            icd2047->freq[0x1f] = 110000000.0;
+            break;
+
+        default:
+            break;
+    }
+
+    return icd2047;
+}
+
+static void
+icd2047_close(void *priv)
+{
+    icd2047_t *icd2047 = (icd2047_t *) priv;
+
+    if (icd2047)
+        free(icd2047);
+}
+
+const device_t icd2047_20_device = {
+    .name          = "ICD2047-20 Clock Generator",
+    .internal_name = "icd2047_20",
+    .flags         = 0,
+    .local         = 20,
+    .init          = icd2047_init,
+    .close         = icd2047_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};

src/video/clockgen/vid_clockgen_ics1494.c

@@ -0,0 +1,157 @@
+/*
+ * 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.
+ *
+ *          ICS1494 clock generator emulation.
+ *
+ *          Used by the V7 and PVGA chips.
+ *
+ * Authors: TheCollector1995.
+ *
+ *          Copyright 2025 TheCollector1995.
+ */
+#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 ics1494_t {
+    float freq[32];
+} ics1494_t;
+
+#ifdef ENABLE_ICS1494_LOG
+int ics1494_do_log = ENABLE_ICS1494_LOG;
+
+static void
+ics1494_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (ics1494_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define ics1494_log(fmt, ...)
+#endif
+
+float
+ics1494_getclock(int clock, void *priv)
+{
+    const ics1494_t *ics1494 = (ics1494_t *) priv;
+
+    if (clock > 31)
+        clock = 31;
+
+    return ics1494->freq[clock];
+}
+
+static void *
+ics1494_init(const device_t *info)
+{
+    ics1494_t *ics1494 = (ics1494_t *) malloc(sizeof(ics1494_t));
+    memset(ics1494, 0, sizeof(ics1494_t));
+
+    switch (info->local) {
+        case 540:
+            /* ICS1494(M)-540 for Radius series */
+            ics1494->freq[0x00] = 57283000.0;
+            ics1494->freq[0x01] = 12273000.0;
+            ics1494->freq[0x02] = 14500000.0;
+            ics1494->freq[0x03] = 15667000.0;
+            ics1494->freq[0x04] = 112000000.0;
+            ics1494->freq[0x05] = 126000000.0;
+            ics1494->freq[0x06] = 30240000.0;
+            ics1494->freq[0x07] = 91200000.0;
+            ics1494->freq[0x08] = 120000000.0;
+            ics1494->freq[0x09] = 48000000.0;
+            ics1494->freq[0x0a] = 50675000.0;
+            ics1494->freq[0x0b] = 55300000.0;
+            ics1494->freq[0x0c] = 64000000.0;
+            ics1494->freq[0x0d] = 68750000.0;
+            ics1494->freq[0x0e] = 88500000.0;
+            ics1494->freq[0x0f] = 51270000.0;
+            ics1494->freq[0x10] = 100000000.0;
+            ics1494->freq[0x11] = 95200000.0;
+            ics1494->freq[0x12] = 55000000.0;
+            ics1494->freq[0x13] = 60000000.0;
+            ics1494->freq[0x14] = 63000000.0;
+            ics1494->freq[0x15] = 99522000.0;
+            ics1494->freq[0x16] = 130000000.0;
+            ics1494->freq[0x17] = 80000000.0;
+            ics1494->freq[0x18] = 25175000.0;
+            ics1494->freq[0x19] = 28322000.0;
+            ics1494->freq[0x1a] = 48000000.0;
+            ics1494->freq[0x1b] = 76800000.0;
+            ics1494->freq[0x1c] = 38400000.0;
+            ics1494->freq[0x1d] = 43200000.0;
+            ics1494->freq[0x1e] = 61440000.0;
+            ics1494->freq[0x1f] = 0.0;
+            break;
+
+        case 541:
+            /* ICS1494(M)-540 for Radius HT209 */
+            ics1494->freq[0x00] = 25175000.0;
+            ics1494->freq[0x01] = 28322000.0;
+            ics1494->freq[0x02] = 61440000.0; /*FCLK*/
+            ics1494->freq[0x03] = 74000000.0; /*XRESM*/
+            ics1494->freq[0x04] = 50350000.0;
+            ics1494->freq[0x05] = 65000000.0;
+            ics1494->freq[0x06] = 37575000.0; /*FCLK*/
+            ics1494->freq[0x07] = 40000000.0;
+            break;
+
+        default:
+            break;
+    }
+
+    return ics1494;
+}
+
+static void
+ics1494_close(void *priv)
+{
+    ics1494_t *ics1494 = (ics1494_t *) priv;
+
+    if (ics1494)
+        free(ics1494);
+}
+
+const device_t ics1494m_540_device = {
+    .name          = "ICS2494M-540 Clock Generator",
+    .internal_name = "ics1494m_540",
+    .flags         = 0,
+    .local         = 540,
+    .init          = ics1494_init,
+    .close         = ics1494_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ics1494m_540_radius_ht209_device = {
+    .name          = "ICS2494M-540 (Radius HT209) Clock Generator",
+    .internal_name = "ics1494m_540_radius_ht209",
+    .flags         = 0,
+    .local         = 541,
+    .init          = ics1494_init,
+    .close         = ics1494_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};

src/video/clockgen/vid_clockgen_ics90c64a.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.
+ *
+ *          ICS90C64A clock generator emulation.
+ *
+ *          Used by the PVGA chips.
+ *
+ * Authors: TheCollector1995.
+ *
+ *          Copyright 2025 TheCollector1995.
+ */
+#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 ics90c64a_t {
+    float freq[32];
+} ics90c64a_t;
+
+#ifdef ENABLE_ICS90C64A_LOG
+int ics90c64a_do_log = ENABLE_ICS90C64A_LOG;
+
+static void
+ics90c64a_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (ics90c64a_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define ics90c64a_log(fmt, ...)
+#endif
+
+float
+ics90c64a_vclk_getclock(int clock, void *priv)
+{
+    const ics90c64a_t *ics90c64a = (ics90c64a_t *) priv;
+
+    if (clock > 15)
+        clock = 15;
+
+    return ics90c64a->freq[clock];
+}
+
+float
+ics90c64a_mclk_getclock(int clock, void *priv)
+{
+    const ics90c64a_t *ics90c64a = (ics90c64a_t *) priv;
+
+    if (clock > 7)
+        clock = 7;
+
+    return ics90c64a->freq[clock + 0x10];
+}
+
+static void *
+ics90c64a_init(const device_t *info)
+{
+    ics90c64a_t *ics90c64a = (ics90c64a_t *) malloc(sizeof(ics90c64a_t));
+    memset(ics90c64a, 0, sizeof(ics90c64a_t));
+
+    switch (info->local) {
+        case 903:
+            /* ICS90C64A-903 for PVGA chip series */
+            ics90c64a->freq[0x0] = 30000000.0;
+            ics90c64a->freq[0x1] = 77250000.0;
+            ics90c64a->freq[0x2] = 0.0;
+            ics90c64a->freq[0x3] = 80000000.0;
+            ics90c64a->freq[0x4] = 31500000.0;
+            ics90c64a->freq[0x5] = 36000000.0;
+            ics90c64a->freq[0x6] = 75000000.0;
+            ics90c64a->freq[0x7] = 50000000.0;
+            ics90c64a->freq[0x8] = 40000000.0;
+            ics90c64a->freq[0x9] = 50000000.0;
+            ics90c64a->freq[0xa] = 32000000.0;
+            ics90c64a->freq[0xb] = 44900000.0;
+            ics90c64a->freq[0xc] = 25175000.0;
+            ics90c64a->freq[0xd] = 28322000.0;
+            ics90c64a->freq[0xe] = 65000000.0;
+            ics90c64a->freq[0xf] = 36000000.0;
+
+            ics90c64a->freq[0x10] = 33000000.0;
+            ics90c64a->freq[0x11] = 49218000.0;
+            ics90c64a->freq[0x12] = 60000000.0;
+            ics90c64a->freq[0x13] = 30500000.0;
+            ics90c64a->freq[0x14] = 41612000.0;
+            ics90c64a->freq[0x15] = 37500000.0;
+            ics90c64a->freq[0x16] = 36000000.0;
+            ics90c64a->freq[0x17] = 44296000.0;
+            break;
+
+        default:
+            break;
+    }
+
+    return ics90c64a;
+}
+
+static void
+ics90c64a_close(void *priv)
+{
+    ics90c64a_t *ics90c64a = (ics90c64a_t *) priv;
+
+    if (ics90c64a)
+        free(ics90c64a);
+}
+
+const device_t ics90c64a_903_device = {
+    .name          = "ICS90C64A-903 Clock Generator",
+    .internal_name = "ics90c64a_903",
+    .flags         = 0,
+    .local         = 903,
+    .init          = ics90c64a_init,
+    .close         = ics90c64a_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};

src/video/vid_ht216.c

@@ -49,6 +49,7 @@ typedef struct ht216_t {
 
     uint32_t vram_mask, linear_base;
     uint8_t  adjust_cursor, monitor_type;
+    uint8_t  clk_sel;
 
     int ext_reg_enable;
     int isabus;
@@ -100,7 +101,8 @@ void    ht216_out(uint16_t addr, uint8_t val, void *priv);
 uint8_t ht216_in(uint16_t addr, void *priv);
 
 #define BIOS_G2_GC205_PATH              "roms/video/video7/BIOS.BIN"
-#define BIOS_VIDEO7_VGA_1024I_PATH      "roms/video/video7/Video Seven VGA 1024i - BIOS - v2.19 - 435-0062-05 - U17 - 27C256.BIN"
+#define BIOS_VIDEO7_VGA_1024I_219_PATH  "roms/video/video7/Video Seven VGA 1024i - BIOS - v2.19 - 435-0062-05 - U17 - 27C256.BIN"
+#define BIOS_VIDEO7_VGA_1024I_700_PATH  "roms/video/video7/Headland Video7 VGA 1024i v7.0 32x8 (IP) NMC27C256B@DIP28.BIN"
 #define BIOS_RADIUS_SVGA_MULTIVIEW_PATH "roms/video/video7/U18.BIN"
 #define BIOS_HT216_32_PATH              "roms/video/video7/HT21632.BIN"
 
@@ -132,6 +134,7 @@ dword_remap(svga_t *svga, uint32_t in_addr)
 {
     if (svga->packed_chain4)
         return in_addr;
+
     return ((in_addr & 0xfffc) << 2) | ((in_addr & 0x30000) >> 14) | (in_addr & ~0x3ffff);
 }
 
@@ -182,8 +185,8 @@ ht216_out(uint16_t addr, uint8_t val, void *priv)
     switch (addr) {
         case 0x3c2:
             /*Bit 17 of the display memory address, only active on odd/even modes, has no effect on graphics modes.*/
+            ht216->clk_sel = (ht216->clk_sel & ~0x03) | ((val & 0x0c) >> 2);
             ht216->misc   = val;
-            svga->miscout = val;
             ht216_log("HT216 misc val = %02x, mode = 0, chain4 = %x\n", val, svga->chain4);
             ht216_recalc_bank_regs(ht216, 0);
             ht216_remap(ht216);
@@ -251,10 +254,11 @@ ht216_out(uint16_t addr, uint8_t val, void *priv)
                           ht216->ht_regs[0xfc], ht216->ht_regs[0xfd], ht216->ht_regs[0xfe], ht216->ht_regs[0xff]);
                 return;
 #endif
-            } else if (svga->seqaddr >= 0x80 && ht216->ext_reg_enable) {
+            } else if ((svga->seqaddr >= 0x80) && ht216->ext_reg_enable) {
                 old                                  = ht216->ht_regs[svga->seqaddr & 0xff];
                 ht216->ht_regs[svga->seqaddr & 0xff] = val;
 
+                ht216_log("SeqAddr=%02x, val=%02x.\n", svga->seqaddr & 0xff, val);
                 switch (svga->seqaddr & 0xff) {
                     case 0x83:
                         svga->attraddr = val & 0x1f;
@@ -291,7 +295,29 @@ ht216_out(uint16_t addr, uint8_t val, void *priv)
                         break;
 
                     case 0xa4:
+                        if (ht216->id == 0x7861)
+                            ht216->clk_sel = (val >> 2) & 0x0f;
+                        else {
+                            if (svga->getclock == ics1494_getclock) {
+                                if (val & 0x10)
+                                    val &= ~0x10;
+                                else if (!(val & 0x10))
+                                    val |= 0x10;
+                            }
+                            ht216->clk_sel = (val >> 2) & 0x07;
+                        }
+                        svga->miscout = (svga->miscout & ~0x0c) | ((ht216->clk_sel & 0x03) << 2);
+                        svga->fullchange = changeframecount;
+                        svga_recalctimings(svga);
+                        break;
                     case 0xf8:
+                        if (ht216->id != 0x7861) {
+                            if ((val & 0x06) == 0x06)
+                                ht216->clk_sel = (val >> 5) & 0x07;
+                        } else {
+                            if ((val & 0x05) == 0x05)
+                                ht216->clk_sel = (val >> 4) & 0x0f;
+                        }
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
                         break;
@@ -555,6 +581,7 @@ ht216_in(uint16_t addr, void *priv)
         case 0x3c9:
             if (ht216->id == 0x7152)
                 return sc1148x_ramdac_in(addr, 0, svga->ramdac, svga);
+
             return svga_in(addr, svga);
 
         case 0x3cb:
@@ -562,9 +589,6 @@ ht216_in(uint16_t addr, void *priv)
                 return ht216->reg_3cb;
             break;
 
-        case 0x3cc:
-            return svga->miscout;
-
         case 0x3D4:
             return svga->crtcreg;
         case 0x3D5:
@@ -628,8 +652,7 @@ ht216_recalctimings(svga_t *svga)
     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;
-
+    int        high_res_256 = 0;
 
     if (ht216->id == 0x7861) {
         if (ht216->ht_regs[0xe0] & 0x20) {
@@ -640,23 +663,8 @@ ht216_recalctimings(svga_t *svga)
         }
     }
 
-    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:
-            break;
-        case 4:
-            svga->clock = (cpuclock * (double) (1ULL << 32)) / 50350000.0;
-            break;
-        case 5:
-            svga->clock = (cpuclock * (double) (1ULL << 32)) / 65000000.0;
-            break;
-        case 7:
-            svga->clock = (cpuclock * (double) (1ULL << 32)) / 40000000.0;
-            break;
-        default:
-            svga->clock = (cpuclock * (double) (1ULL << 32)) / 36000000.0;
-            break;
-    }
+    svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock(ht216->clk_sel, svga->clock_gen);
+    ht216_log("ClkSel V7=%02x, regf8=%02x, rega4=%02x, miscout=%x, vidclock=%02x.\n", ht216->clk_sel, ht216->ht_regs[0xf8], ht216->ht_regs[0xa4], (svga->miscout >> 2) & 0x03, svga->vidclock);
 
     svga->memaddr_latch |= ((ht216->ht_regs[0xf6] & 0x30) << 12);
 
@@ -697,7 +705,6 @@ ht216_recalctimings(svga_t *svga)
                     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;
@@ -705,7 +712,6 @@ ht216_recalctimings(svga_t *svga)
                     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 {
@@ -729,7 +735,6 @@ ht216_recalctimings(svga_t *svga)
                 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;
@@ -1513,10 +1518,16 @@ ht216_init(const device_t *info, uint32_t mem_size, int has_rom)
 {
     ht216_t *ht216 = malloc(sizeof(ht216_t));
     svga_t  *svga;
+    const char *bios_ver = NULL;
+    const char *fn = NULL;
 
     memset(ht216, 0, sizeof(ht216_t));
     svga = &ht216->svga;
 
+    ht216->id = info->local;
+    ht216->isabus = (info->flags & DEVICE_ISA) || (info->flags & DEVICE_ISA16);
+    ht216->mca = (info->flags & DEVICE_MCA);
+
     if (info->flags & DEVICE_VLB)
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_v7vga_vlb);
     else if (info->flags & DEVICE_MCA)
@@ -1535,7 +1546,9 @@ ht216_init(const device_t *info, uint32_t mem_size, int has_rom)
             rom_init(&ht216->bios_rom, BIOS_G2_GC205_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
             break;
         case 2:
-            rom_init(&ht216->bios_rom, BIOS_VIDEO7_VGA_1024I_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
+            bios_ver = (char *) device_get_config_bios("bios_ver");
+            fn = (char *) device_get_bios_file(info, bios_ver, 0);
+            rom_init(&ht216->bios_rom, fn, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
             break;
         case 3:
             ht216->monitor_type = device_get_config_int("monitor_type");
@@ -1583,13 +1596,20 @@ ht216_init(const device_t *info, uint32_t mem_size, int has_rom)
             break;
     }
 
+    svga->bpp     = 8;
+    svga->miscout = 1;
     svga->hwcursor.cur_ysize = 32;
     ht216->vram_mask         = mem_size - 1;
     svga->decode_mask        = mem_size - 1;
 
-    if (has_rom == 4)
+    if (ht216->id == 0x7152) {
         svga->ramdac = device_add(&sc11484_nors2_ramdac_device);
-
+        svga->clock_gen = device_add(&ics1494m_540_radius_ht209_device);
+        svga->getclock  = ics1494_getclock;
+    } else {
+        svga->clock_gen = device_add(&icd2047_20_device);
+        svga->getclock  = icd2047_getclock;
+    }
     svga->read = ht216_read;
     svga->readw = NULL;
     svga->readl = NULL;
@@ -1607,16 +1627,9 @@ ht216_init(const device_t *info, uint32_t mem_size, int has_rom)
     mem_mapping_set_p(&svga->mapping, ht216);
     mem_mapping_disable(&ht216->linear_mapping);
 
-    ht216->id     = info->local;
-    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);
     io_sethandler(0x46e8, 0x0001, ht216_in, NULL, NULL, ht216_out, NULL, NULL, ht216);
 
-    svga->bpp     = 8;
-    svga->miscout = 1;
-
     if (ht216->id == 0x7861)
         ht216->ht_regs[0xb4] = 0x08; /*32-bit DRAM bus*/
 
@@ -1681,7 +1694,7 @@ g2_gc205_available(void)
 static int
 v7_vga_1024i_available(void)
 {
-    return rom_present(BIOS_VIDEO7_VGA_1024I_PATH);
+    return rom_present(BIOS_VIDEO7_VGA_1024I_219_PATH);
 }
 
 static int
@@ -1724,6 +1737,37 @@ ht216_force_redraw(void *priv)
 
 // clang-format off
 static const device_config_t v7_vga_1024i_config[] = {
+    {
+        .name           = "bios_ver",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_BIOS,
+        .default_string = "v2_19",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = {
+            {
+                .name          = "Version 2.19",
+                .internal_name = "v2_19",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 32768,
+                .files         = { BIOS_VIDEO7_VGA_1024I_219_PATH, "" }
+            },
+            {
+                .name          = "Version 7.00",
+                .internal_name = "v7_00",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 32768,
+                .files         = { BIOS_VIDEO7_VGA_1024I_700_PATH, "" }
+            },
+            { .files_no = 0 }
+        }
+    },
     {
         .name           = "memory",
         .description    = "Memory size",

src/video/vid_s3.c

@@ -4536,16 +4536,21 @@ s3_recalctimings(svga_t *svga)
                                 break;
                             case SC1502X: /*SC15025 RAMDAC*/
                                 if (svga->getclock == icd2061_getclock) { /*ICD2061 clock chip*/
+                                    s3_log("32bpp 928 ISA VL SC1502X double=%02x, highres=%02x, dotperclock=%d, clksel=%d, pitch=%d, hdisp=%d, clock=%02x.\n",
+                                            svga->crtc[0x31] & 0x02, s3->accel.advfunc_cntl & 0x04, svga->dots_per_clock, clk_sel, s3->width, svga->hdisp, svga->crtc[0x67] >> 4);
                                     if (svga->crtc[0x31] & 0x02) {
-                                        svga->hdisp >>= 1;
-                                        svga->dots_per_clock >>= 1;
-                                        if (svga->hdisp == 640)
-                                            s3->width = 1024;
+                                        if (svga->dots_per_clock == 16) {
+                                            svga->hdisp >>= 1;
+                                            svga->dots_per_clock >>= 1;
+                                            svga->clock *= 2.0;
+                                            if (svga->hdisp == 640)
+                                                s3->width = 1024;
+                                        }
                                     } else {
                                         svga->hdisp >>= 2;
                                         svga->dots_per_clock >>= 2;
                                         if (svga->hdisp == 800)
-                                            s3->width = 1024;
+                                            svga->clock *= 2.0;
                                     }
                                 }
                                 break;

src/video/vid_s3_virge.c

@@ -1975,9 +1975,9 @@ s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *priv)
                 break;
             case 0x8190:
                 virge->streams.sec_ctrl              = val;
-                virge->streams.dda_horiz_accumulator = val & 0xfff;
-                if (val & 0x1000)
-                    virge->streams.dda_horiz_accumulator |= ~0xfff;
+                virge->streams.dda_horiz_accumulator = val & 0x7ff;
+                if (val & 0x800)
+                    virge->streams.dda_horiz_accumulator |= ~0x7ff;
 
                 virge->streams.sdif = (val >> 24) & 7;
                 break;
@@ -1990,9 +1990,9 @@ s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *priv)
                 if (val & 0x800)
                     virge->streams.k1_horiz_scale |= ~0x7ff;
 
-                virge->streams.k2_horiz_scale = (val >> 16) & 0x7ff;
-                if ((val >> 16) & 0x800)
-                    virge->streams.k2_horiz_scale |= ~0x7ff;
+                virge->streams.k2_horiz_scale = (val >> 16) & 0x3ff;
+                if ((val >> 16) & 0x400)
+                    virge->streams.k2_horiz_scale |= ~0x3ff;
 
                 svga_recalctimings(svga);
                 svga->fullchange = changeframecount;
@@ -2048,14 +2048,14 @@ s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *priv)
                     virge->streams.k1_vert_scale |= ~0x7ff;
                 break;
             case 0x81e4:
-                virge->streams.k2_vert_scale = val & 0x7ff;
-                if (val & 0x800)
-                    virge->streams.k2_vert_scale |= ~0x7ff;
+                virge->streams.k2_vert_scale = val & 0x3ff;
+                if (val & 0x400)
+                    virge->streams.k2_vert_scale |= ~0x3ff;
                 break;
             case 0x81e8:
-                virge->streams.dda_vert_accumulator = val & 0xfff;
-                if (val & 0x1000)
-                    virge->streams.dda_vert_accumulator |= ~0xfff;
+                virge->streams.dda_vert_accumulator = val & 0x7ff;
+                if (val & 0x800)
+                    virge->streams.dda_vert_accumulator |= ~0x7ff;
 
                 svga_recalctimings(svga);
                 svga->fullchange = changeframecount;

vcpkg.json

@@ -1,6 +1,6 @@
 {
     "name": "86box",
-    "version-string": "5.2",
+    "version-string": "6.0",
     "homepage": "https://86box.net/",
     "documentation": "https://86box.readthedocs.io/",
     "license": "GPL-2.0-or-later",