diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index 8542e317d..26ee36593 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -103,9 +103,9 @@ def gitClone(repository, branch) {
 	if (env.GIT_STASHED != 'true' || env.NODE_NAME != 'debian.citadel') {
 		/* Catch network issues in clone. */
 		try {
-			/* Perform clone/checkout, making sure to update the changelog only once
-			   to avoid inaccurate entries from new commits pushed inbetween clones. */
-			def scmVars = checkout(poll: true,
+			/* Perform clone/checkout, making sure to set poll and changelog only
+			   once to avoid interference from new commits pushed inbetween clones. */
+			def scmVars = checkout(poll: env.GIT_STASHED != 'true',
 					       changelog: env.GIT_STASHED != 'true',
 					       scm: [$class: 'GitSCM',
 						     branches: [[name: branch]],
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3d7ae4f6..542d446cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ if(MUNT_EXTERNAL)
 endif()
 
 project(86Box
-    VERSION 3.7
+    VERSION 3.7.1
     DESCRIPTION "Emulator of x86-based systems"
     HOMEPAGE_URL "https://86box.net"
     LANGUAGES C CXX)
diff --git a/bumpversion.sh b/bumpversion.sh
index 7fb0e96eb..31ebf154b 100644
--- a/bumpversion.sh
+++ b/bumpversion.sh
@@ -17,10 +17,9 @@
 
 # Parse arguments.
 newversion="$1"
-romversion="$2"
 if [ -z "$(echo "$newversion" | grep '\.')" ]
 then
-	echo '[!] Usage: bumpversion.sh x.y[.z] [romversion]'
+	echo '[!] Usage: bumpversion.sh x.y[.z]'
 	exit 1
 fi
 shift
@@ -32,13 +31,6 @@ newversion_patch=$(echo "$newversion" | cut -d. -f3)
 [ -z "$newversion_patch" ] && newversion_patch=0
 
 
-if [ -z "${romversion}" ]; then
-	# Get the latest ROM release from the GitHub API.
-	romversion=$(curl --silent "https://api.github.com/repos/86Box/roms/releases/latest" |
-		grep '"tag_name":' |
-		sed -E 's/.*"([^"]+)".*/\1/')
-fi
-
 # Switch to the repository root directory.
 cd "$(dirname "$0")" || exit
 
@@ -69,7 +61,6 @@ patch_file src/include_make/*/version.h EMU_VERSION_PATCH 's/(#\s*define\s+EMU_V
 patch_file src/include_make/*/version.h COPYRIGHT_YEAR 's/(#\s*define\s+COPYRIGHT_YEAR\s+)[0-9]+/\1'"$(date +%Y)"'/'
 patch_file src/include_make/*/version.h EMU_DOCS_URL 's/(#\s*define\s+EMU_DOCS_URL\s+"https:\/\/[^\/]+\/en\/v)[^\/]+/\1'"$newversion_maj.$newversion_min"'/'
 patch_file src/unix/assets/*.spec Version 's/(Version:\s+)[0-9].+/\1'"$newversion"'/'
-patch_file src/unix/assets/*.spec '%global romver' 's/(^%global\ romver\s+)[0-9]{8}/\1'"$romversion"'/'
 patch_file src/unix/assets/*.spec 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/'
 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)"'/'
diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c
index f57981234..ee5972756 100644
--- a/src/cdrom/cdrom.c
+++ b/src/cdrom/cdrom.c
@@ -25,6 +25,7 @@
 #include <86box/cdrom.h>
 #include <86box/cdrom_image.h>
 #include <86box/plat.h>
+#include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/sound.h>
 
diff --git a/src/config.c b/src/config.c
index d22d25b1d..2a2f58c6c 100644
--- a/src/config.c
+++ b/src/config.c
@@ -72,6 +72,9 @@
 #include <86box/snd_opl.h>
 
 
+static int	cx, cy, cw, ch;
+
+
 typedef struct _list_ {
     struct _list_ *next;
 } list_t;
@@ -616,6 +619,40 @@ load_general(void)
     video_framerate = config_get_int(cat, "video_gl_framerate", -1);
     video_vsync     = config_get_int(cat, "video_gl_vsync", 0);
     strncpy(video_shader, config_get_string(cat, "video_gl_shader", ""), sizeof(video_shader));
+
+    window_remember = config_get_int(cat, "window_remember", 0);
+    if (window_remember) {
+	p = config_get_string(cat, "window_coordinates", NULL);
+	if (p == NULL)
+		p = "0, 0, 0, 0";
+	sscanf(p, "%i, %i, %i, %i", &cw, &ch, &cx, &cy);
+    } else {
+	cw = ch = cx = cy = 0;
+	config_delete_var(cat, "window_remember");
+    }
+
+    config_delete_var(cat, "window_coordinates");
+}
+
+/* Load monitor section. */
+static void
+load_monitor(int monitor_index)
+{
+    char cat[512], temp[512];
+    char *p = NULL;
+
+    sprintf(cat, "Monitor #%i", monitor_index + 1);
+    sprintf(temp, "%i, %i, %i, %i", cx, cy, cw, ch);
+
+    p = config_get_string(cat, "window_coordinates", NULL);
+
+    if (p == NULL)
+	p = temp;
+
+    if (window_remember)
+        sscanf(p, "%i, %i, %i, %i",
+               &monitor_settings[monitor_index].mon_window_x, &monitor_settings[monitor_index].mon_window_y,
+               &monitor_settings[monitor_index].mon_window_w, &monitor_settings[monitor_index].mon_window_h);
 }
 
 /* Load "Machine" section. */
@@ -938,47 +975,6 @@ load_video(void)
     gfxcard_2 = video_get_video_from_internal_name(p);
 }
 
-static void
-load_monitor(int monitor_index)
-{
-    char  monitor_config_name[sizeof("Monitor #") + 12] = { [0] = 0 };
-    char *ptr                                           = NULL;
-
-    if (monitor_index == 0) {
-        /* Migrate configs */
-        ptr = config_get_string("General", "window_coordinates", NULL);
-
-        config_delete_var("General", "window_coordinates");
-    }
-    snprintf(monitor_config_name, sizeof(monitor_config_name), "Monitor #%i", monitor_index + 1);
-    if (!ptr)
-        ptr = config_get_string(monitor_config_name, "window_coordinates", "0, 0, 0, 0");
-    if (window_remember || (vid_resize & 2))
-        sscanf(ptr, "%i, %i, %i, %i",
-               &monitor_settings[monitor_index].mon_window_x, &monitor_settings[monitor_index].mon_window_y,
-               &monitor_settings[monitor_index].mon_window_w, &monitor_settings[monitor_index].mon_window_h);
-}
-
-static void
-save_monitor(int monitor_index)
-{
-    char monitor_config_name[sizeof("Monitor #") + 12] = { [0] = 0 };
-    char saved_coordinates[12 * 4 + 8 + 1]             = { [0] = 0 };
-
-    snprintf(monitor_config_name, sizeof(monitor_config_name), "Monitor #%i", monitor_index + 1);
-    if (!(monitor_settings[monitor_index].mon_window_x == 0
-          && monitor_settings[monitor_index].mon_window_y == 0
-          && monitor_settings[monitor_index].mon_window_w == 0
-          && monitor_settings[monitor_index].mon_window_h == 0)
-        && (window_remember || (vid_resize & 2))) {
-        snprintf(saved_coordinates, sizeof(saved_coordinates), "%i, %i, %i, %i", monitor_settings[monitor_index].mon_window_x, monitor_settings[monitor_index].mon_window_y,
-                 monitor_settings[monitor_index].mon_window_w, monitor_settings[monitor_index].mon_window_h);
-
-        config_set_string(monitor_config_name, "window_coordinates", saved_coordinates);
-    } else
-        config_delete_var(monitor_config_name, "window_coordinates");
-}
-
 /* Load "Input Devices" section. */
 static void
 load_input_devices(void)
@@ -2403,6 +2399,24 @@ save_general(void)
     delete_section_if_empty(cat);
 }
 
+/* Save monitor section. */
+static void
+save_monitor(int monitor_index)
+{
+    char cat[sizeof("Monitor #") + 12] = { [0] = 0 };
+    char temp[512];
+
+    snprintf(cat, sizeof(cat), "Monitor #%i", monitor_index + 1);
+    if (window_remember) {
+        sprintf(temp, "%i, %i, %i, %i",
+		monitor_settings[monitor_index].mon_window_x, monitor_settings[monitor_index].mon_window_y,
+		monitor_settings[monitor_index].mon_window_w, monitor_settings[monitor_index].mon_window_h);
+
+        config_set_string(cat, "window_coordinates", temp);
+    } else
+        config_delete_var(cat, "window_coordinates");
+}
+
 /* Save "Machine" section. */
 static void
 save_machine(void)
diff --git a/src/cpu/386_common.c b/src/cpu/386_common.c
index 6c09e588a..92360a248 100644
--- a/src/cpu/386_common.c
+++ b/src/cpu/386_common.c
@@ -1481,10 +1481,16 @@ checkio(uint32_t port)
 }
 
 
+#ifdef OLD_DIVEXCP
 #define divexcp() { \
 	x386_common_log("Divide exception at %04X(%06X):%04X\n",CS,cs,cpu_state.pc); \
 	x86_int(0); \
 }
+#else
+#define divexcp() { \
+	x86de(NULL, 0); \
+}
+#endif
 
 
 int
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 4eaadfa13..5e4f6c1f3 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -385,10 +385,10 @@ cpu_set(void)
     is_am486     = (cpu_s->cpu_type == CPU_ENH_Am486DX);
     is_am486dxl  = (cpu_s->cpu_type == CPU_Am486DXL);
 
-    is6117      = !strcmp(cpu_f->manufacturer, "ALi");
+    is6117       = !strcmp(cpu_f->manufacturer, "ALi");
 
-    cpu_isintel = !strcmp(cpu_f->manufacturer, "Intel");
-    cpu_iscyrix = !strcmp(cpu_f->manufacturer, "Cyrix") || !strcmp(cpu_f->manufacturer, "ST");
+    cpu_isintel  = !strcmp(cpu_f->manufacturer, "Intel");
+    cpu_iscyrix  = !strcmp(cpu_f->manufacturer, "Cyrix") || !strcmp(cpu_f->manufacturer, "ST");
 
     /* SL-Enhanced Intel 486s have the same SMM save state table layout as Pentiums,
        and the WinChip datasheet claims those are Pentium-compatible as well. AMD Am486DXL/DXL2 also has compatible SMM, or would if not for it's different SMBase*/
@@ -401,6 +401,8 @@ cpu_set(void)
     is_cxsmm     = (!strcmp(cpu_f->manufacturer, "Cyrix") || !strcmp(cpu_f->manufacturer, "ST")) &&
 		   (cpu_s->cpu_type >= CPU_Cx486S);
 
+    cpu_isintel  = cpu_isintel || !strcmp(cpu_f->manufacturer, "AMD");
+
     hasfpu       = (fpu_type != FPU_NONE);
     hascache     = (cpu_s->cpu_type >= CPU_486SLC) || (cpu_s->cpu_type == CPU_IBM386SLC) ||
 		   (cpu_s->cpu_type == CPU_IBM486SLC) || (cpu_s->cpu_type == CPU_IBM486BL);
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 6747eb6c8..268221ff5 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -679,6 +679,7 @@ extern void	hardresetx86(void);
 extern void	x86_int(int num);
 extern void	x86_int_sw(int num);
 extern int	x86_int_sw_rm(int num);
+extern void	x86de(char *s, uint16_t error);
 extern void	x86gpf(char *s, uint16_t error);
 extern void	x86np(char *s, uint16_t error);
 extern void	x86ss(char *s, uint16_t error);
diff --git a/src/cpu/x86.h b/src/cpu/x86.h
index b9726dc57..32a3317ea 100644
--- a/src/cpu/x86.h
+++ b/src/cpu/x86.h
@@ -1,4 +1,4 @@
-#define ABRT_MASK 0x7f
+#define ABRT_MASK 0x3f
 /*An 'expected' exception is one that would be expected to occur on every execution
   of this code path; eg a GPF due to being in v86 mode. An 'unexpected' exception is
   one that would be unlikely to occur on the next exception, eg a page fault may be
@@ -71,7 +71,8 @@ enum
         ABRT_NP  = 0xB,
         ABRT_SS  = 0xC,
         ABRT_GPF = 0xD,
-        ABRT_PF  = 0xE
+        ABRT_PF  = 0xE,
+        ABRT_DE  = 0x40     /* INT 0, but we have to distinguish it from ABRT_NONE. */
 };
 
 
diff --git a/src/cpu/x86_ops_bcd.h b/src/cpu/x86_ops_bcd.h
index 385d63cd7..b37b6a6df 100644
--- a/src/cpu/x86_ops_bcd.h
+++ b/src/cpu/x86_ops_bcd.h
@@ -31,7 +31,14 @@ static int opAAD(uint32_t fetchdat)
 static int opAAM(uint32_t fetchdat)
 {
         int base = getbytef();
-        if (!base || !cpu_isintel) base = 10;
+
+	if (base == 0) {
+		x86de(NULL, 0);
+		return 1;
+	}
+
+        if (!cpu_isintel) base = 10;
+
         AH = AL / base;
         AL %= base;
         setznp16(AX);
diff --git a/src/cpu/x86seg.c b/src/cpu/x86seg.c
index e103f0247..c9398dd69 100644
--- a/src/cpu/x86seg.c
+++ b/src/cpu/x86seg.c
@@ -165,6 +165,14 @@ x86_doabrt(int x86_abrt)
 }
 
 
+void
+x86de(char *s, uint16_t error)
+{
+    cpu_state.abrt = ABRT_DE;
+    abrt_error = error;
+}
+
+
 void
 x86gpf(char *s, uint16_t error)
 {
diff --git a/src/device/keyboard_at.c b/src/device/keyboard_at.c
index 24b0775c4..5d38088ed 100644
--- a/src/device/keyboard_at.c
+++ b/src/device/keyboard_at.c
@@ -1398,7 +1398,7 @@ write64_ami(void *priv, uint8_t val)
 			else
 				add_data(dev, 'H');
 		} else
-			add_data(dev, 'H');
+			add_data(dev, 'F');
 		return 0;
 
 	case 0xa2:	/* clear keyboard controller lines P22/P23 */
@@ -1438,7 +1438,7 @@ write64_ami(void *priv, uint8_t val)
 	case 0xa6:	/* read clock */
 		if ((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF) {
 			kbd_log("ATkbc: AMI - read clock\n");
-			add_data(dev, !!(dev->ami_stat & 1));
+			add_to_kbc_queue_front(dev, (dev->ami_stat & 1) ? 0xff : 0x00, 0, 0x00);
 			return 0;
 		}
 		break;
@@ -1462,7 +1462,7 @@ write64_ami(void *priv, uint8_t val)
 	case 0xa9:	/* read cache */
 		if ((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF) {
 			kbd_log("ATkbc: AMI - read cache\n");
-			add_data(dev, !!(dev->ami_stat & 2));
+			add_to_kbc_queue_front(dev, (dev->ami_stat & 2) ? 0xff : 0x00, 0, 0x00);
 			return 0;
 		}
 		break;
@@ -1535,7 +1535,7 @@ write64_ami(void *priv, uint8_t val)
 		 * (allow command D1 to change bits 2/3 of the output port)
 		 */
 		kbd_log("ATkbc: AMI - unblock KBC lines P22 and P23\n");
-		dev->output_locked = 1;
+		dev->ami_flags &= 0xfb;
 		return 0;
 
 	case 0xc9:
@@ -1544,7 +1544,7 @@ write64_ami(void *priv, uint8_t val)
 		 * (disallow command D1 from changing bits 2/3 of the port)
 		 */
 		kbd_log("ATkbc: AMI - block KBC lines P22 and P23\n");
-		dev->output_locked = 1;
+		dev->ami_flags |= 0x04;
 		return 0;
 
 	case 0xcc:
@@ -1796,7 +1796,9 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
 
 				case 0xd1: /* write output port */
 					kbd_log("ATkbc: write output port\n");
-					if (dev->output_locked) {
+					/* Bit 2 of AMI flags is P22-P23 blocked (1 = yes, 0 = no),
+					   discovered by reverse-engineering the AOpeN Vi15G BIOS. */
+					if (dev->ami_flags & 0x04) {
 						/*If keyboard controller lines P22-P23 are blocked,
 						  we force them to remain unchanged.*/
 						val &= ~0x0c;
@@ -2259,6 +2261,7 @@ kbd_reset(void *priv)
     set_scancode_map(dev);
 
     dev->ami_flags = ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_NOREF) ? 0x01 : 0x00;
+    dev->ami_stat |= 0x02;
 }
 
 
diff --git a/src/disk/mo.c b/src/disk/mo.c
index d30cf9d94..18e49b2d7 100644
--- a/src/disk/mo.c
+++ b/src/disk/mo.c
@@ -31,6 +31,7 @@
 #include <86box/config.h>
 #include <86box/timer.h>
 #include <86box/device.h>
+#include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/nvr.h>
 #include <86box/path.h>
diff --git a/src/disk/zip.c b/src/disk/zip.c
index 1f45e4737..a4e124fee 100644
--- a/src/disk/zip.c
+++ b/src/disk/zip.c
@@ -27,6 +27,7 @@
 #include <86box/config.h>
 #include <86box/timer.h>
 #include <86box/device.h>
+#include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/nvr.h>
 #include <86box/plat.h>
diff --git a/src/include/86box/hdc_ide.h b/src/include/86box/hdc_ide.h
index 9e2539359..1deb6dd86 100644
--- a/src/include/86box/hdc_ide.h
+++ b/src/include/86box/hdc_ide.h
@@ -19,6 +19,9 @@
 #ifndef EMU_IDE_H
 # define EMU_IDE_H
 
+#define IDE_BUS_MAX 4
+#define IDE_CHAN_MAX 2
+
 #define HDC_PRIMARY_BASE    0x01F0
 #define HDC_PRIMARY_SIDE    0x03F6
 #define HDC_PRIMARY_IRQ	    14
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index b43f9e1ec..656809932 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -320,6 +320,9 @@ extern int   machine_get_machine_from_internal_name(char *s);
 extern void  machine_init(void);
 #ifdef EMU_DEVICE_H
 extern const device_t *machine_getdevice(int m);
+extern const device_t *machine_getviddevice(int m);
+extern const device_t *machine_getsnddevice(int m);
+extern const device_t *machine_getnetdevice(int m);
 #endif
 extern char *machine_get_internal_name_ex(int m);
 extern int   machine_get_nvrmask(int m);
diff --git a/src/include/86box/scsi.h b/src/include/86box/scsi.h
index 03de1a4ac..b0af25e44 100644
--- a/src/include/86box/scsi.h
+++ b/src/include/86box/scsi.h
@@ -21,7 +21,13 @@
 #ifndef EMU_SCSI_H
 # define EMU_SCSI_H
 
-extern int	scsi_card_current[4];
+/* Configuration. */
+#define SCSI_BUS_MAX    4  /* currently we support up to 4 controllers */
+
+#define SCSI_ID_MAX	    16 /* 16 on wide buses */
+#define SCSI_LUN_MAX    8  /* always 8 */
+
+extern int	scsi_card_current[SCSI_BUS_MAX];
 
 extern int	scsi_card_available(int card);
 #ifdef EMU_DEVICE_H
diff --git a/src/include/86box/scsi_device.h b/src/include/86box/scsi_device.h
index 6b6600d8e..f1a2a4728 100644
--- a/src/include/86box/scsi_device.h
+++ b/src/include/86box/scsi_device.h
@@ -21,10 +21,6 @@
 # define SCSI_DEVICE_H
 
 /* Configuration. */
-#define SCSI_BUS_MAX		4		/* currently we support up to 4 controllers */
-
-#define SCSI_ID_MAX		16		/* 16 on wide buses */
-#define SCSI_LUN_MAX		8		/* always 8 */
 
 #define SCSI_LUN_USE_CDB	0xff
 
@@ -361,8 +357,9 @@ typedef struct {
 #define SCSI_REMOVABLE_DISK 0x8000
 #define SCSI_REMOVABLE_CDROM 0x8005
 
+#ifdef EMU_SCSI_H
 extern scsi_device_t	scsi_devices[SCSI_BUS_MAX][SCSI_ID_MAX];
-
+#endif /* EMU_SCSI_H */
 
 extern int	cdrom_add_error_and_subchannel(uint8_t *b, int real_sector_type);
 extern int	cdrom_LBAtoMSF_accurate(void);
diff --git a/src/include_make/86box/version.h b/src/include_make/86box/version.h
index 4c7bca1bd..4fccf12f7 100644
--- a/src/include_make/86box/version.h
+++ b/src/include_make/86box/version.h
@@ -20,12 +20,12 @@
 #define EMU_NAME	"86Box"
 #define EMU_NAME_W	LSTR(EMU_NAME)
 
-#define EMU_VERSION	"3.7"
+#define EMU_VERSION	"3.7.1"
 #define EMU_VERSION_W	LSTR(EMU_VERSION)
 #define EMU_VERSION_EX	"3.50" /* frozen due to IDE re-detection behavior on Windows */
 #define EMU_VERSION_MAJ	3
 #define EMU_VERSION_MIN	7
-#define EMU_VERSION_PATCH 0
+#define EMU_VERSION_PATCH 1
 
 #define EMU_BUILD_NUM	0
 
diff --git a/src/machine/m_at_286_386sx.c b/src/machine/m_at_286_386sx.c
index d524e4c4a..fb4186c4e 100644
--- a/src/machine/m_at_286_386sx.c
+++ b/src/machine/m_at_286_386sx.c
@@ -568,12 +568,6 @@ machine_at_scamp_common_init(const machine_t *model, int is_ps2)
     device_add(&vlsi_scamp_device);
 }
 
-const device_t *
-at_cmdsl386sx25_get_device(void)
-{
-    return &gd5402_onboard_device;
-}
-
 int
 machine_at_cmdsl386sx25_init(const machine_t *model)
 {
@@ -609,12 +603,6 @@ machine_at_dataexpert386sx_init(const machine_t *model)
     return ret;
 }
 
-const device_t *
-at_spc6033p_get_device(void)
-{
-    return &ati28800k_spc6033p_device;
-}
-
 int
 machine_at_spc6033p_init(const machine_t *model)
 {
@@ -719,12 +707,6 @@ machine_at_flytech386_init(const machine_t *model)
     return ret;
 }
 
-const device_t *
-at_flytech386_get_device(void)
-{
-    return &tvga8900d_device;
-}
-
 int
 machine_at_mr1217_init(const machine_t *model)
 {
diff --git a/src/machine/m_at_slot1.c b/src/machine/m_at_slot1.c
index 1204384a5..8f361ba78 100644
--- a/src/machine/m_at_slot1.c
+++ b/src/machine/m_at_slot1.c
@@ -634,12 +634,6 @@ machine_at_ms6168_common_init(const machine_t *model)
     }
 }
 
-const device_t *
-at_ms6168_get_device(void)
-{
-    return &voodoo_3_2000_agp_onboard_8m_device;
-}
-
 int
 machine_at_borapro_init(const machine_t *model)
 {
diff --git a/src/machine/m_xt_t1000.c b/src/machine/m_xt_t1000.c
index afad725a3..526833a98 100644
--- a/src/machine/m_xt_t1000.c
+++ b/src/machine/m_xt_t1000.c
@@ -902,12 +902,6 @@ machine_xt_t1000_init(const machine_t *model)
     return ret;
 }
 
-const device_t *
-t1200_get_device(void)
-{
-    return (&t1200_video_device);
-}
-
 int
 machine_xt_t1200_init(const machine_t *model)
 {
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 07034c805..eaeed3e6b 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -234,7 +234,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] IBM PC (1982)",
@@ -268,7 +270,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] IBM PCjr",
@@ -302,7 +306,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &pcjr_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] IBM XT (1982)",
@@ -336,7 +342,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] IBM XT (1986)",
@@ -370,7 +378,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] American XT Computer",
@@ -404,7 +414,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] AMI XT clone",
@@ -438,7 +450,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Bondwell BW230",
@@ -472,7 +486,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Columbia Data Products MPC-1600",
@@ -506,7 +522,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Compaq Portable",
@@ -540,7 +558,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] DTK PIM-TB10-Z",
@@ -574,7 +594,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Eagle PC Spirit",
@@ -608,7 +630,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Generic XT clone",
@@ -642,7 +666,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Hyosung Topstar 88T",
@@ -676,7 +702,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Hyundai SUPER-16T",
@@ -710,7 +738,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Hyundai SUPER-16TE",
@@ -744,7 +774,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Juko ST",
@@ -778,7 +810,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Kaypro PC",
@@ -812,7 +846,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Multitech PC-500",
@@ -846,7 +882,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Multitech PC-700",
@@ -880,7 +918,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] NCR PC4i",
@@ -914,7 +954,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Olivetti M19",
@@ -948,7 +990,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &m19_vid_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] OpenXT",
@@ -982,7 +1026,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Philips P3105/NMS9100",
@@ -1016,7 +1062,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Phoenix XT clone",
@@ -1050,7 +1098,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Sanyo SX-16",
@@ -1084,7 +1134,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Schneider EuroPC",
@@ -1118,7 +1170,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Super PC/Turbo XT",
@@ -1152,7 +1206,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Tandy 1000",
@@ -1186,7 +1242,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &vid_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Tandy 1000 HX",
@@ -1220,7 +1278,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &vid_device_hx,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Toshiba T1000",
@@ -1254,7 +1314,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &t1000_video_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Vendex HeadStart Turbo 888-XT",
@@ -1288,7 +1350,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 #if defined(DEV_BRANCH) && defined(USE_LASERXT)
     {
@@ -1323,7 +1387,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 #endif
     /* Has a standard PS/2 KBC (so, use IBM PS/2 Type 1). */
@@ -1359,7 +1425,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff04,
         .gpio = 0xffffffff,
         .device = &xi8088_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Z-NIX PC-1600",
@@ -1393,7 +1461,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Zenith Data Systems Z-151/152/161",
@@ -1427,7 +1497,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Zenith Data Systems Z-159",
@@ -1461,7 +1533,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8088] Zenith Data Systems SupersPort (Z-184)",
@@ -1495,7 +1569,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &cga_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[GC100A] Philips P3120",
@@ -1529,7 +1605,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 8086 Machines */
@@ -1565,7 +1643,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &vid_1512_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8086] Amstrad PC1640",
@@ -1599,7 +1679,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &vid_1640_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8086] Amstrad PC2086",
@@ -1633,7 +1715,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &vid_pc2086_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8086] Amstrad PC3086",
@@ -1667,7 +1751,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &vid_pc3086_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8086] Amstrad PC20(0)",
@@ -1701,7 +1787,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &vid_200_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8086] Amstrad PPC512/640",
@@ -1735,7 +1823,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &vid_ppc512_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8086] Compaq Deskpro",
@@ -1769,7 +1859,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8086] Olivetti M21/24/24SP",
@@ -1803,7 +1895,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &ogc_m24_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has Olivetti KBC firmware. */
     {
@@ -1838,7 +1932,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff04,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8086] Schetmash Iskra-3104",
@@ -1872,7 +1968,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8086] Tandy 1000 SL/2",
@@ -1906,7 +2004,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &vid_device_sl,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8086] Victor V86P",
@@ -1940,7 +2040,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[8086] Toshiba T1200",
@@ -1974,7 +2076,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = &t1200_video_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
 #if defined(DEV_BRANCH) && defined(USE_LASERXT)
@@ -2010,7 +2114,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 #endif
 
@@ -2048,7 +2154,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -2083,7 +2191,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -2118,7 +2228,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM AT KBC firmware. */
     {
@@ -2153,7 +2265,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* AMI BIOS for a chipset-less machine, most likely has AMI 'F' KBC firmware. */
     {
@@ -2188,7 +2302,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Uses Commodore (CBM) KBC firmware, to be implemented as identical to the
        IBM AT KBC firmware unless evidence emerges of any proprietary commands. */
@@ -2224,7 +2340,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Uses Compaq KBC firmware. */
     {
@@ -2259,7 +2377,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Uses Compaq KBC firmware. */
     {
@@ -2294,7 +2414,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &compaq_plasma_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM AT KBC firmware. */
     {
@@ -2329,7 +2451,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM AT KBC firmware. */
     {
@@ -2364,7 +2488,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 #if defined(DEV_BRANCH) && defined(USE_OLIVETTI)
     /* Has Olivetti KBC firmware. */
@@ -2400,7 +2526,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 #endif
 #if defined(DEV_BRANCH) && defined(USE_OPEN_AT)
@@ -2437,7 +2565,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 #endif
     /* Has IBM AT KBC firmware. */
@@ -2473,7 +2603,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has Quadtel KBC firmware. */
     {
@@ -2508,7 +2640,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has a Siemens proprietary KBC which is completely undocumented. */
     {
@@ -2543,7 +2677,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has Toshiba's proprietary KBC, which is already implemented. */
     {
@@ -2578,7 +2714,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has Quadtel KBC firmware. */
     {
@@ -2613,7 +2751,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Most likely has AMI 'F' KBC firmware. */
     {
@@ -2648,7 +2788,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has "AMI KEYBOARD BIOS", most likely 'F'. */
     {
@@ -2683,7 +2825,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM AT KBC firmware. */
     {
@@ -2718,7 +2862,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM AT KBC firmware. */
     {
@@ -2753,7 +2899,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has Chips & Technologies KBC firmware. */
     {
@@ -2788,7 +2936,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -2823,7 +2973,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a VIA VT82C42N KBC. */
     {
@@ -2858,7 +3010,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a VIA VT82C42N KBC. */
     {
@@ -2893,7 +3047,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -2928,7 +3084,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -2963,7 +3121,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -2998,7 +3158,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM AT KBC firmware. */
     {
@@ -3033,7 +3195,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 286 machines that utilize the MCA bus */
@@ -3070,7 +3234,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 2 KBC firmware. */
     {
@@ -3105,7 +3271,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 386SX machines */
@@ -3143,7 +3311,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM AT KBC firmware. */
     {
@@ -3178,7 +3348,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has Quadtel KBC firmware. */
     {
@@ -3213,7 +3385,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has an AMIKey-2, which is an updated version of type 'H'. */
     {
@@ -3248,7 +3422,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the AMIKey KBC firmware, which is an updated 'F' type. */
     {
@@ -3283,7 +3459,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has an AMI KBC firmware, the only photo of this is too low resolution
        for me to read what's on the KBC chip, so I'm going to assume AMI 'F'
@@ -3320,7 +3498,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &tvga8900d_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* I'm going to assume this has a standard/generic IBM-compatible AT KBC
        firmware until the board is identified. */
@@ -3356,7 +3536,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -3391,7 +3573,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -3426,7 +3610,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has an AMI KBC firmware, the only photo of this is too low resolution
        for me to read what's on the KBC chip, so I'm going to assume AMI 'F'
@@ -3463,7 +3649,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &oti067_ama932j_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has an unknown KBC firmware with commands B8 and BB in the style of
        Phoenix MultiKey and AMIKey-3(!), but also commands E1 and EA with
@@ -3500,7 +3688,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has an AMI Keyboard BIOS PLUS KBC firmware ('8'). */
     { .name = "[Intel 82335] Shuttle 386SX",
@@ -3534,7 +3724,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Uses Commodore (CBM) KBC firmware, to be implemented as identical to
        the IBM PS/2 Type 1 KBC firmware unless evidence emerges of any
@@ -3571,7 +3763,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM AT KBC firmware. */
     {
@@ -3606,7 +3800,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM AT KBC firmware. */
     {
@@ -3641,7 +3837,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Uses Commodore (CBM) KBC firmware, to be implemented as identical to
        the IBM PS/2 Type 1 KBC firmware unless evidence emerges of any
@@ -3678,7 +3876,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &gd5402_onboard_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The closest BIOS string I find to this one's, differs only in one part,
        and ends in -8, so I'm going to assume that this, too, has an AMI '8'
@@ -3715,7 +3915,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -3750,7 +3952,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &ati28800k_spc6033p_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has an unknown AMI KBC firmware, I'm going to assume 'F' until a
        photo or real hardware BIOS string is found. */
@@ -3786,7 +3990,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has Quadtel KBC firmware. */
     {
@@ -3821,7 +4027,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 386SX machines which utilize the MCA bus */
@@ -3858,7 +4066,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -3893,7 +4103,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 486SLC machines */
@@ -3931,7 +4143,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 386DX machines */
@@ -3967,7 +4181,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has an AMI Keyboard BIOS PLUS KBC firmware ('8'). */
     {
@@ -4002,7 +4218,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM AT KBC firmware. */
     {
@@ -4037,7 +4255,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Uses Compaq KBC firmware. */
 #if defined(DEV_BRANCH) && defined(USE_DESKPRO386)
@@ -4073,7 +4293,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 #endif
     {
@@ -4108,7 +4330,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &compaq_plasma_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM AT KBC firmware. */
     {
@@ -4143,7 +4367,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey F KBC firmware. */
     {
@@ -4178,7 +4404,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 386DX machines which utilize the MCA bus */
@@ -4215,7 +4443,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 386DX/486 machines */
@@ -4253,7 +4483,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey F KBC firmware. */
     {
@@ -4288,7 +4520,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey F KBC firmware (it's just the MR BIOS for the above machine). */
     {
@@ -4323,7 +4557,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -4358,7 +4594,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -4393,7 +4631,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 486 machines - Socket 1 */
@@ -4434,7 +4674,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has JetKey 5 KBC Firmware - but the BIOS string ends in a hardcoded -F, and
        the BIOS also explicitly expects command A1 to return a 'F', so it looks like
@@ -4471,7 +4713,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Uses some variant of Phoenix MultiKey/42 as the Intel 8242 chip has a Phoenix
        copyright. */
@@ -4507,7 +4751,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMI KF KBC firmware. */
     {
@@ -4542,7 +4788,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey H KBC firmware, per the screenshot in "How computers & MS-DOS work". */
     {
@@ -4577,7 +4825,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey F KBC firmware, per a photo of a monitor with the BIOS screen on
        eBay. */
@@ -4613,7 +4863,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a MR (!) KBC firmware, which is a clone of the standard IBM PS/2 KBC firmware. */
     {
@@ -4648,7 +4900,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The chip is a Lance LT38C41, a clone of the Intel 8041, and the BIOS sends
        commands BC, BD, and C9 which exist on both AMIKey and Phoenix MultiKey/42,
@@ -4686,7 +4940,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to Deksor on the Win3x.org forum, the BIOS string ends in a -0,
        indicating an unknown KBC firmware. But it does send the AMIKey get version
@@ -4723,7 +4979,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &gd5428_onboard_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a standard IBM PS/2 KBC firmware or a clone thereof. */
     {
@@ -4758,7 +5016,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &gd5428_onboard_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 486 machines - Socket 2 */
@@ -4797,7 +5057,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Uses an ACER/NEC 90M002A (UPD82C42C, 8042 clone) with unknown firmware (V4.01H). */
     {
@@ -4832,7 +5094,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &gd5428_onboard_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has an AMIKey-2, which is an updated version of type 'H'. */
     {
@@ -4867,7 +5131,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Uses an Intel KBC with Phoenix MultiKey KBC firmware. */
     {
@@ -4902,7 +5168,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &s3_86c805_onboard_vlb_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Uses an NEC 90M002A (UPD82C42C, 8042 clone) with unknown firmware. */
     {
@@ -4937,7 +5205,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The BIOS does not send any non-standard keyboard controller commands and wants
        a PS/2 mouse, so it's an IBM PS/2 KBC (Type 1) firmware. */
@@ -4973,7 +5243,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The BIOS string ends in -U, unless command 0xA1 (AMIKey get version) returns an
        'F', in which case, it ends in -F, so it has an AMIKey F KBC firmware.
@@ -5010,7 +5282,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 486 machines - Socket 3 */
@@ -5048,7 +5322,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a VIA VT82C42N KBC. */
     {
@@ -5083,7 +5359,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has JetKey 5 KBC Firmware which looks like it is a clone of AMIKey type F. */
     {
@@ -5118,7 +5396,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has JetKey 5 KBC Firmware which looks like it is a clone of AMIKey type F. */
     {
@@ -5153,7 +5433,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey H keyboard BIOS. */
     {
@@ -5188,7 +5470,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has an AMIKey-2, which is an updated version of type 'H'. */
     {
@@ -5223,7 +5507,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has JetKey 5 KBC Firmware which looks like it is a clone of AMIKey type F. */
     {
@@ -5258,7 +5544,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Unknown Epox VLB Socket 3 board, has AMIKey F keyboard BIOS. */
     {
@@ -5293,7 +5581,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 486 machines which utilize the PCI bus */
@@ -5330,7 +5620,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &tgui9440_onboard_pci_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the ALi M1487/9's on-chip keyboard controller which clones a standard AT
        KBC. */
@@ -5366,7 +5658,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the ALi M1487/9's on-chip keyboard controller which clones a standard AT
        KBC.
@@ -5405,7 +5699,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the ALi M1487/9's on-chip keyboard controller which clones a standard AT
        KBC.
@@ -5444,7 +5740,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has an ALi M5042 keyboard controller with Phoenix MultiKey/42 v1.40 firmware. */
     {
@@ -5479,7 +5777,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -5514,7 +5814,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has an AMIKey-2, which is an updated version of type 'H'. */
     {
@@ -5549,7 +5851,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has the Phoenix MultiKey KBC firmware. */
     {
@@ -5584,7 +5888,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* I'm going to assume this as an AMIKey-2 like the other two 486SP3's. */
     {
@@ -5619,7 +5925,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has the Phoenix MultiKey KBC firmware. */
     {
@@ -5654,7 +5962,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has an AMIKey-2, which is an updated version of type 'H'. Also has a
        SST 29EE010 Flash chip. */
@@ -5690,7 +6000,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This most likely has a standalone AMI Megakey 1993, which is type 'P', like the below Tekram board. */
     {
@@ -5725,7 +6037,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has a standalone AMI Megakey 1993, which is type 'P'. */
     {
@@ -5760,7 +6074,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has an AMIKey-2, which is an updated version of type 'H'. */
     {
@@ -5795,7 +6111,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has an AMIKey-2, which is an updated version of type 'H'. */
     {
@@ -5830,7 +6148,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The BIOS does not send a single non-standard KBC command, so it has a standard PS/2 KBC. */
     {
@@ -5865,7 +6185,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a BestKey KBC which clones AMI type 'H'. */
     {
@@ -5900,7 +6222,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has a Holtek KBC and the BIOS does not send a single non-standard KBC command, so it
        must be an ASIC that clones the standard IBM PS/2 KBC. */
@@ -5936,7 +6260,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to MrKsoft, his real 4DPS has an AMIKey-2, which is an updated version
        of type 'H'. */
@@ -5972,7 +6298,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has the UMC 88xx on-chip KBC. */
     {
@@ -6007,7 +6335,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has an AMIKey-2, which is an updated version of type 'H'. */
     {
@@ -6042,7 +6372,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey Z(!) KBC firmware. */
     {
@@ -6077,7 +6409,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* 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. */
@@ -6113,7 +6447,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. Uses a mysterious I/O port C05. */
     {
@@ -6148,7 +6484,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has a Holtek KBC. */
     {
@@ -6183,7 +6521,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a VIA VT82C406 KBC+RTC that likely has identical commands to the VT82C42N. */
     {
@@ -6218,7 +6558,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a VIA VT82C42N KBC. */
     {
@@ -6253,7 +6595,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 486 machines - Miscellaneous */
@@ -6292,7 +6636,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977F Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -6328,7 +6674,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977F Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -6364,7 +6712,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977F Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -6400,7 +6750,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977F Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -6436,7 +6788,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Socket 4 machines */
@@ -6478,7 +6832,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey F KBC firmware (AMIKey). */
     {
@@ -6513,7 +6869,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -6548,7 +6906,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -6583,7 +6943,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has the Phoenix MultiKey KBC firmware.
        This is basically an Intel Batman (*NOT* Batman's Revenge) with a fancier
@@ -6620,7 +6982,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
@@ -6655,7 +7019,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has the Phoenix MultiKey KBC firmware. */
     {
@@ -6690,7 +7056,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMI MegaKey KBC firmware. */
     {
@@ -6725,7 +7093,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has the Phoenix MultiKey KBC firmware. */
     {
@@ -6760,7 +7130,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &gd5434_onboard_pci_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* OPTi 596/597 */
@@ -6799,7 +7171,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* OPTi 596/597/822 */
@@ -6836,7 +7210,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* SiS 50x */
@@ -6873,7 +7249,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has an AMIKey-2, which is an updated version of type 'H'. */
     {
@@ -6908,7 +7286,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Socket 5 machines */
@@ -6946,7 +7326,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has the Phoenix MultiKey KBC firmware.
        This is basically an Intel Premiere/PCI II with a fancier POST screen. */
@@ -6982,7 +7364,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMI MegaKey KBC firmware. */
     {
@@ -7017,7 +7401,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 430FX */
@@ -7054,7 +7440,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey F KBC firmware. */
     {
@@ -7089,7 +7477,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey H KBC firmware. */
     {
@@ -7124,7 +7514,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
        PC87306 Super I/O chip, command 0xA1 returns '5'.
@@ -7161,7 +7553,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The BIOS sends KBC command B3 which indicates an AMI (or VIA VT82C42N) KBC. */
     {
@@ -7196,7 +7590,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a VIA VT82C42N KBC. */
     {
@@ -7231,7 +7627,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey Z(!) KBC firmware. */
     {
@@ -7266,7 +7664,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* OPTi 596/597 */
@@ -7305,7 +7705,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* OPTi 596/597/822 */
@@ -7341,7 +7743,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* SiS 85C50x */
@@ -7378,7 +7782,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has an AMIKey-2, which is an updated version of type 'H'. */
     {
@@ -7413,7 +7819,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Socket 7 (Single Voltage) machines */
@@ -7451,7 +7859,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has an AMIKey-2, which is an updated version of type 'H'. */
     {
@@ -7486,7 +7896,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
        PC87306 Super I/O chip, command 0xA1 returns '5'.
@@ -7523,7 +7935,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The BIOS does not send a single non-standard KBC command, but the board has a SMC Super I/O
        chip with on-chip KBC and AMI MegaKey KBC firmware. */
@@ -7559,7 +7973,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &s3_phoenix_trio64_onboard_pci_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
        PC87306 Super I/O chip, command 0xA1 returns '5'.
@@ -7596,7 +8012,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &s3_phoenix_trio64vplus_onboard_pci_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
        PC87306 Super I/O chip, command 0xA1 returns '5'.
@@ -7633,7 +8051,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &s3_phoenix_trio64vplus_onboard_pci_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
        PC87306 Super I/O chip, command 0xA1 returns '5'.
@@ -7670,7 +8090,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &s3_phoenix_trio64_onboard_pci_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has an AMIKey-2, which is an updated version of type 'H'. */
     {
@@ -7705,7 +8127,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This most likely uses AMI MegaKey KBC firmware as well due to having the same
        Super I/O chip (that has the KBC firmware on it) as eg. the Advanced/EV. */
@@ -7741,7 +8165,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &gd5440_onboard_pci_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has an AMI 'H' KBC firmware (1992). */
     {
@@ -7776,7 +8202,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 430HX */
@@ -7815,7 +8243,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey F KBC firmware. */
     {
@@ -7850,7 +8280,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* [TEST] Has a VIA 82C42N KBC, with AMIKey F KBC firmware. */
     {
@@ -7885,7 +8317,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* [TEST] Unable to determine what KBC this has. A list on a Danish site shows
        the BIOS as having a -0 string, indicating non-AMI KBC firmware. */
@@ -7921,7 +8355,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 430VX */
@@ -7958,7 +8394,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
        PC87306 Super I/O chip, command 0xA1 returns '5'.
@@ -7995,7 +8433,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* SiS 5511 */
@@ -8032,7 +8472,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Socket 7 (Dual Voltage) machines */
@@ -8070,7 +8512,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey H KBC firmware (AMIKey-2). */
     {
@@ -8105,7 +8549,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the SMC FDC73C935's on-chip KBC with Phoenix MultiKey firmware. */
     {
@@ -8140,7 +8586,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
        PC87306 Super I/O chip, command 0xA1 returns '5'.
@@ -8177,7 +8625,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
        PC87306 Super I/O chip, command 0xA1 returns '5'.
@@ -8214,7 +8664,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
        PC87306 Super I/O chip, command 0xA1 returns '5'.
@@ -8252,7 +8704,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The base board has AMIKey-2 (updated 'H') KBC firmware. */
     {
@@ -8287,7 +8741,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 430VX */
@@ -8324,7 +8780,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has AMIKey H KBC firmware (AMIKey-2). */
     {
@@ -8359,7 +8817,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The BIOS does not send a single non-standard KBC command, so it must have a standard IBM
        PS/2 KBC firmware or a clone thereof. */
@@ -8395,7 +8855,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* [TEST] Has AMIKey 'F' KBC firmware. */
     {
@@ -8430,7 +8892,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The BIOS does not send a single non-standard KBC command, but the board has a SMC Super I/O
        chip with on-chip KBC and AMI MegaKey KBC firmware. */
@@ -8466,7 +8930,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &s3_trio64v2_dx_onboard_pci_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This most likely has AMI MegaKey as above. */
     {
@@ -8501,7 +8967,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &s3_trio64v2_dx_onboard_pci_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The BIOS sends KBC command CB which is an AMI KBC command, so it has an AMI KBC firmware. */
     {
@@ -8536,7 +9004,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The BIOS does not send a single non-standard KBC command. */
     {
@@ -8571,7 +9041,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
        PC87306 Super I/O chip, command 0xA1 returns '5'.
@@ -8608,7 +9080,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has the AMIKey 'H' firmware, possibly AMIKey-2. Photos show it with a BestKey, so it
        likely clones the behavior of AMIKey 'H'. */
@@ -8644,7 +9118,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has a Holtek KBC and the BIOS does not send a single non-standard KBC command, so it
        must be an ASIC that clones the standard IBM PS/2 KBC. */
@@ -8680,7 +9156,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 430TX */
@@ -8717,7 +9195,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has the AMIKey KBC firmware, which is an updated 'F' type (YM430TX is based on the TX97). */
     {
@@ -8752,7 +9232,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 #if defined(DEV_BRANCH) && defined(USE_AN430TX)
     /* This has the Phoenix MultiKey KBC firmware. */
@@ -8788,7 +9270,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 #endif
     /* This has the AMIKey KBC firmware, which is an updated 'F' type. */
@@ -8824,7 +9308,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The BIOS sends KBC command BB and expects it to output a byte, which is AMI KBC behavior. */
     {
@@ -8859,7 +9345,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Award BIOS, PS2, EDO, SDRAM, 4 PCI, 4 ISA, VIA VT82C42N KBC */
     {
@@ -8894,7 +9382,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* [TEST] Has AMIKey 'H' KBC firmware. */
     {
@@ -8929,7 +9419,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Apollo VPX */
@@ -8967,7 +9459,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Apollo VP3 */
@@ -9005,7 +9499,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* SiS 5571 */
@@ -9042,7 +9538,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the SiS 5571 chipset with on-chip KBC. */
     {
@@ -9077,7 +9575,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* ALi ALADDiN IV+ */
@@ -9114,7 +9614,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the ALi M1543 southbridge with on-chip KBC. */
     {
@@ -9149,7 +9651,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Super Socket 7 machines */
@@ -9187,7 +9691,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Is the exact same as the Matsonic MS6260S. Has the ALi M1543C southbridge
        with on-chip KBC. */
@@ -9223,7 +9729,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the ALi M1543C southbridge with on-chip KBC. */
     {
@@ -9258,7 +9766,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the ALi M1543C southbridge with on-chip KBC. */
     {
@@ -9293,7 +9803,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Apollo MVP3 */
@@ -9331,7 +9843,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the VIA VT82C586B southbridge with on-chip KBC identical to the VIA
        VT82C42N. */
@@ -9367,7 +9881,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the VIA VT82C686A southbridge with on-chip KBC identical to the VIA
        VT82C42N. */
@@ -9403,7 +9919,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the VIA VT82C686A southbridge with on-chip KBC identical to the VIA
        VT82C42N. */
@@ -9439,7 +9957,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Socket 8 machines */
@@ -9477,7 +9997,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 440FX */
@@ -9514,7 +10036,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The base board has AMIKey-2 (updated 'H') KBC firmware. */
     {
@@ -9549,7 +10073,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* The MB-8600TTX has an AMIKey 'F' KBC firmware, so I'm going to assume so does
        the MB-8600TTC until someone can actually identify it. */
@@ -9585,7 +10111,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     {
         .name = "[i440FX] Gigabyte GA-686NX",
@@ -9619,7 +10147,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
        PC87306 Super I/O chip, command 0xA1 returns '5'.
@@ -9656,7 +10186,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
        PC87306 Super I/O chip, command 0xA1 returns '5'.
@@ -9693,7 +10225,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the SMC FDC73C935's on-chip KBC with Phoenix MultiKey firmware. */
     {
@@ -9728,7 +10262,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* I found a BIOS string of it that ends in -S, but it could be a typo for -5
        (there's quite a few AMI BIOS strings around with typo'd KBC codes), so I'm
@@ -9765,7 +10301,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Slot 1 machines */
@@ -9803,7 +10341,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 440FX */
@@ -9840,7 +10380,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* This has a Holtek KBC and the BIOS does not send a single non-standard KBC command, so it
        must be an ASIC that clones the standard IBM PS/2 KBC. */
@@ -9876,7 +10418,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 440LX */
@@ -9914,7 +10458,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a SM(S)C FDC37C935 Super I/O chip with on-chip KBC with Phoenix
        MultiKey KBC firmware. */
@@ -9950,7 +10496,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 440EX */
@@ -9988,7 +10536,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 440BX */
@@ -10026,7 +10576,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -10062,7 +10614,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -10098,7 +10652,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977TF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -10134,7 +10690,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977TF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -10170,7 +10728,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a SM(S)C FDC37M60x Super I/O chip with on-chip KBC with most likely
        AMIKey-2 KBC firmware. */
@@ -10206,7 +10766,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a National Semiconductors PC87309 Super I/O chip with on-chip KBC
        with most likely AMIKey-2 KBC firmware. */
@@ -10242,7 +10804,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &es1371_onboard_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977TF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -10278,7 +10842,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 440ZX */
@@ -10316,7 +10882,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &voodoo_3_2000_agp_onboard_8m_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -10352,7 +10920,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &voodoo_3_2000_agp_onboard_8m_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* SMSC VictoryBX-66 */
@@ -10390,7 +10960,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* VIA Apollo Pro */
@@ -10428,7 +11000,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -10464,7 +11038,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -10500,7 +11076,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Slot 1/2 machines */
@@ -10539,7 +11117,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Slot 1/Socket 370 machines */
@@ -10578,7 +11158,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &es1371_onboard_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Slot 2 machines */
@@ -10617,7 +11199,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977TF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -10653,7 +11237,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* PGA370 machines */
@@ -10692,7 +11278,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 440BX */
@@ -10730,7 +11318,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -10766,7 +11356,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -10802,7 +11394,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* 440ZX */
@@ -10840,7 +11434,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* SMSC VictoryBX-66 */
@@ -10878,7 +11474,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* VIA Apollo Pro */
@@ -10916,7 +11514,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -10952,7 +11552,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the VIA VT82C686B southbridge with on-chip KBC identical to the VIA
        VT82C42N. */
@@ -10988,7 +11590,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has the VIA VT82C686B southbridge with on-chip KBC identical to the VIA
        VT82C42N. */
@@ -11024,7 +11628,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &cmi8738_onboard_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
@@ -11060,7 +11666,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = &es1371_onboard_device,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     /* Miscellaneous/Fake/Hypervisor machines */
@@ -11098,7 +11706,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     },
 
     {
@@ -11133,7 +11743,9 @@ const machine_t machines[] = {
         .kbc_p1 = 0,
         .gpio = 0,
         .device = NULL,
-        .vid_device = NULL
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
     }
 };
 
@@ -11208,6 +11820,24 @@ machine_getviddevice(int m)
     return(NULL);
 }
 
+const device_t *
+machine_getsnddevice(int m)
+{
+    if (machines[m].snd_device)
+        return(machines[m].snd_device);
+
+    return(NULL);
+}
+
+const device_t *
+machine_getnetdevice(int m)
+{
+    if (machines[m].net_device)
+        return(machines[m].net_device);
+
+    return(NULL);
+}
+
 char *
 machine_get_internal_name(void)
 {
diff --git a/src/pit_fast.c b/src/pit_fast.c
index 704cfd68c..758183d5e 100644
--- a/src/pit_fast.c
+++ b/src/pit_fast.c
@@ -145,6 +145,8 @@ pitf_dump_and_disable_timer(ctrf_t *ctr)
 {
     if (ctr->using_timer && timer_is_enabled(&ctr->timer)) {
         ctr->count = pitf_read_timer(ctr);
+        if (ctr->m == 2)
+            ctr->count--; /* Don't store the offset from pitf_read_timer */
         timer_disable(&ctr->timer);
     }
 }
diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp
index ebccbe0cb..00ebb578e 100644
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -2058,7 +2058,7 @@ void MainWindow::on_actionMCA_devices_triggered()
 
 void MainWindow::on_actionShow_non_primary_monitors_triggered()
 {
-    show_second_monitors ^= 1;
+    show_second_monitors = (int)ui->actionShow_non_primary_monitors->isChecked();
 
     blitDummied = true;
 
diff --git a/src/qt/qt_mainwindow.hpp b/src/qt/qt_mainwindow.hpp
index a7d029bff..0f8a5ecd2 100644
--- a/src/qt/qt_mainwindow.hpp
+++ b/src/qt/qt_mainwindow.hpp
@@ -148,6 +148,7 @@ private:
     friend class SpecifyDimensions;
     friend class ProgSettings;
     friend class RendererCommon;
+    friend class RendererStack; // For UI variable access by non-primary renderer windows.
 };
 
 #endif // QT_MAINWINDOW_HPP
diff --git a/src/qt/qt_mediamenu.cpp b/src/qt/qt_mediamenu.cpp
index 96fba3808..a4fcb5113 100644
--- a/src/qt/qt_mediamenu.cpp
+++ b/src/qt/qt_mediamenu.cpp
@@ -115,13 +115,12 @@ void MediaMenu::refresh(QMenu *parentMenu) {
         cdromMutePos = menu->children().count();
         menu->addAction(tr("&Mute"), [this, i]() { cdromMute(i); })->setCheckable(true);
         menu->addSeparator();
-        cdromEmptyPos = menu->children().count();
-        menu->addAction(tr("E&mpty"), [this, i]() { cdromEject(i); })->setCheckable(true);
+        menu->addAction(tr("&Image..."), [this, i]() { cdromMount(i); })->setCheckable(false);
         cdromReloadPos = menu->children().count();
         menu->addAction(tr("&Reload previous image"), [this, i]() { cdromReload(i); });
         menu->addSeparator();
         cdromImagePos = menu->children().count();
-        menu->addAction(tr("&Image"), [this, i]() { cdromMount(i); })->setCheckable(true);
+        menu->addAction(tr("E&ject"), [this, i]() { cdromEject(i); })->setCheckable(false);
         cdromMenus[i] = menu;
         cdromUpdateMenu(i);
     });
@@ -344,6 +343,7 @@ void MediaMenu::floppyExportTo86f(int i) {
 
 void MediaMenu::floppyUpdateMenu(int i) {
     QString name = floppyfns[i];
+    QFileInfo fi(floppyfns[i]);
 
     if (!floppyMenus.contains(i))
         return;
@@ -354,6 +354,7 @@ void MediaMenu::floppyUpdateMenu(int i) {
     auto* ejectMenu = dynamic_cast<QAction*>(childs[floppyEjectPos]);
     auto* exportMenu = dynamic_cast<QAction*>(childs[floppyExportPos]);
     ejectMenu->setEnabled(!name.isEmpty());
+    ejectMenu->setText(QString::asprintf(tr("Eject %s").toUtf8().constData(), name.isEmpty() ? QString().toUtf8().constData() :  fi.fileName().toUtf8().constData()));
     exportMenu->setEnabled(!name.isEmpty());
 
     int type = fdd_get_type(i);
@@ -428,6 +429,10 @@ void MediaMenu::cdromReload(int i) {
 
 void MediaMenu::cdromUpdateMenu(int i) {
     QString name = cdrom[i].image_path;
+    QString prev_name = cdrom[i].prev_image_path;
+    QFileInfo fi(cdrom[i].image_path);
+    QFileInfo fi_prev(cdrom[i].prev_image_path);
+
     if (!cdromMenus.contains(i))
         return;
     auto* menu = cdromMenus[i];
@@ -437,12 +442,12 @@ void MediaMenu::cdromUpdateMenu(int i) {
     muteMenu->setChecked(cdrom[i].sound_on == 0);
 
     auto* imageMenu = dynamic_cast<QAction*>(childs[cdromImagePos]);
-    auto* emptyMenu = dynamic_cast<QAction*>(childs[cdromEmptyPos]);
-    imageMenu->setChecked(cdrom[i].host_drive == 200);
-    emptyMenu->setChecked(cdrom[i].host_drive != 200);
+    imageMenu->setEnabled(!name.isEmpty());
+    imageMenu->setText(QString::asprintf(tr("Eject %s").toUtf8().constData(), name.isEmpty() ? QString().toUtf8().constData() :  fi.fileName().toUtf8().constData()));
 
     auto* prevMenu = dynamic_cast<QAction*>(childs[cdromReloadPos]);
-    prevMenu->setEnabled(cdrom[i].prev_host_drive != 0);
+    prevMenu->setText(QString::asprintf(tr("Reload %s").toUtf8().constData(), prev_name.isEmpty() ? tr("previous image").toUtf8().constData() :  fi_prev.fileName().toUtf8().constData()));
+    prevMenu->setVisible(name.isEmpty() && cdrom[i].prev_host_drive != 0);
 
     QString busName = tr("Unknown Bus");
     switch (cdrom[i].bus_type) {
diff --git a/src/qt/qt_mediamenu.hpp b/src/qt/qt_mediamenu.hpp
index 94f547d3f..9b08d3ee3 100644
--- a/src/qt/qt_mediamenu.hpp
+++ b/src/qt/qt_mediamenu.hpp
@@ -80,7 +80,6 @@ private:
     int floppyEjectPos;
 
     int cdromMutePos;
-    int cdromEmptyPos;
     int cdromReloadPos;
     int cdromImagePos;
 
diff --git a/src/qt/qt_newfloppydialog.cpp b/src/qt/qt_newfloppydialog.cpp
index 576798e54..1581c6e52 100644
--- a/src/qt/qt_newfloppydialog.cpp
+++ b/src/qt/qt_newfloppydialog.cpp
@@ -187,6 +187,7 @@ void NewFloppyDialog::onCreate() {
 
     QProgressDialog progress("Creating floppy image", QString(), 0, 100, this);
     connect(this, &NewFloppyDialog::fileProgress, &progress, &QProgressDialog::setValue);
+    connect(this, &NewFloppyDialog::fileProgress, [] { QApplication::processEvents(); });
     switch (mediaType_) {
     case MediaType::Floppy:
         if (fi.suffix().toLower() == QStringLiteral("86f")) {
diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp
index 527b4e2ab..8aa85fb9c 100644
--- a/src/qt/qt_platform.cpp
+++ b/src/qt/qt_platform.cpp
@@ -336,11 +336,15 @@ plat_pause(int p)
 #endif
         return;
     }
+
     if ((p == 0) && (time_sync & TIME_SYNC_ENABLED))
         nvr_time_sync();
 
     dopause = p;
     if (p) {
+	if (mouse_capture)
+		plat_mouse_capture(0);
+
         wcsncpy(oldtitle, ui_window_title(NULL), sizeof_w(oldtitle) - 1);
         wcscpy(title, oldtitle);
         paused_msg[QObject::tr(" - PAUSED").toWCharArray(paused_msg)] = 0;
diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp
index 7a802e898..273bc4c95 100644
--- a/src/qt/qt_rendererstack.cpp
+++ b/src/qt/qt_rendererstack.cpp
@@ -32,6 +32,8 @@
 #include "qt_mainwindow.hpp"
 #include "qt_util.hpp"
 
+#include "ui_qt_mainwindow.h"
+
 #include "evdev_mouse.hpp"
 
 #include <atomic>
@@ -459,9 +461,9 @@ RendererStack::blitCommon(int x, int y, int w, int h)
 
 void RendererStack::closeEvent(QCloseEvent* event)
 {
-    if (cpu_thread_run == 0 || is_quit == 0) {
+    if (cpu_thread_run == 1 || is_quit == 0) {
         event->accept();
-        show_second_monitors = 0; // TODO: This isn't actually the right fix, so fix this properly.
+        main_window->ui->actionShow_non_primary_monitors->setChecked(false);
         return;
     }
     event->ignore();
diff --git a/src/scsi/scsi_cdrom.c b/src/scsi/scsi_cdrom.c
index c7e9060e9..e90e0d773 100644
--- a/src/scsi/scsi_cdrom.c
+++ b/src/scsi/scsi_cdrom.c
@@ -27,6 +27,7 @@
 #include <86box/config.h>
 #include <86box/timer.h>
 #include <86box/device.h>
+#include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/nvr.h>
 #include <86box/hdc.h>
diff --git a/src/scsi/scsi_disk.c b/src/scsi/scsi_disk.c
index d3e7b6f11..133c23997 100644
--- a/src/scsi/scsi_disk.c
+++ b/src/scsi/scsi_disk.c
@@ -25,6 +25,7 @@
 #include <86box/nvr.h>
 #include <86box/hdd.h>
 #include <86box/hdc.h>
+#include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/hdc_ide.h>
 #include <86box/plat.h>
diff --git a/src/sound/midi_fluidsynth.c b/src/sound/midi_fluidsynth.c
index 749c74b9f..79a2bcad6 100644
--- a/src/sound/midi_fluidsynth.c
+++ b/src/sound/midi_fluidsynth.c
@@ -58,6 +58,7 @@ static int   (*f_delete_fluid_synth)(void *synth);
 static int   (*f_fluid_synth_noteon)(void *synth, int chan, int key, int vel);
 static int   (*f_fluid_synth_noteoff)(void *synth, int chan, int key);
 static int   (*f_fluid_synth_cc)(void *synth, int chan, int ctrl, int val);
+static int   (*f_fluid_synth_channel_pressure)(void *synth, int chan, int val);
 static int   (*f_fluid_synth_sysex)(void *synth, const char *data, int len, char *response, int *response_len, int *handled, int dryrun);
 static int   (*f_fluid_synth_pitch_bend)(void *synth, int chan, int val);
 static int   (*f_fluid_synth_program_change)(void *synth, int chan, int program);
@@ -83,6 +84,7 @@ static dllimp_t fluidsynth_imports[] = {
   { "fluid_synth_noteon",            &f_fluid_synth_noteon            },
   { "fluid_synth_noteoff",           &f_fluid_synth_noteoff           },
   { "fluid_synth_cc",                &f_fluid_synth_cc                },
+  { "fluid_synth_channel_pressure",  &f_fluid_synth_channel_pressure  },
   { "fluid_synth_sysex",             &f_fluid_synth_sysex             },
   { "fluid_synth_pitch_bend",        &f_fluid_synth_pitch_bend        },
   { "fluid_synth_program_change",    &f_fluid_synth_program_change    },
@@ -199,6 +201,7 @@ fluidsynth_msg(uint8_t *msg)
             f_fluid_synth_program_change(data->synth, chan, param1);
             break;
         case 0xD0: /* Channel Pressure */
+            f_fluid_synth_channel_pressure(data->synth, chan, param1);
             break;
         case 0xE0: /* Pitch Bend */
             f_fluid_synth_pitch_bend(data->synth, chan, (param2 << 7) | param1);
diff --git a/src/unix/assets/86Box.spec b/src/unix/assets/86Box.spec
index f0b15a45a..d5fe0a0b1 100644
--- a/src/unix/assets/86Box.spec
+++ b/src/unix/assets/86Box.spec
@@ -12,17 +12,15 @@
 # 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 20220730
-
 Name:		86Box
-Version:	3.7
+Version:	3.7.1
 Release:	1%{?dist}
 Summary:	Classic PC emulator
 License:	GPLv2+
 URL:		https://86box.net
 
 Source0:	https://github.com/86Box/86Box/archive/refs/tags/v%%{version}.tar.gz
-Source1:	https://github.com/86Box/roms/archive/refs/tags/%{romver}.tar.gz
+Source1:	https://github.com/86Box/roms/archive/refs/tags/%{version}.tar.gz
 
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
@@ -34,6 +32,7 @@ BuildRequires: libappstream-glib
 BuildRequires: libevdev-devel
 BuildRequires: libXi-devel
 BuildRequires: ninja-build
+BuildRequires: openal-soft-devel
 BuildRequires: qt5-linguist
 BuildRequires: qt5-qtconfiguration-devel
 BuildRequires: qt5-qtbase-private-devel
@@ -56,7 +55,7 @@ It supports various models of PCs, graphics and sound cards, and CPUs.
 
 %package	roms
 Summary:	ROMs for use with 86Box
-Version:	%{romver}
+Version:	%{version}
 License:	Proprietary
 BuildArch:	noarch
 
@@ -97,7 +96,7 @@ cp src/unix/assets/net.86box.86Box.metainfo.xml %{buildroot}%{_metainfodir}
 appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/net.86box.86Box.metainfo.xml
 
 # install roms
-pushd roms-%{romver}
+pushd roms-%{version}
   mkdir -p %{buildroot}%{_datadir}/%{name}/roms
   cp -a * %{buildroot}%{_datadir}/%{name}/roms/
 popd
@@ -112,9 +111,9 @@ popd
 
 # files part of the rom package
 %files roms
-%license  roms-%{romver}/LICENSE
+%license  roms-%{version}/LICENSE
 %{_datadir}/%{name}/roms
 
 %changelog
-* Sat Jul 30 2022 Robert de Rooy <robert.de.rooy[AT]gmail.com> 3.7-1
+* Tue Aug 02 2022 Robert de Rooy <robert.de.rooy[AT]gmail.com> 3.7.1-1
 - Bump release
diff --git a/src/unix/assets/net.86box.86Box.metainfo.xml b/src/unix/assets/net.86box.86Box.metainfo.xml
index d024b0a1e..a4458cfad 100644
--- a/src/unix/assets/net.86box.86Box.metainfo.xml
+++ b/src/unix/assets/net.86box.86Box.metainfo.xml
@@ -10,7 +10,7 @@
     </categories>
     <launchable type="desktop-id">net.86box.86Box.desktop</launchable>
     <releases>
-      <release version="3.7" date="2022-07-30"/>
+      <release version="3.7.1" date="2022-08-02"/>
     </releases>
     <content_rating type="oars-1.1" />
     <description>
diff --git a/src/video/vid_oak_oti.c b/src/video/vid_oak_oti.c
index 210afc2b2..7572e44b6 100644
--- a/src/video/vid_oak_oti.c
+++ b/src/video/vid_oak_oti.c
@@ -41,7 +41,7 @@ enum {
     OTI_037C,
     OTI_067 = 2,
     OTI_067_AMA932J,
-	OTI_067_M300 = 4,
+    OTI_067_M300 = 4,
     OTI_077 = 5
 };
 
@@ -342,29 +342,61 @@ oti_pos_in(uint16_t addr, void *p)
 }
 
 
+static float
+oti_getclock(int clock)
+{
+    float ret = 0.0;
+
+    switch (clock) {
+	case 0:
+	default:
+		ret = 25175000.0;
+		break;
+	case 1:
+		ret = 28322000.0;
+		break;
+	case 4:
+		ret = 14318000.0;
+		break;
+	case 5:
+		ret = 16257000.0;
+		break;
+	case 7:
+		ret = 35500000.0;
+		break;
+    }
+
+}
+
+
 static void
 oti_recalctimings(svga_t *svga)
 {
     oti_t *oti = (oti_t *)svga->p;
+    int clk_sel = ((svga->miscout >> 2) & 3) | ((oti->regs[0x0d] & 0x20) >> 3);
 
-    if (oti->regs[0x14] & 0x08) svga->ma_latch |= 0x10000;
+    svga->clock = (cpuclock * (double)(1ull << 32)) / oti_getclock(clk_sel);
+
+    if (oti->chip_id > 0) {
+	if (oti->regs[0x14] & 0x08) svga->ma_latch |= 0x10000;
 	if (oti->regs[0x16] & 0x08) svga->ma_latch |= 0x20000;
 
 	if (oti->regs[0x14] & 0x01) svga->vtotal += 0x400;
 	if (oti->regs[0x14] & 0x02) svga->dispend += 0x400;
 	if (oti->regs[0x14] & 0x04) svga->vsyncstart += 0x400;
 
+	svga->interlace = oti->regs[0x14] & 0x80;
+    }
+
     if ((oti->regs[0x0d] & 0x0c) && !(oti->regs[0x0d] & 0x10)) svga->rowoffset <<= 1;
 
-    svga->interlace = oti->regs[0x14] & 0x80;
-
-	if (svga->bpp == 16) {
-		svga->render = svga_render_16bpp_highres;
-		svga->hdisp >>= 1;
-	} else if (svga->bpp == 15) {
-		svga->render = svga_render_15bpp_highres;
-		svga->hdisp >>= 1;
-	}
+    if (svga->bpp == 16) {
+	svga->render = svga_render_16bpp_highres;
+	svga->hdisp >>= 1;
+    } else if (svga->bpp == 15) {
+	svga->render = svga_render_15bpp_highres;
+	svga->hdisp >>= 1;
+    }
 }
 
 
diff --git a/src/vnc.c b/src/vnc.c
index 768b08b57..46ef21c5d 100644
--- a/src/vnc.c
+++ b/src/vnc.c
@@ -167,12 +167,12 @@ vnc_display(rfbClientPtr cl)
 
 
 static void
-vnc_blit(int x, int y, int w, int h)
+vnc_blit(int x, int y, int w, int h, int monitor_index)
 {
     uint32_t *p;
     int yy;
 
-    if ((x < 0) || (y < 0) || (w <= 0) || (h <= 0) || (w > 2048) || (h > 2048) || (buffer32 == NULL))
+    if (monitor_index || (x < 0) || (y < 0) || (w <= 0) || (h <= 0) || (w > 2048) || (h > 2048) || (buffer32 == NULL))
 	return;
 
     for (yy=0; yy<h; yy++) {
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index bd5451b64..d6780a8bc 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -365,7 +365,7 @@ win_settings_init(void)
     temp_cassette = cassette_enable;
 
     mfm_tracking = xta_tracking = esdi_tracking = ide_tracking = 0;
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < SCSI_LUN_MAX; i++)
         scsi_tracking[i] = 0;
 
     /* Hard disks category */
@@ -1958,12 +1958,12 @@ add_locations(HWND hdlg)
         settings_add_string(hdlg, IDC_COMBO_HD_CHANNEL, (LPARAM) lptsTemp);
     }
 
-    for (i = 0; i < 64; i++) {
+    for (i = 0; i < (SCSI_BUS_MAX * SCSI_ID_MAX); i++) {
         wsprintf(lptsTemp, plat_get_string(IDS_4135), i >> 4, i & 15);
         settings_add_string(hdlg, IDC_COMBO_HD_ID, (LPARAM) lptsTemp);
     }
 
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < (IDE_BUS_MAX * IDE_CHAN_MAX); i++) {
         wsprintf(lptsTemp, plat_get_string(IDS_4097), i >> 1, i & 1);
         settings_add_string(hdlg, IDC_COMBO_HD_CHANNEL_IDE, (LPARAM) lptsTemp);
     }
@@ -1989,7 +1989,7 @@ next_free_ide_channel(void)
 {
     int64_t i;
 
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < (IDE_BUS_MAX * IDE_CHAN_MAX); i++) {
         if (!(ide_tracking & (0xffLL << (i << 3LL))))
             return i;
     }
@@ -2002,7 +2002,7 @@ next_free_scsi_id(uint8_t *id)
 {
     int64_t i;
 
-    for (i = 0; i < 64; i++) {
+    for (i = 0; i < (SCSI_BUS_MAX * SCSI_ID_MAX); i++) {
         if (!(scsi_tracking[i >> 3] & (0xffLL << ((i & 0x07) << 3LL)))) {
             *id = i;
             return;
@@ -2138,7 +2138,7 @@ recalc_next_free_id(HWND hdlg)
     enable_add = enable_add && !bus_full(&mfm_tracking, 2);
     enable_add = enable_add && !bus_full(&esdi_tracking, 2);
     enable_add = enable_add && !bus_full(&xta_tracking, 2);
-    enable_add = enable_add && !bus_full(&ide_tracking, 8);
+    enable_add = enable_add && !bus_full(&ide_tracking, IDE_CHAN_MAX);
     for (i = 0; i < 2; i++)
         enable_add = enable_add && !bus_full(&(scsi_tracking[i]), 8);
 
@@ -3554,7 +3554,7 @@ win_settings_floppy_drives_recalc_list(HWND hdlg)
     lvI.mask      = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
     lvI.stateMask = lvI.state = 0;
 
-    for (i = 0; i < 4; i++) {
+    for (i = 0; i < FDD_NUM; i++) {
         lvI.iSubItem = 0;
         if (temp_fdd_types[i] > 0) {
             t = fdd_getname(temp_fdd_types[i]);
@@ -3600,7 +3600,7 @@ win_settings_cdrom_drives_recalc_list(HWND hdlg)
     lvI.mask      = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
     lvI.stateMask = lvI.iSubItem = lvI.state = 0;
 
-    for (i = 0; i < 4; i++) {
+    for (i = 0; i < CDROM_NUM; i++) {
         fsid = combo_id_to_format_string_id(temp_cdrom[i].bus_type);
 
         lvI.iSubItem = 0;
@@ -3947,13 +3947,13 @@ win_settings_zip_drives_init_columns(HWND hdlg)
 }
 
 static int
-get_selected_drive(HWND hdlg, int id)
+get_selected_drive(HWND hdlg, int id, int max)
 {
     int  drive = -1;
     int  i, j = 0;
     HWND h;
 
-    for (i = 0; i < 4; i++) {
+    for (i = 0; i < max; i++) {
         h = GetDlgItem(hdlg, id);
         j = ListView_GetItemState(h, i, LVIS_SELECTED);
         if (j)
@@ -4179,12 +4179,12 @@ cdrom_add_locations(HWND hdlg)
         settings_add_string(hdlg, IDC_COMBO_CD_SPEED, (LPARAM) lptsTemp);
     }
 
-    for (i = 0; i < 64; i++) {
+    for (i = 0; i < (SCSI_BUS_MAX * SCSI_ID_MAX); i++) {
         wsprintf(lptsTemp, plat_get_string(IDS_4135), i >> 4, i & 15);
         settings_add_string(hdlg, IDC_COMBO_CD_ID, (LPARAM) lptsTemp);
     }
 
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < (IDE_BUS_MAX * IDE_CHAN_MAX); i++) {
         wsprintf(lptsTemp, plat_get_string(IDS_4097), i >> 1, i & 1);
         settings_add_string(hdlg, IDC_COMBO_CD_CHANNEL_IDE, (LPARAM) lptsTemp);
     }
@@ -4245,12 +4245,12 @@ mo_add_locations(HWND hdlg)
             settings_add_string(hdlg, IDC_COMBO_MO_BUS, win_get_string(combo_id_to_string_id(i)));
     }
 
-    for (i = 0; i < 64; i++) {
+    for (i = 0; i < (SCSI_BUS_MAX * SCSI_ID_MAX); i++) {
         wsprintf(lptsTemp, plat_get_string(IDS_4135), i >> 4, i & 15);
         settings_add_string(hdlg, IDC_COMBO_MO_ID, (LPARAM) lptsTemp);
     }
 
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < (IDE_BUS_MAX * IDE_CHAN_MAX); i++) {
         wsprintf(lptsTemp, plat_get_string(IDS_4097), i >> 1, i & 1);
         settings_add_string(hdlg, IDC_COMBO_MO_CHANNEL_IDE, (LPARAM) lptsTemp);
     }
@@ -4322,12 +4322,12 @@ zip_add_locations(HWND hdlg)
             settings_add_string(hdlg, IDC_COMBO_ZIP_BUS, win_get_string(combo_id_to_string_id(i)));
     }
 
-    for (i = 0; i < 64; i++) {
+    for (i = 0; i < (SCSI_BUS_MAX * SCSI_LUN_MAX) ; i++) {
         wsprintf(lptsTemp, plat_get_string(IDS_4135), i >> 4, i & 15);
         settings_add_string(hdlg, IDC_COMBO_ZIP_ID, (LPARAM) lptsTemp);
     }
 
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < (IDE_BUS_MAX * IDE_CHAN_MAX); i++) {
         wsprintf(lptsTemp, plat_get_string(IDS_4097), i >> 1, i & 1);
         settings_add_string(hdlg, IDC_COMBO_ZIP_CHANNEL_IDE, (LPARAM) lptsTemp);
     }
@@ -4497,7 +4497,7 @@ win_settings_floppy_and_cdrom_drives_proc(HWND hdlg, UINT message, WPARAM wParam
 
             if ((((LPNMHDR) lParam)->code == LVN_ITEMCHANGED) && (((LPNMHDR) lParam)->idFrom == IDC_LIST_FLOPPY_DRIVES)) {
                 old_sel         = lv1_current_sel;
-                lv1_current_sel = get_selected_drive(hdlg, IDC_LIST_FLOPPY_DRIVES);
+                lv1_current_sel = get_selected_drive(hdlg, IDC_LIST_FLOPPY_DRIVES, FDD_NUM);
                 if (lv1_current_sel == old_sel)
                     return FALSE;
                 ignore_change = 1;
@@ -4507,7 +4507,7 @@ win_settings_floppy_and_cdrom_drives_proc(HWND hdlg, UINT message, WPARAM wParam
                 ignore_change = 0;
             } else if ((((LPNMHDR) lParam)->code == LVN_ITEMCHANGED) && (((LPNMHDR) lParam)->idFrom == IDC_LIST_CDROM_DRIVES)) {
                 old_sel         = lv2_current_sel;
-                lv2_current_sel = get_selected_drive(hdlg, IDC_LIST_CDROM_DRIVES);
+                lv2_current_sel = get_selected_drive(hdlg, IDC_LIST_CDROM_DRIVES, CDROM_NUM);
                 if (lv2_current_sel == old_sel)
                     return FALSE;
                 ignore_change = 1;
@@ -4684,7 +4684,7 @@ win_settings_other_removable_devices_proc(HWND hdlg, UINT message, WPARAM wParam
 
             if ((((LPNMHDR) lParam)->code == LVN_ITEMCHANGED) && (((LPNMHDR) lParam)->idFrom == IDC_LIST_MO_DRIVES)) {
                 old_sel         = lv1_current_sel;
-                lv1_current_sel = get_selected_drive(hdlg, IDC_LIST_MO_DRIVES);
+                lv1_current_sel = get_selected_drive(hdlg, IDC_LIST_MO_DRIVES, MO_NUM);
                 if (lv1_current_sel == old_sel)
                     return FALSE;
                 ignore_change = 1;
@@ -4707,7 +4707,7 @@ win_settings_other_removable_devices_proc(HWND hdlg, UINT message, WPARAM wParam
                 ignore_change = 0;
             } else if ((((LPNMHDR) lParam)->code == LVN_ITEMCHANGED) && (((LPNMHDR) lParam)->idFrom == IDC_LIST_ZIP_DRIVES)) {
                 old_sel         = lv2_current_sel;
-                lv2_current_sel = get_selected_drive(hdlg, IDC_LIST_ZIP_DRIVES);
+                lv2_current_sel = get_selected_drive(hdlg, IDC_LIST_ZIP_DRIVES, ZIP_NUM);
                 if (lv2_current_sel == old_sel)
                     return FALSE;
                 ignore_change = 1;
diff --git a/src/win/win_ui.c b/src/win/win_ui.c
index 4342626a4..96ad662bd 100644
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -1491,13 +1491,15 @@ plat_pause(int p)
     }
 
     if (p) {
+	if (mouse_capture)
+		plat_mouse_capture(0);
+
         wcsncpy(oldtitle, ui_window_title(NULL), sizeof_w(oldtitle) - 1);
         wcscpy(title, oldtitle);
         wcscat(title, plat_get_string(IDS_2051));
         ui_window_title(title);
-    } else {
+    } else
         ui_window_title(oldtitle);
-    }
 
     /* If un-pausing, synchronize the internal clock with the host's time. */
     if ((p == 0) && (time_sync & TIME_SYNC_ENABLED))
diff --git a/vcpkg.json b/vcpkg.json
index 2f70e4456..19dd09354 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,6 +1,6 @@
 {
     "name": "86box",
-    "version-string": "3.7",
+    "version-string": "3.7.1",
     "homepage": "https://86box.net/",
     "documentation": "http://86box.readthedocs.io/",
     "license": "GPL-2.0-or-later",