From 3c4e8c9e4a017dbad54ed206c5eae1dafa1f5540 Mon Sep 17 00:00:00 2001
From: Akamaki <97360908+akmed772@users.noreply.github.com>
Date: Mon, 24 Mar 2025 19:46:16 +0900
Subject: [PATCH 01/59] PS55DA2: Fix screen size calculation

* Fix screen size calculation in recalctimings.
* Set the position of underscore by CRTC reg value.
* Optimize text drawing function
---
 src/video/vid_ps55da2.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/video/vid_ps55da2.c b/src/video/vid_ps55da2.c
index db2035717..81fb1601d 100644
--- a/src/video/vid_ps55da2.c
+++ b/src/video/vid_ps55da2.c
@@ -253,7 +253,7 @@
 #define LG_SET_RESET_2          0x10
 
 #ifndef RELEASE_BUILD
-// #define ENABLE_DA2_LOG 1
+#define ENABLE_DA2_LOG 1
 #endif
 
 #ifdef ENABLE_DA2_LOG
@@ -1850,12 +1850,13 @@ da2_render_text(da2_t *da2)
         int       fg, bg;
         uint32_t  chr_dbcs;
         int       chr_wide = 0;
+        int       colormode = ((da2->attrc[LV_PAS_STATUS_CNTRL] & 0x80) == 0x80);
         // da2_log("\nda2ma: %x, da2sc: %x\n", da2->ma, da2->sc);
         for (x = 0; x < da2->hdisp; x += 13) {
             chr  = da2->cram[(da2->ma) & DA2_MASK_CRAM];
             attr = da2->cram[(da2->ma + 1) & DA2_MASK_CRAM];
             // if(chr!=0x20) da2_log("chr: %x, attr: %x    ", chr, attr);
-            if (da2->attrc[LV_PAS_STATUS_CNTRL] & 0x80) /* IO 3E8h, Index 1Dh */
+            if (colormode) /* IO 3E8h, Index 1Dh */
             {                                           /* --Parse attribute byte in color mode-- */
                 bg = 0;                                 /* bg color is always black (the only way to change background color is programming PAL) */
                 fg = getPS55ForeColor(attr, da2);
@@ -1932,24 +1933,24 @@ da2_render_text(da2_t *da2)
                 chr_wide = 0;
             }
             /* Line 28 (Underscore) Note: Draw this first to display blink + vertical + underline correctly. */
-            if (da2->sc == 27 && attr & 0x40 && ~da2->attrc[LV_PAS_STATUS_CNTRL] & 0x80) { /* Underscore only in monochrome mode */
+            if (da2->sc == da2->crtc[LC_UNDERLINE_LOCATION] && attr & 0x40 && !colormode) { /* Underscore only in monochrome mode */
                 for (uint32_t n = 0; n < 13; n++)
                     p[n] = da2->pallook[da2->egapal[fg]]; /* under line (white) */
             }
             /* Column 1 (Vertical Line) */
             if (attr & 0x10) {
-                p[0] = da2->pallook[da2->egapal[(da2->attrc[LV_PAS_STATUS_CNTRL] & 0x80) ? IRGBtoBGRI(da2->attrc[LV_GRID_COLOR_0]) : 2]]; /* vertical line (white) */
+                p[0] = da2->pallook[da2->egapal[(colormode) ? IRGBtoBGRI(da2->attrc[LV_GRID_COLOR_0]) : 2]]; /* vertical line (white) */
             }
             if (da2->sc == 0 && attr & 0x20 && ~da2->attrc[LV_PAS_STATUS_CNTRL]) { /* HGrid */
                 for (uint32_t n = 0; n < 13; n++)
-                    p[n] = da2->pallook[da2->egapal[(da2->attrc[LV_PAS_STATUS_CNTRL] & 0x80) ? IRGBtoBGRI(da2->attrc[LV_GRID_COLOR_0]) : 2]]; /* horizontal line (white) */
+                    p[n] = da2->pallook[da2->egapal[(colormode) ? IRGBtoBGRI(da2->attrc[LV_GRID_COLOR_0]) : 2]]; /* horizontal line (white) */
             }
             /* Drawing text cursor */
             drawcursor = ((da2->ma == da2->ca) && da2->con && da2->cursoron);
             if (drawcursor && da2->sc >= da2->crtc[LC_CURSOR_ROW_START] && da2->sc <= da2->crtc[LC_CURSOR_ROW_END]) {
                 int cursorwidth = (da2->crtc[LC_COMPATIBILITY] & 0x20 ? 26 : 13);
-                int cursorcolor = (da2->attrc[LV_PAS_STATUS_CNTRL] & 0x80) ? IRGBtoBGRI(da2->attrc[LV_CURSOR_COLOR]) : 2; /* Choose color 2 if mode 8 */
-                fg              = (da2->attrc[LV_PAS_STATUS_CNTRL] & 0x80) ? getPS55ForeColor(attr, da2) : ((attr & 0x08) ? 3 : 2);
+                int cursorcolor = (colormode) ? IRGBtoBGRI(da2->attrc[LV_CURSOR_COLOR]) : 2; /* Choose color 2 if mode 8 */
+                fg              = (colormode) ? getPS55ForeColor(attr, da2) : ((attr & 0x08) ? 3 : 2);
                 bg              = 0;
                 if (attr & 0x04) { /* Color 0 if reverse */
                     bg = fg;
@@ -2048,8 +2049,8 @@ da2_render_textm3(da2_t *da2)
             drawcursor = ((da2->ma == da2->ca) && da2->con && da2->cursoron);
             if (drawcursor && da2->sc >= da2->crtc[LC_CURSOR_ROW_START] && da2->sc <= da2->crtc[LC_CURSOR_ROW_END]) {
                 // int cursorwidth = (da2->crtc[0x1f] & 0x20 ? 26 : 13);
-                // int cursorcolor = (da2->attrc[LV_PAS_STATUS_CNTRL] & 0x80) ? IRGBtoBGRI(da2->attrc[0x1a]) : 2;/* Choose color 2 if mode 8 */
-                // fg = (da2->attrc[LV_PAS_STATUS_CNTRL] & 0x80) ? getPS55ForeColor(attr, da2) : (attr & 0x08) ? 3 : 2;
+                // int cursorcolor = (colormode) ? IRGBtoBGRI(da2->attrc[0x1a]) : 2;/* Choose color 2 if mode 8 */
+                // fg = (colormode) ? getPS55ForeColor(attr, da2) : (attr & 0x08) ? 3 : 2;
                 // bg = 0;
                 // if (attr & 0x04) {/* Color 0 if reverse */
                 //     bg = fg;
@@ -2217,10 +2218,10 @@ da2_recalctimings(da2_t *da2)
     da2->vblankstart = da2->crtc[LC_START_VERTICAL_BLANK] & 0xfff;
     da2->hdisp       = da2->crtc[LC_H_DISPLAY_ENABLE_END];
 
-    if (da2->crtc[LC_START_H_DISPLAY_ENAB] & 1) {
-        da2->hdisp--;
-        da2->dispend -= 29;
-    } 
+    da2->hdisp -= da2->crtc[LC_START_H_DISPLAY_ENAB];
+    /* In the J-DOS setup, you'll see the blank below the screen. It's NOT a bug. */
+    da2->dispend -= da2->crtc[LC_START_V_DISPLAY_ENAB];
+    da2->dispend++;
 
     da2->htotal = da2->crtc[LC_HORIZONTAL_TOTAL];
     da2->htotal += 1;

From abb0670eb06538ee7f836473fc28ebb9e6705920 Mon Sep 17 00:00:00 2001
From: Akamaki <97360908+akmed772@users.noreply.github.com>
Date: Mon, 24 Mar 2025 20:22:38 +0900
Subject: [PATCH 02/59] PS55DA2: remove unused code, update comment

---
 src/video/vid_ps55da2.c | 56 ++++++-----------------------------------
 1 file changed, 8 insertions(+), 48 deletions(-)

diff --git a/src/video/vid_ps55da2.c b/src/video/vid_ps55da2.c
index 81fb1601d..af8beddb9 100644
--- a/src/video/vid_ps55da2.c
+++ b/src/video/vid_ps55da2.c
@@ -11,7 +11,6 @@
  *   Notes: There are some known issues that should be corrected.
  *            - Incorrect foreground text color appears on an active window in OS/2 J1.3. 
  *            - Glitches some part of graphics on the Control Panel in OS/2 J2.1 beta. 
- *            - The screen resolution and blanking interval time maybe not correct.
  * 
  *          The code should be tested with following cases.
  *            - Execute MODE 0, 1, 3 and 4 commands in DOS K3.3 to test various video modes.
@@ -253,7 +252,7 @@
 #define LG_SET_RESET_2          0x10
 
 #ifndef RELEASE_BUILD
-#define ENABLE_DA2_LOG 1
+// #define ENABLE_DA2_LOG 1
 #endif
 
 #ifdef ENABLE_DA2_LOG
@@ -284,10 +283,8 @@ da2_log(const char *fmt, ...)
 #endif
 
 typedef struct da2_t {
-    // mem_mapping_t vmapping;
     mem_mapping_t cmapping;
 
-    // uint8_t crtcreg;
     uint8_t  ioctl[16];
     uint8_t  fctl[32];
     uint16_t crtc[128];
@@ -297,7 +294,6 @@ typedef struct da2_t {
     uint8_t  attrc[0x40];
     int      attraddr, attrff;
     int      attr_palette_enable;
-    // uint8_t seqregs[64];
     int outflipflop;
     int inflipflop;
     int iolatch;
@@ -312,7 +308,6 @@ typedef struct da2_t {
     uint32_t gdcla[8];
     uint32_t gdcinput[8];
     uint32_t gdcsrc[8];
-    uint32_t debug_vramold[8];
 
     uint8_t dac_mask, dac_status;
     int     dac_read, dac_write, dac_pos;
@@ -335,7 +330,7 @@ typedef struct da2_t {
     PALETTE  vgapal;
 
     int      vtotal, dispend, vsyncstart, split, vblankstart;
-    int      hdisp, hdisp_old, htotal, hdisp_time, rowoffset;
+    int      hdisp, htotal, hdisp_time, rowoffset;
     int      lowres, interlace;
     int      rowcount;
     double   clock;
@@ -2190,13 +2185,14 @@ da2_updatevidselector(da2_t *da2)
 /*
     INT 10h video modes supported in DOS J4.0 (The DA-2 doesn't have a video BIOS on its card.)
     Mode        Type    Colors  Text    Base Address    PELs        Render
-    3           A/N/K   16      80 x 25 B0000h/B8000h   1040 x 725  textm3
+    3           A/N/K   16      80 x 25 B0000h/B8000h   1040 x 754  textm3
     8           A/N/K   2       80 x 25 E0000h          1040 x 725  text
     Ah          APA     1       78 x 25 A0000h          1024 x 768  color_4bpp
     Dh          APA     16      78 x 25 A0000h          1024 x 768  color_4bpp
     Eh          A/N/K   16      80 x 25 E0000h          1040 x 725  text
     Fh          APA     256     NA      A0000h          1024 x 768  color_8bpp
     45h(undoc)  APA     16      NA      A0000h          1040 x 768  color_4bpp
+    46h(undoc)  APA     16      ?       A0000h          1040 x 768  color_4bpp
 */
 void
 da2_recalctimings(da2_t *da2)
@@ -2218,10 +2214,10 @@ da2_recalctimings(da2_t *da2)
     da2->vblankstart = da2->crtc[LC_START_VERTICAL_BLANK] & 0xfff;
     da2->hdisp       = da2->crtc[LC_H_DISPLAY_ENABLE_END];
 
+    /* In the video mode 3, you'll see a blank below the screen. It's NOT a bug. */
     da2->hdisp -= da2->crtc[LC_START_H_DISPLAY_ENAB];
-    /* In the J-DOS setup, you'll see the blank below the screen. It's NOT a bug. */
     da2->dispend -= da2->crtc[LC_START_V_DISPLAY_ENAB];
-    da2->dispend++;
+    da2->dispend += 1;
 
     da2->htotal = da2->crtc[LC_HORIZONTAL_TOTAL];
     da2->htotal += 1;
@@ -2247,15 +2243,14 @@ da2_recalctimings(da2_t *da2)
     if (!(da2->ioctl[LS_MODE] & 0x01)) {
         da2->hdisp *= 16;
         da2->char_width = 13;
-        da2->hdisp_old  = da2->hdisp;
         if (da2->crtc[LC_VIEWPORT_PRIORITY] & 0x80) {
             da2_log("Set videomode to PS/55 8 bpp graphics.\n");
             da2->render            = da2_render_color_8bpp;
             da2->vram_display_mask = DA2_MASK_A000;
         } else { /* PS/55 8-color */
             da2_log("Set videomode to PS/55 4 bpp graphics.\n");
-            da2->vram_display_mask = DA2_MASK_A000;
             da2->render            = da2_render_color_4bpp;
+            da2->vram_display_mask = DA2_MASK_A000;
         }
     } else {
         /* text mode */
@@ -2269,7 +2264,6 @@ da2_recalctimings(da2_t *da2)
             da2->vram_display_mask = DA2_MASK_CRAM;
         }
         da2->hdisp *= 13;
-        da2->hdisp_old  = da2->hdisp;
         da2->char_width = 13;
     }
     // if (!da2->scrblank && da2->attr_palette_enable)
@@ -2643,9 +2637,7 @@ da2_mmio_write(uint32_t addr, uint8_t val, void *p)
         da2->mmdbg_vidaddr = addr;
         //}
 #endif
-
         cycles -= video_timing_write_b;
-
         da2->changedvram[addr >> 9] = changeframecount;/* 0x1FFFF -> 0x1F */
         addr <<= 3;
 
@@ -2686,27 +2678,13 @@ da2_mmio_write(uint32_t addr, uint8_t val, void *p)
                             da2->gdcinput[i] = (da2->gdcreg[LG_SET_RESETJ] & (1 << i)) ? 0xff : 0;
                         else
                             da2->gdcinput[i] = val;
-
-                    // for (int i = 0; i < 8; i++)
-                    //     da2->debug_vramold[i] = da2->vram[addr | i]; /* use latch */
                     da2_gdcropB(addr, bitmask, da2);
-                    // for (int i = 0; i < 8; i++)
-                    //     da2_log("\tsrc %02x in %02x bitm %02x mod %x rop %x: %02x -> %02x\n", da2->gdcsrc[i], da2->gdcinput[i], bitmask, da2->gdcreg[5],da2->gdcreg[LG_COMMAND], da2->debug_vramold[i],  da2->vram[addr | i]);//use latch
-                    ////da2_log("- %02X %02X %02X %02X   %08X\n",vram[addr],vram[addr|0x1],vram[addr|0x2],vram[addr|0x3],addr);
                 }
                 break;
             case 1:/* equiv to vga write mode 2 */
-                // if (!(da2->gdcreg[LG_COMMAND] & 0x03) && (!da2->gdcreg[LG_ENABLE_SRJ])) {
-                //     for (int i = 0; i < 8; i++)
-                //         if (da2->planemask & (1 << i))
-                //             DA2_vram_w(addr | i, (((val & (1 << i)) ? 0xff : 0) & bitmask) | (da2->gdcsrc[i] & ~bitmask), da2);
-                //     //fprintf(da2->mmdbg_fp, "m1-1");
-                // } else {
                     for (int i = 0; i < 8; i++)
                         da2->gdcinput[i] = ((val & (1 << i)) ? 0xff : 0);
                     da2_gdcropB(addr, bitmask, da2);
-                    //fprintf(da2->mmdbg_fp, "m1-2");
-                // }
                 break;
             case 3:/* equiv to vga write mode 3 */
                 if (da2->gdcreg[LG_DATA_ROTATION] & 7)
@@ -2718,7 +2696,6 @@ da2_mmio_write(uint32_t addr, uint8_t val, void *p)
                 da2_gdcropB(addr, bitmask, da2);
                 break;
         }
-        // da2_log("%02x%02x%02x%02x\n", da2->vram[addr + 0], da2->vram[addr + 1], da2->vram[addr + 2], da2->vram[addr + 3]);
     } else { /*  mode 3h text */
         cycles -= video_timing_write_b;
         DA2_vram_w(addr, val, da2);
@@ -2742,8 +2719,7 @@ da2_mmio_gc_writeW(uint32_t addr, uint16_t val, void *p)
 #ifdef ENABLE_DA2_DEBUGVRAM
     da2_log("da2_wW %x %d %d %02x\n", addr,
     addr % (da2->rowoffset * 2) * 8, addr / (da2->rowoffset * 2), val);
-    // if (!(da2->gdcreg[LG_COMMAND] & 0x08))
-    //{
+
     if (((int) addr - (int) da2->mmdbg_vidaddr) > 2 || (((int) da2->mmdbg_vidaddr - (int) addr) > 2) || da2->mmdbg_vidaddr == addr) {
         fprintf(da2->mmdbg_fp, "\nW %x %x ", addr, val);
         for (int i = 0; i <= 0xb; i++)
@@ -2756,7 +2732,6 @@ da2_mmio_gc_writeW(uint32_t addr, uint16_t val, void *p)
         fprintf(da2->mmdbg_fp, "%X", pixeldata);
     }
     da2->mmdbg_vidaddr = addr;
-    //}
 #endif
     cycles -= video_timing_write_w;
 
@@ -2764,7 +2739,6 @@ da2_mmio_gc_writeW(uint32_t addr, uint16_t val, void *p)
     // da2_log("da2_gcW %05X %02X %04X:%04X esdi %04X:%04X dssi %04X:%04X\n", addr, val, cs >> 4, cpu_state.pc, ES, DI, DS, SI);
 
     da2->changedvram[addr >> 9]       = changeframecount;
-    // da2->changedvram[(addr + 1) >> 12] = changeframecount;
     addr <<= 3;
 
     for (int i = 0; i < 8; i++)
@@ -3025,9 +2999,6 @@ da2_poll(void *priv)
             da2->cgastat |= 8;
             x = da2->hdisp;
 
-            // if (da2->interlace && !da2->oddeven) da2->lastline++;
-            // if (da2->interlace && da2->oddeven) da2->firstline--;
-
             wx = x;
             wy = da2->lastline - da2->firstline;
 
@@ -3044,17 +3015,9 @@ da2_poll(void *priv)
             changeframecount = da2->interlace ? 3 : 2;
             da2->vslines     = 0;
 
-            // if (da2->interlace && da2->oddeven) da2->ma = da2->maback = da2->ma_latch + (da2->rowoffset << 1) + ((da2->crtc[5] & 0x60) >> 5);
-            // else                                  da2->ma = da2->maback = da2->ma_latch + ((da2->crtc[5] & 0x60) >> 5);
-            // da2->ca = ((da2->crtc[0xe] << 8) | da2->crtc[0xf]) + ((da2->crtc[0xb] & 0x60) >> 5) + da2->ca_adj;
-            /*            if (da2->interlace && da2->oddeven) da2->ma = da2->maback = da2->ma_latch;
-                        else*/
             da2->ma
                 = da2->maback = da2->ma_latch;
             da2->ca           = ((da2->crtc[LC_CURSOR_LOC_HIGH] << 8) | da2->crtc[LC_CURSOR_LOC_LOWJ]) + da2->ca_adj;
-
-            // da2->ma <<= 1;
-            // da2->maback <<= 1;
             da2->ca <<= 1;
 
             // da2_log("Addr %08X vson %03X vsoff %01X\n",da2->ma,da2->vsyncstart,da2->crtc[0x11]&0xF);
@@ -3071,9 +3034,6 @@ da2_poll(void *priv)
         if (da2->sc == (da2->crtc[LC_CURSOR_ROW_START] & 31))
             da2->con = 1;
     }
-    // printf("2 %i\n",da2_vsyncstart);
-    // da2_log("da2_poll %i %i %i %i %i  %i %i\n", ins, da2->dispofftime, da2->dispontime, da2->vidtime, cyc_total, da2->linepos, da2->vc);
-    // da2_log("r");
 }
 
 static void

From 209b29a2390e343a31fe2890fa9b4ef3616e3ad2 Mon Sep 17 00:00:00 2001
From: Akamaki <97360908+akmed772@users.noreply.github.com>
Date: Fri, 28 Mar 2025 00:55:33 +0900
Subject: [PATCH 03/59] PS55DA2: cleanup, change func scope

remove unused variables, change funcs declaration scope, reformat debug code
---
 src/video/vid_ps55da2.c | 172 +++++++++++++++++++---------------------
 1 file changed, 81 insertions(+), 91 deletions(-)

diff --git a/src/video/vid_ps55da2.c b/src/video/vid_ps55da2.c
index af8beddb9..158629226 100644
--- a/src/video/vid_ps55da2.c
+++ b/src/video/vid_ps55da2.c
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include <stdatomic.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/device.h>
@@ -40,7 +39,6 @@
 #include <86box/mca.h>
 #include <86box/rom.h>
 #include <86box/plat.h>
-#include <86box/thread.h>
 #include <86box/video.h>
 #include <86box/vid_ps55da2.h>
 #include <86box/vid_svga.h>
@@ -256,8 +254,9 @@
 #endif
 
 #ifdef ENABLE_DA2_LOG
+// #    define ENABLE_DA2_DEBUGIO 1
 // #    define ENABLE_DA2_DEBUGBLT 1
-#    define ENABLE_DA2_DEBUGVRAM 1
+// #    define ENABLE_DA2_DEBUGVRAM 1
 // #    define ENABLE_DA2_DEBUGFULLSCREEN 1
 // #    define ENABLE_DA2_DEBUGMONWAIT 1
 int da2_do_log = ENABLE_DA2_LOG;
@@ -276,6 +275,11 @@ da2_log(const char *fmt, ...)
 #else
 #    define da2_log(fmt, ...)
 #endif
+#ifdef ENABLE_DA2_DEBUGIO
+#    define da2_iolog da2_log
+#else
+#    define da2_iolog(fmt, ...)
+#endif
 #ifdef ENABLE_DA2_DEBUGBLT
 #    define da2_bltlog da2_log
 #else
@@ -302,9 +306,6 @@ typedef struct da2_t {
     int fctladdr;
     int crtcaddr;
 
-    uint32_t decode_mask;
-    uint32_t vram_max;
-
     uint32_t gdcla[8];
     uint32_t gdcinput[8];
     uint32_t gdcsrc[8];
@@ -317,13 +318,8 @@ typedef struct da2_t {
 
     uint8_t plane_mask;
 
-    int fb_only;
-
-    int      fast;
-    uint8_t  colourcompare, colournocare;
-    int      readmode, writemode, readplane;
+    int      writemode, readplane;
     uint8_t  planemask;
-    uint32_t charseta, charsetb;
 
     uint8_t  egapal[16];
     uint32_t pallook[512];
@@ -357,13 +353,9 @@ typedef struct da2_t {
 
     /* Attribute Buffer E0000-E0FFFh (4 KB) */
     uint8_t *cram;
-    /* (cram size - 1) >> 3 = 0xFFF */
-    // uint32_t cram_display_mask;
     /* APA Buffer A0000-BFFFFh (128 KB) */
     uint8_t *vram;
-    /* xxh */
     uint8_t *changedvram;
-    /* (vram size - 1) >> 3 = 0x1FFFF */
     uint32_t vram_display_mask;
 
     int fullchange;
@@ -374,7 +366,6 @@ typedef struct da2_t {
       card should not attempt to display anything */
     int override;
 
-    /* end VGA compatible regs*/
     struct
     {
         int           enable;
@@ -431,13 +422,13 @@ typedef struct da2_t {
     int old_pos2;
 } da2_t;
 
-void        da2_recalctimings(da2_t *da2);
-static void da2_mmio_gc_writeW(uint32_t addr, uint16_t val, void *p);
-void        da2_bitblt_exec(void *p);
-void        da2_updatevidselector(da2_t *da2);
-void        da2_reset_ioctl(da2_t *da2);
-static void da2_reset(void *priv);
-uint16_t    rightRotate(uint16_t data, uint8_t count);
+static void     da2_recalctimings(da2_t *da2);
+static void     da2_mmio_gc_writeW(uint32_t addr, uint16_t val, void *p);
+static void     da2_bitblt_exec(void *p);
+static void     da2_updatevidselector(da2_t *da2);
+static void     da2_reset_ioctl(da2_t *da2);
+static void     da2_reset(void *priv);
+static uint16_t rightRotate(uint16_t data, uint8_t count);
 
 typedef union {
     uint32_t d;
@@ -449,7 +440,7 @@ typedef struct {
 } pixel32;
 
 /* safety read for internal functions */
-uint32_t
+static uint32_t
 DA2_vram_r(uint32_t addr, da2_t *da2)
 {
     if (addr & ~DA2_MASK_VRAM)
@@ -457,7 +448,7 @@ DA2_vram_r(uint32_t addr, da2_t *da2)
     return da2->vram[addr];
 }
 /* safety write for internal functions */
-void
+static void
 DA2_vram_w(uint32_t addr, uint8_t val, da2_t *da2)
 {
     if (addr & ~DA2_MASK_VRAM)
@@ -466,7 +457,7 @@ DA2_vram_w(uint32_t addr, uint8_t val, da2_t *da2)
     return;
 }
 /* write pixel data with rop (Note: bitmask must be in big endian) */
-void
+static void
 DA2_WritePlaneDataWithBitmask(uint32_t destaddr, const uint16_t mask, pixel32 *srcpx, da2_t *da2)
 {
     uint32_t writepx[8];
@@ -516,7 +507,7 @@ DA2_WritePlaneDataWithBitmask(uint32_t destaddr, const uint16_t mask, pixel32 *s
     }
 }
 
-void
+static void
 DA2_DrawColorWithBitmask(uint32_t destaddr, uint8_t color, uint16_t mask, da2_t *da2)
 {
     pixel32 srcpx;
@@ -554,7 +545,7 @@ Param   Desc
 33      Size W
 35      Size H
 */
-void
+static void
 DA2_CopyPlaneDataWithBitmask(uint32_t srcaddr, uint32_t destaddr, uint16_t mask, da2_t *da2)
 {
     pixel32 srcpx;
@@ -568,7 +559,7 @@ DA2_CopyPlaneDataWithBitmask(uint32_t srcaddr, uint32_t destaddr, uint16_t mask,
 
     DA2_WritePlaneDataWithBitmask(destaddr, mask, &srcpx, da2);
 }
-void
+static void
 DA2_PutcharWithBitmask(uint32_t srcaddr, uint32_t destaddr, uint16_t mask, da2_t *da2)
 {
     pixel32 srcpx;
@@ -655,7 +646,7 @@ IBMJtoSJIS(uint16_t knj)
     return knj;
 }
 #endif
-void
+static void
 da2_bitblt_load(da2_t *da2)
 {
     uint32_t value32;
@@ -892,7 +883,7 @@ da2_bitblt_load(da2_t *da2)
         }
     }
 }
-void
+static void
 da2_bitblt_exec(void *p)
 {
     da2_t *da2 = (da2_t *) p;
@@ -1099,7 +1090,7 @@ da2_bitblt_exec(void *p)
             break;
     }
 }
-void
+static void
 da2_bitblt_dopayload(void *priv)
 {
     da2_t *da2 = (da2_t *) priv;
@@ -1116,7 +1107,7 @@ da2_bitblt_dopayload(void *priv)
     }
 }
 
-void
+static void
 da2_out(uint16_t addr, uint16_t val, void *p)
 {
     da2_t *da2 = (da2_t *) p;
@@ -1142,7 +1133,7 @@ da2_out(uint16_t addr, uint16_t val, void *p)
             da2->dac_pos   = 0;
             break;
         case 0x3C9: /* Data */
-            // da2_log("DA2 Out addr %03X idx %d:%d val %02X %04X:%04X esdi %04X:%04X\n", addr, da2->dac_write, da2->dac_pos, val, cs >> 4, cpu_state.pc, ES, DI);
+            // da2_iolog("DA2 Out addr %03X idx %d:%d val %02X %04X:%04X esdi %04X:%04X\n", addr, da2->dac_write, da2->dac_pos, val, cs >> 4, cpu_state.pc, ES, DI);
             da2->dac_status = 0;
             da2->fullchange = changeframecount;
             switch (da2->dac_pos) {
@@ -1171,11 +1162,11 @@ da2_out(uint16_t addr, uint16_t val, void *p)
             da2->ioctladdr = val;
             break;
         case LS_DATA:
-            // da2_log("DA2 Out addr %03X idx %02X val %02X %04X:%04X\n", addr, da2->ioctladdr, val, cs >> 4, cpu_state.pc);
+            // da2_iolog("DA2 Out addr %03X idx %02X val %02X %04X:%04X\n", addr, da2->ioctladdr, val, cs >> 4, cpu_state.pc);
             if (da2->ioctladdr > 0xf)
                 return;
             if (da2->ioctl[da2->ioctladdr & 15] != val)
-                da2_log("ioctl changed %x: %x -> %x  %04X:%04X\n", da2->ioctladdr & 15, da2->ioctl[da2->ioctladdr & 15], val, cs >> 4, cpu_state.pc);
+                da2_iolog("ioctl changed %x: %x -> %x  %04X:%04X\n", da2->ioctladdr & 15, da2->ioctl[da2->ioctladdr & 15], val, cs >> 4, cpu_state.pc);
             oldval                     = da2->ioctl[da2->ioctladdr];
             da2->ioctl[da2->ioctladdr] = val;
             if (oldval != val) {
@@ -1192,15 +1183,15 @@ da2_out(uint16_t addr, uint16_t val, void *p)
             da2->fctladdr = val;
             break;
         case LF_DATA:
-            // da2_log("DA2 Out addr %03X idx %02X val %02X %04X:%04X\n", addr, da2->fctladdr, val, cs >> 4, cpu_state.pc);
+            // da2_iolog("DA2 Out addr %03X idx %02X val %02X %04X:%04X\n", addr, da2->fctladdr, val, cs >> 4, cpu_state.pc);
             if (da2->fctladdr > 0x1f)
                 return;
             if (da2->fctl[da2->fctladdr & 0x1f] != val)
-                da2_log("fctl changed %x: %x -> %x  %04X:%04X\n", da2->fctladdr & 0x1f, da2->fctl[da2->fctladdr & 0x1f], val, cs >> 4, cpu_state.pc);
+                da2_iolog("fctl changed %x: %x -> %x  %04X:%04X\n", da2->fctladdr & 0x1f, da2->fctl[da2->fctladdr & 0x1f], val, cs >> 4, cpu_state.pc);
             oldval                   = da2->fctl[da2->fctladdr];
             da2->fctl[da2->fctladdr] = val;
             if (da2->fctladdr == 0 && oldval != val) {
-                da2_log("DA2 Out FCTL addr %03X idx %02X val %02X %04X:%04X\n", addr, da2->fctladdr, val, cs >> 4, cpu_state.pc);
+                da2_iolog("DA2 Out FCTL addr %03X idx %02X val %02X %04X:%04X\n", addr, da2->fctladdr, val, cs >> 4, cpu_state.pc);
             }
             break;
         case LC_INDEX:
@@ -1210,7 +1201,7 @@ da2_out(uint16_t addr, uint16_t val, void *p)
             if (da2->crtcaddr > 0x1f)
                 return;
             if (!(da2->crtcaddr == LC_CURSOR_LOC_HIGH || da2->crtcaddr == LC_CURSOR_LOC_LOWJ))
-                da2_log("DA2 Out addr %03X idx %02X val %02X %04X:%04X\n", addr, da2->crtcaddr, val, cs >> 4, cpu_state.pc);
+                da2_iolog("DA2 Out addr %03X idx %02X val %02X %04X:%04X\n", addr, da2->crtcaddr, val, cs >> 4, cpu_state.pc);
             if (!(da2->crtc[da2->crtcaddr] ^ val))
                 return;
             switch (da2->crtcaddr) {
@@ -1261,7 +1252,7 @@ da2_out(uint16_t addr, uint16_t val, void *p)
             }
             break;
         case LV_PORT:
-            // da2_log("DA2 Out addr %03X val %02X ff %d %04X:%04X\n", addr, val, da2->attrff,cs >> 4, cpu_state.pc);
+            // da2_iolog("DA2 Out addr %03X val %02X ff %d %04X:%04X\n", addr, val, da2->attrff,cs >> 4, cpu_state.pc);
             if (!da2->attrff) {
                 // da2->attraddr = val & 31;
                 da2->attraddr = val & 0x3f;
@@ -1270,14 +1261,14 @@ da2_out(uint16_t addr, uint16_t val, void *p)
                     da2->attr_palette_enable = val & 0x20;
                     da2_recalctimings(da2);
                 }
-                // da2_log("set attraddr: %X\n", da2->attraddr);
+                // da2_iolog("set attraddr: %X\n", da2->attraddr);
             } else {
                 if ((da2->attraddr == LV_PANNING) && (da2->attrc[LV_PANNING] != val))
                     da2->fullchange = changeframecount;
                 if (da2->attrc[da2->attraddr & 0x3f] != val)
-                    da2_log("attr changed %x: %x -> %x\n", da2->attraddr & 0x3f, da2->attrc[da2->attraddr & 0x3f], val);
+                    da2_iolog("attr changed %x: %x -> %x\n", da2->attraddr & 0x3f, da2->attrc[da2->attraddr & 0x3f], val);
                 da2->attrc[da2->attraddr & 0x3f] = val;
-                // da2_log("set attrc %x: %x\n", da2->attraddr & 31, val);
+                // da2_iolog("set attrc %x: %x\n", da2->attraddr & 31, val);
                 if (da2->attraddr < 16)
                     da2->fullchange = changeframecount;
                 if (da2->attraddr == LV_MODE_CONTROL || da2->attraddr < 0x10) {
@@ -1325,12 +1316,12 @@ da2_out(uint16_t addr, uint16_t val, void *p)
             da2->attrc[da2->attraddr & 0x3f] = val;
             break;
         case LG_INDEX:
-            da2_log("DA2 Out addr %03X val %02X\n", addr, val);
+            da2_iolog("DA2 Out addr %03X val %02X\n", addr, val);
             da2->gdcaddr = val;
             break;
         case LG_DATA:
-        // if(da2->gdcaddr != 8 && da2->gdcaddr != 9) da2_log("DA2 GCOut idx %X val %02X %04X:%04X esdi %04X:%04X\n", da2->gdcaddr, val, cs >> 4, cpu_state.pc, ES, DI);
-            da2_log("DA2 Out addr %03X idx %02X val %02X\n", addr, da2->gdcaddr, val);
+        // if(da2->gdcaddr != 8 && da2->gdcaddr != 9) da2_iolog("DA2 GCOut idx %X val %02X %04X:%04X esdi %04X:%04X\n", da2->gdcaddr, val, cs >> 4, cpu_state.pc, ES, DI);
+            da2_iolog("DA2 Out addr %03X idx %02X val %02X\n", addr, da2->gdcaddr, val);
             da2->gdcreg[da2->gdcaddr & 0x0f] = val & 0xff;
             switch (da2->gdcaddr & 0x1f) {
                 case LG_READ_MAP_SELECT:
@@ -1350,7 +1341,7 @@ da2_out(uint16_t addr, uint16_t val, void *p)
                 case LG_COMMAND:
                     break;
                 case LG_SET_RESET_2:
-                    da2_log("!!!DA2 GC Out addr %03X idx 10 val %02X\n", addr, val);
+                    da2_iolog("!!!DA2 GC Out addr %03X idx 10 val %02X\n", addr, val);
                     return;
             }
             break;
@@ -1358,12 +1349,12 @@ da2_out(uint16_t addr, uint16_t val, void *p)
         //     da2->gdcreg[5] = val & 0xff;
         //     break;
         default:
-            da2_log("DA2? Out addr %03X val %02X\n", addr, val);
+            da2_iolog("DA2? Out addr %03X val %02X\n", addr, val);
             break;
     }
 }
 
-uint16_t
+static uint16_t
 da2_in(uint16_t addr, void *p)
 {
     da2_t   *da2  = (da2_t *) p;
@@ -1431,17 +1422,17 @@ da2_in(uint16_t addr, void *p)
                 // if (da2->bitblt.indata) /* for OS/2 J1.3 command prompt scrolling  */
                 //     da2_bitblt_dopayload(da2);
                 if (da2->bitblt.exec != DA2_BLT_CIDLE) {
-                    // da2_log("exec:%x\n", da2->bitblt.exec);
+                    // da2_iolog("exec:%x\n", da2->bitblt.exec);
                     temp |= 0x01; /* wait (bit 3 + bit 0) ? need verify */
                     // if (!da2->bitblt.timer.enabled)
                     //{
-                    //     da2_log("bitblt timer restarted!! %04X:%04X\n", cs >> 4, cpu_state.pc);
+                    //     da2_iolog("bitblt timer restarted!! %04X:%04X\n", cs >> 4, cpu_state.pc);
                     //     timer_advance_u64(&da2->bitblt.timer, da2->bitblt.timerspeed);
                     // }
                 }
                 if (da2->bitblt.indata) temp |= 0x08;
 #ifdef ENABLE_DA2_DEBUGMONWAIT
-                da2_log("DA2 In %04X(%02X) %04X %04X:%04X\n", addr, da2->ioctladdr, temp, cs >> 4, cpu_state.pc);
+                da2_iolog("DA2 In %04X(%02X) %04X %04X:%04X\n", addr, da2->ioctladdr, temp, cs >> 4, cpu_state.pc);
 #endif
             }
             break;
@@ -1474,7 +1465,7 @@ da2_in(uint16_t addr, void *p)
                 temp = da2->cgastat;
             } else
                 temp = da2->attrc[da2->attraddr];
-            // da2_log("DA2 In %04X(%02X) %04X %04X:%04X\n", addr, da2->attraddr, temp, cs >> 4, cpu_state.pc);
+            // da2_iolog("DA2 In %04X(%02X) %04X %04X:%04X\n", addr, da2->attraddr, temp, cs >> 4, cpu_state.pc);
             da2->attrff = 0; /* reset flipflop (VGA does not reset flipflop) */
             break;
         case LG_INDEX:
@@ -1482,10 +1473,10 @@ da2_in(uint16_t addr, void *p)
             break;
         case LG_DATA:
             temp = da2->gdcreg[da2->gdcaddr & 0x1f];
-            // da2_log("DA2 In %04X(%02X) %04X %04X:%04X\n", addr, da2->gdcaddr, temp, cs >> 4, cpu_state.pc);
+            // da2_iolog("DA2 In %04X(%02X) %04X %04X:%04X\n", addr, da2->gdcaddr, temp, cs >> 4, cpu_state.pc);
             break;
     }
-    // da2_log("DA2 In %04X %04X %04X:%04X\n", addr, temp, cs >> 4, cpu_state.pc);
+    // da2_iolog("DA2 In %04X %04X %04X:%04X\n", addr, temp, cs >> 4, cpu_state.pc);
     return temp;
 }
 /*
@@ -1499,11 +1490,11 @@ da2_in(uint16_t addr, void *p)
  * out b(idx), in b, in b(data)
  * out b(idx), in w(data)
  */
-void
+static void
 da2_outb(uint16_t addr, uint8_t val, void *p)
 {
     da2_t *da2 = (da2_t *) p;
-    // da2_log("DA2 Outb addr %03X val %02X %04X:%04X es:di=%x:%x ds:si=%x:%x\n", addr, val, cs >> 4, cpu_state.pc, ES, DI, DS, SI);
+    // da2_iolog("DA2 Outb addr %03X val %02X %04X:%04X es:di=%x:%x ds:si=%x:%x\n", addr, val, cs >> 4, cpu_state.pc, ES, DI, DS, SI);
     da2->inflipflop = 0;
     switch (addr) {
         case LS_DATA:
@@ -1533,7 +1524,7 @@ da2_outb(uint16_t addr, uint8_t val, void *p)
 void
 da2_outw(uint16_t addr, uint16_t val, void *p)
 {
-    da2_log("DA2 Outw addr %03X val %04X\n", addr, val);
+    da2_iolog("DA2 Outw addr %03X val %04X\n", addr, val);
     da2_t *da2      = (da2_t *) p;
     da2->inflipflop = 0;
     switch (addr) {
@@ -1553,8 +1544,8 @@ da2_outw(uint16_t addr, uint16_t val, void *p)
             da2->outflipflop = 0;
             break;
         case 0x3EC:
-            // da2_log("DA2 Outw addr %03X val %04X %04X:%04X\n", addr, val, cs >> 4, cpu_state.pc);
-            da2_log("  ");
+            // da2_iolog("DA2 Outw addr %03X val %04X %04X:%04X\n", addr, val, cs >> 4, cpu_state.pc);
+            da2_iolog("  ");
             // val = rightRotate(val, 8);
             // da2_out(LG_DATA, val, da2);
             da2_out(LG_DATA, val >> 8, da2);
@@ -1580,12 +1571,12 @@ da2_outw(uint16_t addr, uint16_t val, void *p)
             break;
         case AC_REG:
             /* no register is revealed */
-            da2_log("DA2 Outw addr %03X val %04X %04X:%04X\n", addr, val, cs >> 4, cpu_state.pc);
+            da2_iolog("DA2 Outw addr %03X val %04X %04X:%04X\n", addr, val, cs >> 4, cpu_state.pc);
             da2->reg3ee[val & 0x0f] = val >> 8;
             break;
     }
 }
-uint8_t
+static uint8_t
 da2_inb(uint16_t addr, void *p)
 {
     uint8_t temp;
@@ -1615,10 +1606,10 @@ da2_inb(uint16_t addr, void *p)
             da2->inflipflop = 0;
             break;
     }
-    // da2_log("DA2 Inb %04X %02X %04X:%04X\n", addr, temp, cs >> 4, cpu_state.pc);
+    // da2_iolog("DA2 Inb %04X %02X %04X:%04X\n", addr, temp, cs >> 4, cpu_state.pc);
     return temp;
 }
-uint16_t
+static uint16_t
 da2_inw(uint16_t addr, void *p)
 {
     uint16_t temp;
@@ -1626,11 +1617,11 @@ da2_inw(uint16_t addr, void *p)
     da2->inflipflop  = 0;
     da2->outflipflop = 0;
     temp = da2_in(addr, da2);
-    da2_log("DA2 Inw addr %03X val %04X\n", addr, temp);
+    da2_iolog("DA2 Inw addr %03X val %04X\n", addr, temp);
     return temp;
 }
 /* IO 03DAh : Input Status Register 2 for DOSSHELL used by DOS J4.0 */
-uint8_t
+static uint8_t
 da2_in_ISR(uint16_t addr, void *p)
 {
     da2_t  *da2  = (da2_t *) p;
@@ -1642,15 +1633,15 @@ da2_in_ISR(uint16_t addr, void *p)
             da2->cgastat ^= 0x30;
         temp = da2->cgastat;
     }
-    // da2_log("DA2D In %04X %04X %04X:%04X\n", addr, temp, cs >> 4, cpu_state.pc);
+    // da2_iolog("DA2D In %04X %04X %04X:%04X\n", addr, temp, cs >> 4, cpu_state.pc);
     return temp;
 }
 
-void
+static void
 da2_out_ISR(uint16_t addr, uint8_t val, void *p)
 {
     // da2_t* da2 = (da2_t*)p;
-    da2_log("DA2D Out %04X %04X %04X:%04X\n", addr, val, cs >> 4, cpu_state.pc);
+    da2_iolog("DA2D Out %04X %04X %04X:%04X\n", addr, val, cs >> 4, cpu_state.pc);
 }
 
 /*
@@ -1754,7 +1745,7 @@ The Font ROM can be accessed via 128 KB memory window located at A0000-BFFFFh.
 */
 
 /* Get character line pattern from jfont rom or gaiji volatile memory */
-uint32_t
+static uint32_t
 getfont_ps55dbcs(int32_t code, int32_t line, void *p)
 {
     da2_t   *da2   = (da2_t *) p;
@@ -1792,14 +1783,14 @@ getfont_ps55dbcs(int32_t code, int32_t line, void *p)
 }
 
 /* Reverse the bit order of attribute code IRGB to BGRI(used in Mode 3 and Cursor Color) */
-uint8_t
+static int8_t
 IRGBtoBGRI(uint8_t attr)
 {
     attr = ((attr & 0x01) << 7) | ((attr & 0x02) << 5) | ((attr & 0x04) << 3) | ((attr & 0x08) << 1);
     return attr >>= 4;
 }
 /* Get the foreground color from the attribute byte */
-uint8_t
+static uint8_t
 getPS55ForeColor(uint8_t attr, da2_t *da2)
 {
     uint8_t foreground = ~attr & 0x08; /* 0000 1000 */
@@ -1811,7 +1802,7 @@ getPS55ForeColor(uint8_t attr, da2_t *da2)
     return foreground;
 }
 
-void
+static void
 da2_render_blank(da2_t *da2)
 {
     int x, xx;
@@ -2062,7 +2053,7 @@ da2_render_textm3(da2_t *da2)
     }
 }
 
-void
+static void
 da2_render_color_4bpp(da2_t *da2)
 {
     int changed_offset = da2->ma >> 9;
@@ -2111,7 +2102,7 @@ da2_render_color_4bpp(da2_t *da2)
     }
 }
 
-void
+static void
 da2_render_color_8bpp(da2_t *da2)
 {
     int changed_offset = da2->ma >> 9;
@@ -2160,7 +2151,7 @@ da2_render_color_8bpp(da2_t *da2)
     }
 }
 
-void
+static void
 da2_updatevidselector_tick(void *priv)
 {
     da2_t *da2 = (da2_t *) priv;
@@ -2176,7 +2167,7 @@ da2_updatevidselector_tick(void *priv)
     }
 }
 
-void
+static void
 da2_updatevidselector(da2_t *da2)
 {
     timer_set_delay_u64(&da2->timer_vidupd, 100000ull * TIMER_USEC);
@@ -2194,7 +2185,7 @@ da2_updatevidselector(da2_t *da2)
     45h(undoc)  APA     16      NA      A0000h          1040 x 768  color_4bpp
     46h(undoc)  APA     16      ?       A0000h          1040 x 768  color_4bpp
 */
-void
+static void
 da2_recalctimings(da2_t *da2)
 {
     double crtcconst;
@@ -2298,8 +2289,7 @@ da2_recalctimings(da2_t *da2)
         da2->dispofftime = TIMER_USEC;
     da2_log("da2 horiz total %i display end %i vidclock %f\n", da2->crtc[0], da2->crtc[1], da2->clock);
     da2_log("da2 vert total %i display end %i max row %i vsync %i\n",da2->vtotal,da2->dispend,(da2->crtc[9]&31)+1,da2->vsyncstart);
-    da2_log("total %f on %i cycles off %i cycles frame %i sec %i\n",disptime*crtcconst,da2->dispontime,da2->dispofftime,(da2->dispontime+da2->dispofftime)*da2->vtotal,(da2->dispontime+da2->dispofftime)*da2->vtotal*70);
-
+    da2_log("da2 dispon %lu dispoff %lu on(us) %f off(us) %f\n",da2->dispontime, da2->dispofftime, (double)da2->dispontime / (double)cpuclock /  (double) (1ULL << 32) * 1000000.0, (double)da2->dispofftime / (double)cpuclock /  (double) (1ULL << 32) * 1000000.0);
     // da2_log("da2->render %08X\n", da2->render);
 }
 
@@ -2334,14 +2324,14 @@ da2_mapping_update(da2_t *da2)
     }
 }
 
-uint8_t
+static uint8_t
 da2_mca_read(int port, void *p)
 {
     da2_t *da2 = (da2_t *) p;
     return da2->pos_regs[port & 7];
 }
 
-void
+static void
 da2_mca_write(int port, uint8_t val, void *p)
 {
     da2_t *da2 = (da2_t *) p;
@@ -2702,7 +2692,7 @@ da2_mmio_write(uint32_t addr, uint8_t val, void *p)
         da2->fullchange = 2;
     }
 }
-uint16_t
+static uint16_t
 rightRotate(uint16_t data, uint8_t count)
 {
     return (data >> count) | (data << (sizeof(data) * 8 - count));
@@ -2875,7 +2865,7 @@ da2_code_readw(uint32_t addr, void *p)
     return da2_code_read(addr, da2) | (da2_code_read(addr + 1, da2) << 8);
 }
 
-void
+static void
 da2_doblit(int y1, int y2, int wx, int wy, da2_t *da2)
 {
     if (wx != xsize || wy != ysize) {
@@ -2894,7 +2884,7 @@ da2_doblit(int y1, int y2, int wx, int wy, da2_t *da2)
     video_bpp   = 8;
 }
 
-void
+static void
 da2_poll(void *priv)
 {
     da2_t *da2 = (da2_t *) priv;
@@ -3090,7 +3080,7 @@ static uint8_t ps55_palette_color[64][3] = {
     { 0x3F, 0x15, 0x15 },    { 0x3F, 0x15, 0x3F },    { 0x3F, 0x3F, 0x15 },    { 0x3F, 0x3F, 0x3F }
 };
 
-void
+static void
 da2_reset_ioctl(da2_t *da2)
 {
     da2->ioctl[LS_RESET] = 0x00;     /* Bit 0: Reset sequencer */
@@ -3204,7 +3194,7 @@ da2_available(void)
     return (rom_present(DA2_FONTROM_PATH_HANT) || rom_present(DA2_FONTROM_PATH_JPAN));
 }
 
-void
+static void
 da2_close(void *p)
 {
     da2_t *da2 = (da2_t *) p;
@@ -3292,7 +3282,7 @@ da2_close(void *p)
     free(da2);
 }
 
-void
+static void
 da2_speed_changed(void *p)
 {
     da2_t *da2    = (da2_t *) p;
@@ -3300,7 +3290,7 @@ da2_speed_changed(void *p)
     da2_recalctimings(da2);
 }
 
-void
+static void
 da2_force_redraw(void *p)
 {
     da2_t *da2      = (da2_t *) p;

From da855e02b4219bdda33325c0caa557ffc4ee2c99 Mon Sep 17 00:00:00 2001
From: Akamaki <97360908+akmed772@users.noreply.github.com>
Date: Fri, 28 Mar 2025 01:30:00 +0900
Subject: [PATCH 04/59] PS55DA2: Fix video switcher

Fix an issue that the screen is resized repeatedly when booting OS/2.
---
 src/video/vid_ps55da2.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/video/vid_ps55da2.c b/src/video/vid_ps55da2.c
index 158629226..98db5f9fa 100644
--- a/src/video/vid_ps55da2.c
+++ b/src/video/vid_ps55da2.c
@@ -1242,7 +1242,8 @@ da2_out(uint16_t addr, uint16_t val, void *p)
                 case LC_VERTICAL_SYNC_START:
                 case LC_V_DISPLAY_ENABLE_END:
                 case LC_START_VERTICAL_BLANK:
-                case LC_END_VERTICAL_BLANK:
+                case LC_START_H_DISPLAY_ENAB:
+                case LC_START_V_DISPLAY_ENAB:
                 case LC_VIEWPORT_PRIORITY:
                     da2->fullchange = changeframecount;
                     da2_recalctimings(da2);
@@ -2158,10 +2159,12 @@ da2_updatevidselector_tick(void *priv)
     if (da2->ioctl[LS_MODE] & 0x02) {
         /* VGA passthrough mode */
         da2->override = 1;
+        timer_disable(&da2->timer);
         svga_set_override(da2->mb_vga, 0);
         da2_log("DA2 selector: VGA\n");
     } else {
         svga_set_override(da2->mb_vga, 1);
+        timer_enable(&da2->timer);
         da2->override = 0;
         da2_log("DA2 selector: DA2\n");
     }
@@ -2310,12 +2313,10 @@ da2_mapping_update(da2_t *da2)
         io_sethandler(0x03d0, 0x000b, da2_in_ISR, NULL, NULL, da2_out_ISR, NULL, NULL, da2);
         mem_mapping_enable(&da2->cmapping);
         mem_mapping_enable(&da2->mmio.mapping);
-        timer_enable(&da2->timer);
         timer_enable(&da2->bitblt.timer);
     } else {
         da2_log("DA2 disable registers\n");
         timer_disable(&da2->bitblt.timer);
-        timer_disable(&da2->timer);
         mem_mapping_disable(&da2->cmapping);
         mem_mapping_disable(&da2->mmio.mapping);
         io_removehandler(0x03c0, 0x000a, da2_inb, da2_inw, NULL, da2_outb, da2_outw, NULL, da2);

From 93f3e9f339361dbdecc2fbc0a87c9b7c31e9dd97 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Thu, 27 Mar 2025 19:10:20 +0100
Subject: [PATCH 05/59] Keyboard: Actually reset everything in keyboard_init()
 and call it in pc_reset_hard_init() as well.

---
 src/device/keyboard.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/device/keyboard.c b/src/device/keyboard.c
index 58d5a4724..a00968cf7 100644
--- a/src/device/keyboard.c
+++ b/src/device/keyboard.c
@@ -113,7 +113,17 @@ static scconvtbl scconv55_8a[18 + 1] =
 void
 keyboard_init(void)
 {
+    num_lock    = 0;
+    caps_lock   = 0;
+    scroll_lock = 0;
+    shift       = 0;
+
     memset(recv_key, 0x00, sizeof(recv_key));
+    memset(recv_key_ui, 0x00, sizeof(recv_key));
+    memset(oldkey, 0x00, sizeof(recv_key));
+#if 0
+    memset(key_delay, 0x00, sizeof(recv_key));
+#endif
 
     keyboard_scan = 1;
     scan_table    = NULL;

From ffd00e4527f56f429b8c826343c0de08f166ef6b Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Thu, 27 Mar 2025 19:14:01 +0100
Subject: [PATCH 06/59] Forgot 86box.c.

---
 src/86box.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/86box.c b/src/86box.c
index dbf58a70e..2b6e1ba9f 100644
--- a/src/86box.c
+++ b/src/86box.c
@@ -1293,6 +1293,8 @@ pc_reset_hard_init(void)
      * modules that are.
      */
 
+    keyboard_init();
+
     /* Reset the IDE and SCSI presences */
     other_ide_present = other_scsi_present = 0;
 

From cec630fa756874bdf2ccc4a6fb3b733df2b4ad52 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Fri, 28 Mar 2025 03:26:28 +0100
Subject: [PATCH 07/59] JEGA: Use colors based on a photo of the real OKI
 IF386AX when the LCD is in use to tell it apart more easily, and reset all
 devices on port 65h reset, fixes Trantor SCSI BIOS not finding any devices
 after such a reset.

---
 src/video/vid_jega.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/video/vid_jega.c b/src/video/vid_jega.c
index 36cf04077..d8994916f 100644
--- a/src/video/vid_jega.c
+++ b/src/video/vid_jega.c
@@ -770,6 +770,8 @@ if386_p6x_read(uint16_t port, void *priv)
         Bit 4: Shutdown? (caused by POST rebooting and POWER OFF command in DOS 3.21)
         Bit 3: ?
 */
+static uint32_t lcd_cols[8] = { 0x001024, 0x747d8a, 0x8c96a4, 0xa0abbb,
+                                0xb1bece, 0xc0cee0, 0xceddf0, 0xdbebff };
 static void
 if386_p6x_write(uint16_t port, uint8_t val, void *priv)
 {
@@ -793,19 +795,31 @@ if386_p6x_write(uint16_t port, uint8_t val, void *priv)
             } else { /* Monochrome LCD */
                 for (int c = 0; c < 256; c++) {
                     int cval = 0;
+#ifdef SIMPLE_BW
                     if (c & 0x0f)
                         cval = ((c & 0x0e) * 0x10) + 0x1f;
                     pallook64[c] = makecol32(cval, cval, cval);
                     pallook16[c] = makecol32(cval, cval, cval);
+#else
+                    if (c & 0x3f) {
+                        cval = (c & 0x10) >> 2;
+                        cval |= (c & 0x06) >> 1;
+                    }
+                    pallook64[c] = lcd_cols[cval];
+                    cval = 0;
+                    if (c & 0x0f)
+                        cval = (c & 0x0e) >> 1;
+                    pallook16[c] = lcd_cols[cval];
+#endif
                 }
             }
             jega_recalctimings(jega);
         } else if (p65idx == 0x05) {
-            if (val & 0x10)
+            if (val & 0x10) {
                 /* Power off (instead this call hardware reset here) */
+                device_reset_all(DEVICE_ALL);
                 resetx86();
-                /* Actually, power off - we have a function for that! */
-                // plat_power_off();
+            }
         }
     }
     return;

From 8a8ed6004383dbe271f6b7db01c0d29baeaeec11 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Fri, 28 Mar 2025 03:29:11 +0100
Subject: [PATCH 08/59] EGA: Send monochrome attributes through the EGA palette
 lookup like the real hardware also does.

---
 src/video/vid_ega_render.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/video/vid_ega_render.c b/src/video/vid_ega_render.c
index dd393e4b6..261474742 100644
--- a/src/video/vid_ega_render.c
+++ b/src/video/vid_ega_render.c
@@ -181,6 +181,7 @@ ega_render_text(ega_t *ega)
                         p[xx] = ega->mdacols[attr][attrblink][1];
                     else
                         p[xx] = ega->mdacols[attr][attrblink][dat & (0x100 >> (xx >> dwshift))];
+                    p[xx] = ega->pallook[ega->egapal[p[xx] & 0x0f]];
                 } else
                     p[xx] = (dat & (0x100 >> (xx >> dwshift))) ? fg : bg;
             }
@@ -189,9 +190,6 @@ ega_render_text(ega_t *ega)
             p += charwidth;
         }
         ega->ma &= 0x3ffff;
-
-        if (monoattrs)
-            video_process_8(ega->hdisp + ega->scrollcache, ega->displine);
     }
 }
 

From 63222b70db1e8ad5f1d651d6dce8e6c3a511d50b Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Fri, 28 Mar 2025 06:16:05 +0100
Subject: [PATCH 09/59] Added the OKIVGA/H-2 (JVGA/H).

---
 src/include/86box/vid_ega.h  |   9 +-
 src/include/86box/vid_svga.h |   5 +
 src/include/86box/vid_vga.h  |  15 +-
 src/video/vid_ega.c          |   2 +-
 src/video/vid_jega.c         | 354 ++++++++++++++++++++++++-----------
 src/video/vid_svga.c         |   5 +-
 src/video/vid_table.c        |   1 +
 src/video/vid_vga.c          |  45 +++--
 8 files changed, 293 insertions(+), 143 deletions(-)

diff --git a/src/include/86box/vid_ega.h b/src/include/86box/vid_ega.h
index 5ac5c24e3..0e28820ff 100644
--- a/src/include/86box/vid_ega.h
+++ b/src/include/86box/vid_ega.h
@@ -144,10 +144,10 @@ typedef struct ega_t {
     uint32_t   (*remap_func)(struct ega_t *ega, uint32_t in_addr);
     void       (*render)(struct ega_t *svga);
 
-    /*If set then another device is driving the monitor output and the EGA
-      card should not attempt to display anything */
-      void (*render_override)(void *priv);
-      void *priv_parent;
+    /* If set then another device is driving the monitor output and the EGA
+      card should not attempt to display anything. */
+    void       (*render_override)(void *priv);
+    void *     priv_parent;
 } ega_t;
 #endif
 
@@ -159,6 +159,7 @@ extern const device_t atiega800p_device;
 extern const device_t iskra_ega_device;
 extern const device_t et2000_device;
 extern const device_t jega_device;
+extern const device_t jvga_device;
 #endif
 
 extern int update_overscan;
diff --git a/src/include/86box/vid_svga.h b/src/include/86box/vid_svga.h
index afff6e211..068774eac 100644
--- a/src/include/86box/vid_svga.h
+++ b/src/include/86box/vid_svga.h
@@ -310,6 +310,11 @@ typedef struct svga_t {
     void *  ext8514;
     void *  clock_gen8514;
     void *  xga;
+
+    /* If set then another device is driving the monitor output and the EGA
+      card should not attempt to display anything. */
+    void       (*render_override)(void *priv);
+    void *     priv_parent;
 } svga_t;
 
 extern void     ibm8514_set_poll(svga_t *svga);
diff --git a/src/include/86box/vid_vga.h b/src/include/86box/vid_vga.h
index 26b5a7f71..54a1d0690 100644
--- a/src/include/86box/vid_vga.h
+++ b/src/include/86box/vid_vga.h
@@ -25,14 +25,19 @@
 typedef struct vga_t {
     svga_t svga;
 
-    rom_t bios_rom;
+    rom_t  bios_rom;
 } vga_t;
 
-extern void vga_out(uint16_t addr, uint8_t val, void *priv);
+extern void    vga_out(uint16_t addr, uint8_t val, void *priv);
 extern uint8_t vga_in(uint16_t addr, void *priv);
 
-void vga_disable(void* p);
-void vga_enable(void* p);
-int vga_isenabled(void* p);
+extern void    vga_init(const device_t *info, vga_t *vga, int enabled);
+
+extern void    vga_disable(void* p);
+extern void    vga_enable(void* p);
+
+extern int     vga_isenabled(void* p);
+
+extern video_timings_t        timing_vga;
 
 #endif /*VIDEO_VGA_H*/
diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c
index 16a3552ad..17b3fb593 100644
--- a/src/video/vid_ega.c
+++ b/src/video/vid_ega.c
@@ -780,7 +780,7 @@ ega_poll(void *priv)
             ega->y_add *= ega->vres + 1;
             for (y = 0; y <= ega->vres; y++) {
                 /* Render scanline */
-                if(ega->render_override)
+                if (ega->render_override)
                     ega->render_override(ega->priv_parent);
                 else
                     ega->render(ega);
diff --git a/src/video/vid_jega.c b/src/video/vid_jega.c
index d8994916f..af20444dd 100644
--- a/src/video/vid_jega.c
+++ b/src/video/vid_jega.c
@@ -34,6 +34,8 @@
 #include <86box/device.h>
 #include <86box/video.h>
 #include <86box/vid_ega.h>
+#include <86box/vid_svga.h>
+#include <86box/vid_vga.h>
 
 /* JEGA internal registers */
 #define RPESL 0x09 /* End Scan Line */
@@ -63,6 +65,8 @@
 #define JEGA_PATH_BIOS     "roms/video/jega/JEGABIOS.BIN"
 #define JEGA_PATH_FONTDBCS "roms/video/jega/JPNZN16X.FNT"
 #define IF386_PATH_VBIOS   "roms/machines/if386sx/OKI_IF386SX_VBIOS.bin"
+#define JVGA_PATH_BIOS     "roms/video/jega/OKI_JVGT(AXVGAH)_BIOS_011993.BIN"
+#define JVGA_PATH_FONTDBCS "roms/video/jega/JWPCE.FNT"
 #define SBCS19_FILESIZE    (256 * 19 * 2) /* 8 x 19 x 256 chr x 2 pages */
 #define DBCS16_CHARS       0x2c10
 #define DBCS16_FILESIZE    (DBCS16_CHARS * 16 * 2)
@@ -96,29 +100,31 @@ jega_log(const char *fmt, ...)
 static video_timings_t timing_ega = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
 
 typedef struct jega_t {
-    rom_t    bios_rom;
-    ega_t    ega;
-    uint8_t  regs_index; /* 3D4/3D5 index B9-BF, D9-DF */
-    uint8_t  regs[0x31];
-    uint8_t egapal[16];
-    uint8_t attrregs[32];
-    uint8_t attraddr;
-    uint8_t attrff;
-    uint8_t attr_palette_enable;
+    rom_t     bios_rom;
+    ega_t     ega;
+    vga_t     vga;
+    uint8_t   regs_index; /* 3D4/3D5 index B9-BF, D9-DF */
+    uint8_t   regs[0x31];
+    uint8_t   egapal[16];
+    uint8_t   attrregs[32];
+    uint8_t   attraddr;
+    uint8_t   attrff;
+    uint8_t   attr_palette_enable;
     uint32_t *pallook;
-    int con;
-    int cursoron;
-    int cursorblink_disable;
-    int ca;
-    int      font_index;
-    int     sbcsbank_inv;
-    int     attr3_sbcsbank;
-    int     start_scan_lower;
-    int     start_scan_upper;
-    int     start_scan_count;
-    uint8_t *vram;
-    uint8_t  jfont_sbcs_19[SBCS19_FILESIZE]; /* 8 x 19 font */
-    uint8_t  jfont_dbcs_16[DBCS16_FILESIZE]; /* 16 x 16 font. Use dbcs_read/write to access it. */
+    int       is_vga;
+    int       con;
+    int       cursoron;
+    int       cursorblink_disable;
+    int       ca;
+    int       font_index;
+    int       sbcsbank_inv;
+    int       attr3_sbcsbank;
+    int       start_scan_lower;
+    int       start_scan_upper;
+    int       start_scan_count;
+    uint8_t * vram;
+    uint8_t   jfont_sbcs_19[SBCS19_FILESIZE]; /* 8 x 19 font */
+    uint8_t   jfont_dbcs_16[DBCS16_FILESIZE]; /* 16 x 16 font. Use dbcs_read/write to access it. */
 } jega_t;
 
 static void jega_recalctimings(void *priv);
@@ -127,16 +133,16 @@ static void jega_recalctimings(void *priv);
 #define FONTX_LEN_FN 8
 
 typedef struct {
-    char id[FONTX_LEN_ID];
-    char name[FONTX_LEN_FN];
-    unsigned char width;
-    unsigned char height;
-    unsigned char type;
+    char      id[FONTX_LEN_ID];
+    char      name[FONTX_LEN_FN];
+    uint8_t   width;
+    uint8_t   height;
+    uint8_t   type;
 } fontx_h;
 
 typedef struct {
-    uint16_t start;
-	uint16_t end;
+    uint16_t  start;
+    uint16_t  end;
 } fontx_tbl;
 
 extern uint32_t        pallook16[256];
@@ -147,22 +153,32 @@ static bool is_SJIS_2(uint8_t chr) { return (chr >= 0x40 && chr <= 0x7e) || (chr
 static uint16_t
 SJIS_to_SEQ(uint16_t sjis)
 {
-	uint32_t chr1 = (sjis >> 8) & 0xff;
-	uint32_t  chr2 = sjis & 0xff;
-	if (!is_SJIS_1(chr1) || !is_SJIS_2(chr2)) return INVALIDACCESS16;
-	chr1 -= 0x81;
-	if (chr1 > 0x5E) chr1 -= 0x40;
-	chr2 -= 0x40;
-	if (chr2 > 0x3F) chr2--;
-	chr1 *= 0xBC;
-	return (chr1 + chr2);
+    uint32_t chr1 = (sjis >> 8) & 0xff;
+    uint32_t  chr2 = sjis & 0xff;
+
+    if (!is_SJIS_1(chr1) || !is_SJIS_2(chr2))
+        return INVALIDACCESS16;
+
+    chr1 -= 0x81;
+
+    if (chr1 > 0x5e)
+        chr1 -= 0x40;
+
+    chr2 -= 0x40;
+
+    if (chr2 > 0x3f)
+        chr2--;
+
+    chr1 *= 0xbc;
+
+    return (chr1 + chr2);
 }
 
 static uint8_t
 dbcs_read(uint16_t sjis, int index, void *priv) {
     jega_t  *jega = (jega_t *) priv;
     int seq = SJIS_to_SEQ(sjis);
-    if (seq >= DBCS16_CHARS || index >= 32)
+    if ((seq >= DBCS16_CHARS) || (index >= 32))
         return INVALIDACCESS8;
     return jega->jfont_dbcs_16[seq * 32 + index];
 }
@@ -171,7 +187,7 @@ static void
 dbcs_write(uint16_t sjis, int index, uint8_t val, void *priv) {
     jega_t  *jega = (jega_t *) priv;
     int seq = SJIS_to_SEQ(sjis);
-    if (seq >= DBCS16_CHARS || index >= 32)
+    if ((seq >= DBCS16_CHARS) || (index >= 32))
         return;
     jega->jfont_dbcs_16[seq * 32 + index] = val;
 }
@@ -180,38 +196,81 @@ dbcs_write(uint16_t sjis, int index, uint8_t val, void *priv) {
 void
 jega_render_text(void *priv)
 {
-    jega_t *jega = (jega_t *) priv;
-    if (jega->ega.firstline_draw == 2000)
-        jega->ega.firstline_draw = jega->ega.displine;
-    jega->ega.lastline_draw = jega->ega.displine;
+    jega_t *  jega           = (jega_t *) priv;
+#ifdef USE_DOUBLE_WIDTH_AND_LINE_CHARS
+    uint8_t * seqregs        = jega->is_vga ? jega->vga.svga.seqregs :
+                                              jega->ega.seqregs;
+    uint8_t * attrregs       = jega->is_vga ? jega->vga.svga.attrregs :
+                                              jega->ega.attrregs;
+#endif
+    uint8_t * crtc           = jega->is_vga ? jega->vga.svga.crtc :
+                                              jega->ega.crtc;
+    uint8_t * vram           = jega->is_vga ? jega->vga.svga.vram :
+                                              jega->ega.vram;
+    int *     firstline_draw = jega->is_vga ? &jega->vga.svga.firstline_draw :
+                                              &jega->ega.firstline_draw;
+    int *     lastline_draw  = jega->is_vga ? &jega->vga.svga.lastline_draw :
+                                              &jega->ega.lastline_draw;
+    int *     displine       = jega->is_vga ? &jega->vga.svga.displine :
+                                              &jega->ega.displine;
+    int *     fullchange     = jega->is_vga ? &jega->vga.svga.fullchange :
+                                              &jega->ega.fullchange;
+    int *     blink          = jega->is_vga ? &jega->vga.svga.blink :
+                                              &jega->ega.blink;
+    int *     x_add          = jega->is_vga ? &jega->vga.svga.x_add :
+                                              &jega->ega.x_add;
+    int *     y_add          = jega->is_vga ? &jega->vga.svga.y_add :
+                                              &jega->ega.y_add;
+    int *     sc             = jega->is_vga ? &jega->vga.svga.sc :
+                                              &jega->ega.sc;
+    int *     hdisp          = jega->is_vga ? &jega->vga.svga.hdisp :
+                                              &jega->ega.hdisp;
+    int *     scrollcache    = jega->is_vga ? &jega->vga.svga.scrollcache :
+                                              &jega->ega.scrollcache;
+    uint32_t *ma             = jega->is_vga ? &jega->vga.svga.ma :
+                                              &jega->ega.ma;
+    uint8_t   mask           = jega->is_vga ? jega->vga.svga.dac_mask : 0xff;
 
-    if (jega->ega.fullchange) {
-        // const bool doublewidth   = ((jega->ega.seqregs[1] & 8) != 0);
-        const bool attrblink = ((jega->regs[RMOD2] & 0x20) == 0); /* JEGA specific */
-        // const bool attrlinechars = (jega->ega.attrregs[0x10] & 4);
-        const bool crtcreset = ((jega->ega.crtc[0x17] & 0x80) == 0) || ((jega->regs[RMOD1] & 0x80) == 0);
-        const int  charwidth = 8;
-        const bool blinked   = jega->ega.blink & 0x10;
-        uint32_t  *p         = &buffer32->line[jega->ega.displine + jega->ega.y_add][jega->ega.x_add];
-        bool       chr_wide  = false;
-        int        sc_wide   = jega->ega.sc - jega->start_scan_count;
-        const bool cursoron  = (blinked || jega->cursorblink_disable)
-            && (jega->ega.sc >= jega->regs[RCCSL]) && (jega->ega.sc <= jega->regs[RCCEL]);
-        uint32_t chr_first;
-        uint32_t attr_basic;
-        int      fg;
-        int      bg;
+    if (*firstline_draw == 2000)
+        *firstline_draw = *displine;
+    *lastline_draw = *displine;
 
-        for (int x = 0; x < (jega->ega.hdisp + jega->ega.scrollcache); x += charwidth) {
-            uint32_t addr = jega->ega.remap_func(&jega->ega, jega->ega.ma) & jega->ega.vrammask;
+    if (*fullchange) {
+#ifdef USE_DOUBLE_WIDTH_AND_LINE_CHARS
+        const bool doublewidth   = ((seqregs[1] & 8) != 0);
+        const bool attrlinechars = (attrregs[0x10] & 4);
+#endif
+        const bool attrblink     = ((jega->regs[RMOD2] & 0x20) == 0); /* JEGA specific */
+        const bool crtcreset     = ((crtc[0x17] & 0x80) == 0) || ((jega->regs[RMOD1] & 0x80) == 0);
+        const int  charwidth     = 8;
+        const bool blinked       = *blink & 0x10;
+        uint32_t  *p             = &buffer32->line[*displine + *y_add][*x_add];
+        bool       chr_wide      = false;
+        int        sc_wide       = *sc - jega->start_scan_count;
+        const bool cursoron      = (blinked || jega->cursorblink_disable) &&
+                                   (*sc >= jega->regs[RCCSL]) && (*sc <= jega->regs[RCCEL]);
+        uint32_t   chr_first;
+        uint32_t   attr_basic;
+        int        fg;
+        int        bg;
 
-            int drawcursor = ((jega->ega.ma == jega->ca) && cursoron);
+        for (int x = 0; x < (*hdisp + *scrollcache); x += charwidth) {
+            uint32_t addr = 0;
+
+            if (jega->is_vga) {
+                if (!jega->vga.svga.force_old_addr)
+                    addr = jega->vga.svga.remap_func(&jega->vga.svga, jega->vga.svga.ma) &
+                                                     jega->vga.svga.vram_display_mask;
+            } else
+                addr = jega->ega.remap_func(&jega->ega, *ma) & jega->ega.vrammask;
+
+            int drawcursor = ((*ma == jega->ca) && cursoron);
 
             uint32_t chr;
             uint32_t attr;
             if (!crtcreset) {
-                chr  = jega->ega.vram[addr];
-                attr = jega->ega.vram[addr + 1];
+                chr  = vram[addr];
+                attr = vram[addr + 1];
             } else
                 chr = attr = 0;
             if (chr_wide) {
@@ -222,13 +281,13 @@ jega_render_text(void *priv)
                     /* Bold | 2x width | 2x height | U/L select | R/L select | - | - | - */
                     attr_ext = attr;
                     if ((attr_ext & 0x30) == 0x30)
-                        sc_wide = jega->ega.sc - jega->start_scan_lower; /* Set top padding of lower 2x character */
+                        sc_wide = *sc - jega->start_scan_lower; /* Set top padding of lower 2x character */
                     else if ((attr_ext & 0x30) == 0x20)
-                        sc_wide = jega->ega.sc - jega->start_scan_upper; /* Set top padding of upper 2x character */
+                        sc_wide = *sc - jega->start_scan_upper; /* Set top padding of upper 2x character */
                     else
-                        sc_wide = jega->ega.sc - jega->start_scan_count;
+                        sc_wide = *sc - jega->start_scan_count;
                 }
-                if (is_SJIS_2(chr) && sc_wide >= 0 && sc_wide < 16 && jega->ega.sc <= jega->regs[RPESL]) {
+                if (is_SJIS_2(chr) && sc_wide >= 0 && sc_wide < 16 && *sc <= jega->regs[RPESL]) {
                     chr_first <<= 8;
                     chr |= chr_first;
                     /* Vertical wide font (Extended Attribute) */
@@ -269,7 +328,7 @@ jega_render_text(void *priv)
                 if (attr_basic & 0x20) { /* vertical line */
                     p[0] = fg;
                 }
-                if ((jega->ega.sc == jega->regs[RPULP]) && (attr_basic & 0x10)) { /* underline */
+                if ((*sc == jega->regs[RPULP]) && (attr_basic & 0x10)) { /* underline */
                     for (int xx = 0; xx < charwidth * 2; xx++)
                         p[xx] = fg;
                 }
@@ -298,13 +357,13 @@ jega_render_text(void *priv)
                     /* Parse attribute as EGA */
                     /* BInt/Blink | BR | BG | BB | Int/Group | R | G | B */
                     if (drawcursor) {
-                        bg = jega->pallook[jega->egapal[attr & 0x0f]];
-                        fg = jega->pallook[jega->egapal[attr >> 4]];
+                        bg = jega->pallook[jega->egapal[attr & 0x0f] & mask];
+                        fg = jega->pallook[jega->egapal[attr >> 4] & mask];
                     } else {
-                        fg = jega->pallook[jega->egapal[attr & 0x0f]];
-                        bg = jega->pallook[jega->egapal[attr >> 4]];
+                        fg = jega->pallook[jega->egapal[attr & 0x0f] & mask];
+                        bg = jega->pallook[jega->egapal[attr >> 4] & mask];
                         if ((attr & 0x80) && attrblink) {
-                            bg = jega->pallook[jega->egapal[(attr >> 4) & 7]];
+                            bg = jega->pallook[jega->egapal[(attr >> 4) & 7] & mask];
                             if (blinked)
                                 fg = bg;
                         }
@@ -325,32 +384,35 @@ jega_render_text(void *priv)
                     //     charaddr ^= 0x100;
                     charaddr *= 19;
 
-                    uint32_t dat = jega->jfont_sbcs_19[charaddr + jega->ega.sc];
+                    uint32_t dat = jega->jfont_sbcs_19[charaddr + *sc];
                     for (int xx = 0; xx < charwidth; xx++)
                         p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
 
                     if (attr_basic & 0x20) { /* vertical line */
                         p[0] = fg;
                     }
-                    if ((jega->ega.sc == jega->regs[RPULP]) && (attr_basic & 0x10)) { /* underline */
+                    if ((*sc == jega->regs[RPULP]) && (attr_basic & 0x10)) { /* underline */
                         for (int xx = 0; xx < charwidth; xx++)
                             p[xx] = fg;
                     }
                     p += charwidth;
                 }
             }
-            jega->ega.ma += 4;
+            *ma += 4;
         }
-        jega->ega.ma &= 0x3ffff;
+        *ma &= 0x3ffff;
     }
 }
 
 static void
 jega_out(uint16_t addr, uint8_t val, void *priv)
 {
-    jega_t *jega = (jega_t *) priv;
-    uint16_t chr;
+    jega_t   *jega         = (jega_t *) priv;
+    uint8_t   pal4to16[16] = { 0, 7, 0x38, 0x3f, 0, 3, 4, 0x3f, 0, 2, 4, 0x3e, 0, 3, 5, 0x3f };
+    uint16_t  chr;
+
     // jega_log("JEGA Out %04X %02X(%d) %04X:%04X\n", addr, val, val, cs >> 4, cpu_state.pc);
+
     switch (addr) {
         case 0x3c0:
         case 0x3c1:
@@ -367,9 +429,19 @@ jega_out(uint16_t addr, uint8_t val, void *priv)
                 jega->attrregs[jega->attraddr & 31] = val;
                 if (jega->attraddr < 0x10) {
                     for (uint8_t c = 0; c < 16; c++) {
+                        if (!jega->is_vga)
                             jega->egapal[c] = jega->attrregs[c] & 0x3f;
+                        else if (jega->attrregs[0x10] & 0x80)
+                            jega->egapal[c] = (jega->attrregs[c] & 0xf) | ((jega->attrregs[0x14] & 0xf) << 4);
+                        else if (jega->vga.svga.ati_4color)
+                            jega->egapal[c] = pal4to16[(c & 0x03) | ((val >> 2) & 0xc)];
+                        else
+                            jega->egapal[c] = (jega->attrregs[c] & 0x3f) | ((jega->attrregs[0x14] & 0xc) << 4);
                     }
-                    jega->ega.fullchange = changeframecount;
+                    if (jega->is_vga)
+                        jega->vga.svga.fullchange = changeframecount;
+                    else
+                        jega->ega.fullchange = changeframecount;
                 }
             }
             jega->attrff ^= 1;
@@ -395,12 +467,17 @@ jega_out(uint16_t addr, uint8_t val, void *priv)
                 switch (jega->regs_index) {
                     case RMOD1:
                         /* if the value is changed */
-                        // if (jega->regs[jega->regs_index] != val) {
-                        if (val & 0x40)
-                            jega->ega.render_override = NULL;
-                        else
-                            jega->ega.render_override = jega_render_text;
-                        // }
+                        if (jega->is_vga) {
+                            if (val & 0x40)
+                                jega->vga.svga.render_override = NULL;
+                            else
+                                jega->vga.svga.render_override = jega_render_text;
+                        } else {
+                            if (val & 0x40)
+                                jega->ega.render_override = NULL;
+                            else
+                                jega->ega.render_override = jega_render_text;
+                        }
                         break;
                     case RDAGS:
                         switch (val & 0x03) {
@@ -470,8 +547,14 @@ jega_out(uint16_t addr, uint8_t val, void *priv)
         default:
             break;
     }
-    if (jega->regs[RMOD1] & 0x0C) /* Accessing to Slave EGA is redirected to Master in AX-1. */
-        ega_out(addr, val, &jega->ega);
+
+    /* Accessing to Slave EGA is redirected to Master in AX-1. */
+    if (jega->regs[RMOD1] & 0x0c) {
+        if (jega->is_vga)
+            vga_out(addr, val, &jega->vga);
+        else
+            ega_out(addr, val, &jega->ega);
+    }
 }
 
 static uint8_t
@@ -480,6 +563,7 @@ jega_in(uint16_t addr, void *priv)
     jega_t *jega = (jega_t *) priv;
     uint8_t ret  = INVALIDACCESS8;
     uint16_t chr;
+
     switch (addr) {
         case 0x3b5:
         case 0x3d5:
@@ -515,8 +599,13 @@ jega_in(uint16_t addr, void *priv)
         case 0x3da:
             jega->attrff = 0;
         default:
-            if (jega->regs[RMOD1] & 0x0C) /* Accessing to Slave is redirected to Master in AX-1. */
-                ret = ega_in(addr, &jega->ega);
+            /* Accessing to Slave is redirected to Master in AX-1. */
+            if (jega->regs[RMOD1] & 0x0c) {
+                if (jega->is_vga)
+                    ret = vga_in(addr, &jega->vga);
+                else
+                    ret = ega_in(addr, &jega->ega);
+            }
             break;
     }
     // jega_log("JEGA In %04X(%02X) %02X %04X:%04X\n", addr, jega->regs_index, ret, cs >> 4, cpu_state.pc);
@@ -619,19 +708,29 @@ LoadFontxFile(const char *fn, void *priv)
 }
 
 static void
-jega_commoninit(void *priv)
+jega_commoninit(const device_t *info, void *priv, int vga)
 {
     jega_t *jega = (jega_t *) priv;
-    for (int c = 0; c < 256; c++) {
-        pallook64[c] = makecol32(((c >> 2) & 1) * 0xaa, ((c >> 1) & 1) * 0xaa, (c & 1) * 0xaa);
-        pallook64[c] += makecol32(((c >> 5) & 1) * 0x55, ((c >> 4) & 1) * 0x55, ((c >> 3) & 1) * 0x55);
+    jega->is_vga = vga;
+    if (vga) {
+        video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_vga);
+        vga_init(info, &jega->vga, 1);
+        jega->vga.svga.priv_parent = jega;
+        jega->pallook = jega->vga.svga.pallook;
+    } else {
+        for (int c = 0; c < 256; c++) {
+            pallook64[c] = makecol32(((c >> 2) & 1) * 0xaa, ((c >> 1) & 1) * 0xaa, (c & 1) * 0xaa);
+            pallook64[c] += makecol32(((c >> 5) & 1) * 0x55, ((c >> 4) & 1) * 0x55, ((c >> 3) & 1) * 0x55);
+        }
+        video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_ega);
+        jega->pallook = pallook64;
+        ega_init(&jega->ega, 9, 0);
+        ega_set_type(&jega->ega, EGA_SUPEREGA);
+        jega->ega.priv_parent = jega;
+        mem_mapping_add(&jega->ega.mapping, 0xa0000, 0x20000,
+                        ega_read, NULL, NULL, ega_write, NULL, NULL,
+                        NULL, MEM_MAPPING_EXTERNAL, &jega->ega);
     }
-    video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_ega);
-    jega->pallook = pallook64;
-    ega_init(&jega->ega, 9, 0);
-    ega_set_type(&jega->ega, EGA_SUPEREGA);
-    jega->ega.priv_parent = jega;
-    mem_mapping_add(&jega->ega.mapping, 0xa0000, 0x20000, ega_read, NULL, NULL, ega_write, NULL, NULL, NULL, MEM_MAPPING_EXTERNAL, &jega->ega);
     /* I/O 3DD and 3DE are used by Oki if386 */
     io_sethandler(0x03b0, 0x002c, jega_in, NULL, NULL, jega_out, NULL, NULL, jega);
     jega->regs[RMOD1] = 0x48;
@@ -646,7 +745,21 @@ jega_standalone_init(const device_t *info)
     memset(&jega->jfont_dbcs_16, 0, DBCS16_FILESIZE);
     LoadFontxFile(JEGA_PATH_FONTDBCS, jega);
 
-    jega_commoninit(jega);
+    jega_commoninit(info, jega, 0);
+
+    return jega;
+}
+
+static void *
+jvga_standalone_init(const device_t *info)
+{
+    jega_t *jega = calloc(1, sizeof(jega_t));
+
+    rom_init(&jega->bios_rom, JVGA_PATH_BIOS, 0xc0000, 0x8000, 0x7fff, 0, 0);
+    memset(&jega->jfont_dbcs_16, 0, DBCS16_FILESIZE);
+    LoadFontxFile(JVGA_PATH_FONTDBCS, jega);
+
+    jega_commoninit(info, jega, 1);
 
     return jega;
 }
@@ -693,9 +806,15 @@ jega_close(void *priv)
     }
     pclog("jeclosed %04X:%04X DS %04X\n", cs >> 4, cpu_state.pc, DS);
 #endif
-    if (jega->ega.eeprom)
-        free(jega->ega.eeprom);
-    free(jega->ega.vram);
+
+    if (jega->is_vga)
+        svga_close(&jega->vga.svga);
+    else {
+        if (jega->ega.eeprom)
+            free(jega->ega.eeprom);
+        free(jega->ega.vram);
+    }
+
     free(jega);
 }
 
@@ -703,8 +822,13 @@ static void
 jega_recalctimings(void *priv)
 {
     jega_t *jega = (jega_t *) priv;
-    ega_recalctimings(&jega->ega);
+
+    if (jega->is_vga)
+        svga_recalctimings(&jega->vga.svga);
+    else
+        ega_recalctimings(&jega->ega);
 }
+
 static void
 jega_speed_changed(void *priv)
 {
@@ -733,6 +857,20 @@ const device_t jega_device = {
     .config        = NULL
 };
 
+const device_t jvga_device = {
+    .name          = "OKIVGA/H-2 (JVGA/H)",
+    .internal_name = "jvga",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = jvga_standalone_init,
+    .close         = jega_close,
+    .reset         = NULL,
+    .available     = jega_standalone_available,
+    .speed_changed = jega_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
 static uint8_t p65idx = 0;
 // static uint8_t p3de_idx = 0;
 static uint8_t p65[6];
@@ -834,7 +972,7 @@ if386jega_init(const device_t *info)
     memset(&jega->jfont_dbcs_16, 0, DBCS16_FILESIZE);
     LoadFontxFile(JEGA_PATH_FONTDBCS, jega);
 
-    jega_commoninit(jega);
+    jega_commoninit(info, jega, 0);
 
     io_sethandler(0x0063, 1, if386_p6x_read, NULL, NULL, if386_p6x_write, NULL, NULL, jega);
     io_sethandler(0x0065, 1, if386_p6x_read, NULL, NULL, if386_p6x_write, NULL, NULL, jega);
diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index 1fd2460bd..c7a65120f 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -1174,7 +1174,10 @@ svga_do_render(svga_t *svga)
     }
 
     if (!svga->override) {
-        svga->render(svga);
+        if (svga->render_override)
+            svga->render_override(svga->priv_parent);
+        else
+            svga->render(svga);
 
         svga->x_add = (svga->monitor->mon_overscan_x >> 1);
         svga_render_overscan_left(svga);
diff --git a/src/video/vid_table.c b/src/video/vid_table.c
index be26d9e18..b90d7c3e4 100644
--- a/src/video/vid_table.c
+++ b/src/video/vid_table.c
@@ -96,6 +96,7 @@ video_cards[] = {
     { .device = &genius_device,                                 .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &nga_device,                                    .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &ogc_device,                                    .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &jvga_device,                                   .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &oti037c_device,                                .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &oti067_device,                                 .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &oti077_device,                                 .flags = VIDEO_FLAG_TYPE_NONE },
diff --git a/src/video/vid_vga.c b/src/video/vid_vga.c
index 97889e007..0a0fbd8e1 100644
--- a/src/video/vid_vga.c
+++ b/src/video/vid_vga.c
@@ -31,7 +31,8 @@
 #include <86box/vid_svga.h>
 #include <86box/vid_vga.h>
 
-static video_timings_t timing_vga = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
+video_timings_t        timing_vga = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
+
 static video_timings_t timing_ps1_svga_isa = { .type = VIDEO_ISA, .write_b = 6, .write_w = 8, .write_l = 16, .read_b = 6, .read_w = 8, .read_l = 16 };
 static video_timings_t timing_ps1_svga_mca = { .type = VIDEO_MCA, .write_b = 6, .write_w = 8, .write_l = 16, .read_b = 6, .read_w = 8, .read_l = 16 };
 
@@ -135,8 +136,23 @@ int vga_isenabled(void* p)
     return svga->vga_enabled;
 }
 
+void
+vga_init(const device_t *info, vga_t *vga, int enabled)
+{
+    svga_init(info, &vga->svga, vga, 1 << 18, /*256kb*/
+              NULL,
+              vga_in, vga_out,
+              NULL,
+              NULL);
+
+    vga->svga.bpp     = 8;
+    vga->svga.miscout = 1;
+
+    vga->svga.vga_enabled = enabled;
+}
+
 static void *
-vga_init(const device_t *info)
+vga_standalone_init(const device_t *info)
 {
     vga_t *vga = malloc(sizeof(vga_t));
     memset(vga, 0, sizeof(vga_t));
@@ -145,16 +161,7 @@ vga_init(const device_t *info)
 
     video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_vga);
 
-    svga_init(info, &vga->svga, vga, 1 << 18, /*256kb*/
-              NULL,
-              vga_in, vga_out,
-              NULL,
-              NULL);
-
-    io_sethandler(0x03c0, 0x0020, vga_in, NULL, NULL, vga_out, NULL, NULL, vga);
-
-    vga->svga.bpp     = 8;
-    vga->svga.miscout = 1;
+    vga_init(info, vga, 0);
 
     return vga;
 }
@@ -171,17 +178,7 @@ ps1vga_init(const device_t *info)
     else
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_ps1_svga_isa);
 
-    svga_init(info, &vga->svga, vga, 1 << 18, /*256kb*/
-              NULL,
-              vga_in, vga_out,
-              NULL,
-              NULL);
-
-    io_sethandler(0x03c0, 0x0020, vga_in, NULL, NULL, vga_out, NULL, NULL, vga);
-
-    vga->svga.bpp     = 8;
-    vga->svga.miscout = 1;
-    vga->svga.vga_enabled = 1;
+    vga_init(info, vga, 1);
 
     return vga;
 }
@@ -223,7 +220,7 @@ const device_t vga_device = {
     .internal_name = "vga",
     .flags         = DEVICE_ISA,
     .local         = 0,
-    .init          = vga_init,
+    .init          = vga_standalone_init,
     .close         = vga_close,
     .reset         = NULL,
     .available     = vga_available,

From 47febdf1969b5532ee6be6c321b802e5ff19fd02 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Fri, 28 Mar 2025 06:42:11 +0100
Subject: [PATCH 10/59] JVGA: Read CRTC registers from VGA rather than EGA,
 fixes Wolfenstein 3D.

---
 src/video/vid_jega.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/video/vid_jega.c b/src/video/vid_jega.c
index af20444dd..745c76e24 100644
--- a/src/video/vid_jega.c
+++ b/src/video/vid_jega.c
@@ -29,6 +29,7 @@
 #include <86box/pic.h>
 #include <86box/pit.h>
 #include <86box/plat.h>
+#include <86box/plat_fallthrough.h>
 #include <86box/mem.h>
 #include <86box/rom.h>
 #include <86box/device.h>
@@ -592,12 +593,18 @@ jega_in(uint16_t addr, void *priv)
                         break;
                 }
                 jega_log("JEGA In %04X(%02X) %02X %04X:%04X\n", addr, jega->regs_index, ret, cs >> 4, cpu_state.pc);
-            } else if (jega->regs[RMOD1] & 0x0C) /* Accessing to Slave EGA is redirected to Master in AX-1. */
-                ret = ega_in(addr, &jega->ega);
+            } else if (jega->regs[RMOD1] & 0x0c) {
+                /* Accessing to Slave EGA is redirected to Master in AX-1. */
+                if (jega->is_vga)
+                    ret = vga_in(addr, &jega->vga);
+                else
+                    ret = ega_in(addr, &jega->ega);
+            }
             break;
         case 0x3ba:
         case 0x3da:
             jega->attrff = 0;
+            fallthrough;
         default:
             /* Accessing to Slave is redirected to Master in AX-1. */
             if (jega->regs[RMOD1] & 0x0c) {

From 8f6f21b57e14b370a7e8cae4cb5930d2efe6ea11 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Fri, 28 Mar 2025 06:54:45 +0100
Subject: [PATCH 11/59] IBM VGA: Re-add the forgotten (S)VGA I/O handlers.

---
 src/video/vid_vga.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/video/vid_vga.c b/src/video/vid_vga.c
index 0a0fbd8e1..8289fd4cb 100644
--- a/src/video/vid_vga.c
+++ b/src/video/vid_vga.c
@@ -154,8 +154,7 @@ vga_init(const device_t *info, vga_t *vga, int enabled)
 static void *
 vga_standalone_init(const device_t *info)
 {
-    vga_t *vga = malloc(sizeof(vga_t));
-    memset(vga, 0, sizeof(vga_t));
+    vga_t *vga = calloc(1, sizeof(vga_t));
 
     rom_init(&vga->bios_rom, "roms/video/vga/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0x2000, MEM_MAPPING_EXTERNAL);
 
@@ -163,6 +162,8 @@ vga_standalone_init(const device_t *info)
 
     vga_init(info, vga, 0);
 
+    io_sethandler(0x03c0, 0x0020, vga_in, NULL, NULL, vga_out, NULL, NULL, vga);
+ 
     return vga;
 }
 
@@ -170,8 +171,7 @@ vga_standalone_init(const device_t *info)
 void *
 ps1vga_init(const device_t *info)
 {
-    vga_t *vga = malloc(sizeof(vga_t));
-    memset(vga, 0, sizeof(vga_t));
+    vga_t *vga = calloc(1, sizeof(vga_t));
 
     if (info->flags & DEVICE_MCA)
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_ps1_svga_mca);
@@ -180,6 +180,8 @@ ps1vga_init(const device_t *info)
 
     vga_init(info, vga, 1);
 
+    io_sethandler(0x03c0, 0x0020, vga_in, NULL, NULL, vga_out, NULL, NULL, vga);
+
     return vga;
 }
 

From 6366ff758082d16430bbbf5e81d9845ba8270985 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Fri, 28 Mar 2025 08:09:51 +0100
Subject: [PATCH 12/59] JEGA: Fix two uninitialized variables.

---
 src/video/vid_jega.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/video/vid_jega.c b/src/video/vid_jega.c
index 745c76e24..3d1cfe476 100644
--- a/src/video/vid_jega.c
+++ b/src/video/vid_jega.c
@@ -250,9 +250,9 @@ jega_render_text(void *priv)
         int        sc_wide       = *sc - jega->start_scan_count;
         const bool cursoron      = (blinked || jega->cursorblink_disable) &&
                                    (*sc >= jega->regs[RCCSL]) && (*sc <= jega->regs[RCCEL]);
+        uint32_t   attr_basic    = 0;
         uint32_t   chr_first;
-        uint32_t   attr_basic;
-        int        fg;
+        int        fg            = 0;
         int        bg;
 
         for (int x = 0; x < (*hdisp + *scrollcache); x += charwidth) {

From 94cf5d59a2b919cfb5e916e8d715708ff138f54e Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Fri, 28 Mar 2025 22:35:56 +0600
Subject: [PATCH 13/59] host_x86_MOV8_REG_ABS: Avoid more fatals

---
 src/codegen_new/codegen_backend_x86-64_ops.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/codegen_new/codegen_backend_x86-64_ops.c b/src/codegen_new/codegen_backend_x86-64_ops.c
index c70112c86..fc6c1b492 100644
--- a/src/codegen_new/codegen_backend_x86-64_ops.c
+++ b/src/codegen_new/codegen_backend_x86-64_ops.c
@@ -723,7 +723,11 @@ host_x86_MOV8_REG_ABS(codeblock_t *block, int dst_reg, void *p)
         codegen_addbyte4(block, 0x41, 0x8a, 0x84 | ((dst_reg & 7) << 3), 0x24); /*MOV dst_reg, ram_offset[R12]*/
         codegen_addlong(block, ram_offset);
     } else {
-        fatal("host_x86_MOV8_REG_ABS - out of range\n");
+        codegen_alloc_bytes(block, 10);
+        codegen_addbyte2(block, 0x49, 0xb9); /*MOV R9, p*/
+        codegen_addquad(block, (uintptr_t) p);
+        codegen_alloc_bytes(block, 3);
+        codegen_addbyte3(block, 0x41, 0x8a, 0x01 | ((dst_reg & 7) << 3)); /*MOV dst_reg, [R9]*/
     }
 }
 void

From dd0e6261337df4384df3bb94ffe691bcd67307be Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Sat, 29 Mar 2025 01:18:37 +0600
Subject: [PATCH 14/59] Set LC_NUMERIC to "C" in program startup

For whatever fucking reason, glibc's functions dealing with decimal numbers apparently can only accept either commas or dots in strings, but not both. Meanwhile, both Windows and macOS have no apparent issues accepting both.

I will never understand why they decided to even consider such behaviour acceptable, especially since those ARE used for parsing decimal numbers in many programs, but I guess it's their own version of Not Invented Here syndrome that they (or anyone else) can't be bothered to deal with. This is not how good C standard libraries are written, at all.
---
 src/qt/qt_main.cpp |  3 +++
 src/utils/ini.c    | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp
index 2e0ce33e0..2ef797bd1 100644
--- a/src/qt/qt_main.cpp
+++ b/src/qt/qt_main.cpp
@@ -94,6 +94,8 @@ extern int qt_nvr_save(void);
 bool cpu_thread_running = false;
 }
 
+#include <locale.h>
+
 void qt_set_sequence_auto_mnemonic(bool b);
 
 #ifdef Q_OS_WINDOWS
@@ -525,6 +527,7 @@ main(int argc, char *argv[])
 
     QApplication app(argc, argv);
     QLocale::setDefault(QLocale::C);
+    setlocale(LC_NUMERIC, "C");
 
 #ifdef Q_OS_WINDOWS
     Q_INIT_RESOURCE(darkstyle);
diff --git a/src/utils/ini.c b/src/utils/ini.c
index f5dfdef46..e23f83670 100644
--- a/src/utils/ini.c
+++ b/src/utils/ini.c
@@ -756,8 +756,9 @@ double
 ini_section_get_double(ini_section_t self, const char *name, double def)
 {
     section_t     *section = (section_t *) self;
-    const entry_t *entry;
-    double         value = 0;
+    entry_t *entry;
+    double   value = 0;
+    int      res = 0;
 
     if (section == NULL)
         return def;
@@ -766,7 +767,17 @@ ini_section_get_double(ini_section_t self, const char *name, double def)
     if (entry == NULL)
         return def;
 
-    sscanf(entry->data, "%lg", &value);
+    res = sscanf(entry->data, "%lg", &value);
+    if (res == EOF || res <= 0) {
+        int i = 0;
+        for (i = 0; i < strlen(entry->data); i++) {
+            if (entry->data[i] == ',') {
+                entry->data[i] = '.';
+                entry->wdata[i] = L'.';
+            }
+        }
+        (void)sscanf(entry->data, "%lg", &value);
+    }
 
     return value;
 }

From f422a9ce3dc14edf75b6c12d793c829a82db3f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?=
 <13226155+dhrdlicka@users.noreply.github.com>
Date: Fri, 28 Mar 2025 22:11:26 +0100
Subject: [PATCH 15/59] qt: implement authentic icon grayscaling

---
 src/qt/qt_styleoverride.cpp | 40 +++++++++++++++++++++++++++++++++++++
 src/qt/qt_styleoverride.hpp |  4 ++++
 2 files changed, 44 insertions(+)

diff --git a/src/qt/qt_styleoverride.cpp b/src/qt/qt_styleoverride.cpp
index 60a7162a5..0bade8fa6 100644
--- a/src/qt/qt_styleoverride.cpp
+++ b/src/qt/qt_styleoverride.cpp
@@ -18,6 +18,9 @@
 
 #include <QComboBox>
 #include <QAbstractItemView>
+#include <QPixmap>
+#include <QIcon>
+#include <QStyleOption>
 
 #ifdef Q_OS_WINDOWS
 #include <dwmapi.h>
@@ -66,3 +69,40 @@ StyleOverride::polish(QWidget *widget)
         qobject_cast<QComboBox *>(widget)->view()->setMinimumWidth(widget->minimumSizeHint().width());
     }
 }
+
+QPixmap
+StyleOverride::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *option) const
+{
+    if (iconMode != QIcon::Disabled) {
+        return QProxyStyle::generatedIconPixmap(iconMode, pixmap, option);
+    }
+
+    auto image = pixmap.toImage();
+
+    for (int y = 0; y < image.height(); y++) {
+        for (int x = 0; x < image.width(); x++) {
+            // checkerboard transparency
+            if (((x ^ y) & 1) == 0) {
+                image.setPixelColor(x, y, Qt::transparent);
+                continue;
+            }
+
+            auto color = image.pixelColor(x, y);
+
+            // convert to grayscale using the NTSC formula
+            auto avg = 0.0;
+            avg += color.blueF() * 0.114;
+            avg += color.greenF() * 0.587;
+            avg += color.redF() * 0.299;
+
+            color.setRedF(avg);
+            color.setGreenF(avg);
+            color.setBlueF(avg);
+
+            image.setPixelColor(x, y, color);
+
+        }
+    }
+
+    return QPixmap::fromImage(image);
+}
diff --git a/src/qt/qt_styleoverride.hpp b/src/qt/qt_styleoverride.hpp
index c04d01a12..840aa6ad6 100644
--- a/src/qt/qt_styleoverride.hpp
+++ b/src/qt/qt_styleoverride.hpp
@@ -4,6 +4,9 @@
 #include <QProxyStyle>
 #include <QWidget>
 #include <QLayout>
+#include <QPixmap>
+#include <QIcon>
+#include <QStyleOption>
 
 class StyleOverride : public QProxyStyle {
 public:
@@ -14,6 +17,7 @@ public:
         QStyleHintReturn   *returnData = nullptr) const override;
 
     void polish(QWidget *widget) override;
+    QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *option) const override;
 };
 
 #endif

From c00c432398dd2d1a7f0c2bfe20a5f9756867e894 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 29 Mar 2025 00:10:39 +0100
Subject: [PATCH 16/59] EGA: Fix colors in mono mode and attribute registers,
 fixes #5395.

---
 src/video/vid_ega.c        | 11 +++++++----
 src/video/vid_ega_render.c | 10 +++++++---
 src/video/vid_jega.c       | 15 ++++++++-------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c
index 17b3fb593..f002ef999 100644
--- a/src/video/vid_ega.c
+++ b/src/video/vid_ega.c
@@ -112,10 +112,13 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
                     ega->fullchange = changeframecount;
                 if (ega->attraddr == 0x10 || ega->attraddr == 0x14 || ega->attraddr < 0x10) {
                     for (uint8_t c = 0; c < 16; c++) {
-                        if (ega->attrregs[0x10] & 0x80)
-                            ega->egapal[c] = (ega->attrregs[c] & 0xf) | ((ega->attrregs[0x14] & 0xf) << 4);
-                        else
-                            ega->egapal[c] = (ega->attrregs[c] & 0x3f) | ((ega->attrregs[0x14] & 0xc) << 4);
+                        if (ega->chipset) {
+                            if (ega->attrregs[0x10] & 0x80)
+                                ega->egapal[c] = (ega->attrregs[c] & 0xf) | ((ega->attrregs[0x14] & 0xf) << 4);
+                            else
+                                ega->egapal[c] = (ega->attrregs[c] & 0x3f) | ((ega->attrregs[0x14] & 0xc) << 4);
+                        } else
+                            ega->egapal[c] = ega->attrregs[c] & 0x3f;
                     }
                     ega->fullchange = changeframecount;
                 }
diff --git a/src/video/vid_ega_render.c b/src/video/vid_ega_render.c
index 261474742..10667084a 100644
--- a/src/video/vid_ega_render.c
+++ b/src/video/vid_ega_render.c
@@ -172,15 +172,19 @@ ega_render_text(ega_t *ega)
 
             uint32_t dat = ega->vram[charaddr + (ega->sc << 2)];
             dat <<= 1;
-            if ((chr & ~0x1F) == 0xC0 && attrlinechars)
+            if (((chr & ~0x1f) == 0xc0) && attrlinechars)
                 dat |= (dat >> 1) & 1;
 
             for (int xx = 0; xx < charwidth; xx++) {
                 if (monoattrs) {
+                    int bit   = (dat & (0x100 >> (xx >> dwshift))) ? 1 : 0;
+                    int blink = (!drawcursor && (attr & 0x80) && attrblink && blinked);
                     if ((ega->sc == ega->crtc[0x14]) && ((attr & 7) == 1))
-                        p[xx] = ega->mdacols[attr][attrblink][1];
+                        p[xx] = ega->mdacols[attr][blink][1];
                     else
-                        p[xx] = ega->mdacols[attr][attrblink][dat & (0x100 >> (xx >> dwshift))];
+                        p[xx] = ega->mdacols[attr][blink][bit];
+                    if (drawcursor)
+                        p[xx] ^= ega->mdacols[attr][0][1];
                     p[xx] = ega->pallook[ega->egapal[p[xx] & 0x0f]];
                 } else
                     p[xx] = (dat & (0x100 >> (xx >> dwshift))) ? fg : bg;
diff --git a/src/video/vid_jega.c b/src/video/vid_jega.c
index 3d1cfe476..11c9cbf8d 100644
--- a/src/video/vid_jega.c
+++ b/src/video/vid_jega.c
@@ -430,14 +430,15 @@ jega_out(uint16_t addr, uint8_t val, void *priv)
                 jega->attrregs[jega->attraddr & 31] = val;
                 if (jega->attraddr < 0x10) {
                     for (uint8_t c = 0; c < 16; c++) {
-                        if (!jega->is_vga)
+                        if (jega->is_vga) {
+                            if (jega->attrregs[0x10] & 0x80)
+                                jega->egapal[c] = (jega->attrregs[c] & 0xf) | ((jega->attrregs[0x14] & 0xf) << 4);
+                            else if (jega->vga.svga.ati_4color)
+                                jega->egapal[c] = pal4to16[(c & 0x03) | ((val >> 2) & 0xc)];
+                            else
+                                jega->egapal[c] = (jega->attrregs[c] & 0x3f) | ((jega->attrregs[0x14] & 0xc) << 4);
+                        } else
                             jega->egapal[c] = jega->attrregs[c] & 0x3f;
-                        else if (jega->attrregs[0x10] & 0x80)
-                            jega->egapal[c] = (jega->attrregs[c] & 0xf) | ((jega->attrregs[0x14] & 0xf) << 4);
-                        else if (jega->vga.svga.ati_4color)
-                            jega->egapal[c] = pal4to16[(c & 0x03) | ((val >> 2) & 0xc)];
-                        else
-                            jega->egapal[c] = (jega->attrregs[c] & 0x3f) | ((jega->attrregs[0x14] & 0xc) << 4);
                     }
                     if (jega->is_vga)
                         jega->vga.svga.fullchange = changeframecount;

From ed4a312f4f6dec174a848dfa13bee8d9cc551976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?=
 <13226155+dhrdlicka@users.noreply.github.com>
Date: Fri, 28 Mar 2025 23:13:23 +0100
Subject: [PATCH 17/59] Remove support for icon sets

---
 src/config.c                         | 11 -----
 src/include/86box/86box.h            |  1 -
 src/qt/qt.c                          |  2 -
 src/qt/qt_machinestatus.cpp          | 44 ++++++++---------
 src/qt/qt_mediamenu.cpp              | 18 +++----
 src/qt/qt_progsettings.cpp           | 62 ------------------------
 src/qt/qt_progsettings.hpp           |  3 --
 src/qt/qt_progsettings.ui            | 72 ++++++----------------------
 src/qt/qt_settings.cpp               |  2 +-
 src/qt/qt_settingsfloppycdrom.cpp    | 10 ++--
 src/qt/qt_settingsharddisks.cpp      |  2 +-
 src/qt/qt_settingsotherremovable.cpp |  8 ++--
 src/unix/unix.c                      |  1 -
 13 files changed, 57 insertions(+), 179 deletions(-)

diff --git a/src/config.c b/src/config.c
index 2e6a5460f..8ff7d548c 100644
--- a/src/config.c
+++ b/src/config.c
@@ -192,12 +192,6 @@ load_general(void)
     else if (mouse_sensitivity > 2.0)
         mouse_sensitivity = 2.0;
 
-    p = ini_section_get_string(cat, "iconset", NULL);
-    if (p != NULL)
-        strcpy(icon_set, p);
-    else
-        strcpy(icon_set, "");
-
     enable_discord = !!ini_section_get_int(cat, "enable_discord", 0);
 
     open_dir_usr_path = ini_section_get_int(cat, "open_dir_usr_path", 0);
@@ -2038,11 +2032,6 @@ save_general(void)
         ini_section_set_string(cat, "language", buffer);
     }
 
-    if (!strcmp(icon_set, ""))
-        ini_section_delete_var(cat, "iconset");
-    else
-        ini_section_set_string(cat, "iconset", icon_set);
-
     if (enable_discord)
         ini_section_set_int(cat, "enable_discord", enable_discord);
     else
diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h
index c58d595c5..61de69cf3 100644
--- a/src/include/86box/86box.h
+++ b/src/include/86box/86box.h
@@ -118,7 +118,6 @@ extern int      vid_resize;                 /* (C) allow resizing */
 extern int      invert_display;             /* (C) invert the display */
 extern int      suppress_overscan;          /* (C) suppress overscans */
 extern uint32_t lang_id;                    /* (C) language code identifier */
-extern char     icon_set[256];              /* (C) iconset identifier */
 extern int      scale;                      /* (C) screen scale factor */
 extern int      dpi_scale;                  /* (C) DPI scaling of the emulated screen */
 extern int      vid_api;                    /* (C) video renderer */
diff --git a/src/qt/qt.c b/src/qt/qt.c
index a9a6460eb..ecf4b964b 100644
--- a/src/qt/qt.c
+++ b/src/qt/qt.c
@@ -35,8 +35,6 @@ qt_nvr_save(void)
     return nvr_save();
 }
 
-char icon_set[256] = ""; /* name of the iconset to be used */
-
 int
 plat_vidapi(const char *api)
 {
diff --git a/src/qt/qt_machinestatus.cpp b/src/qt/qt_machinestatus.cpp
index a00cc032b..eff29a232 100644
--- a/src/qt/qt_machinestatus.cpp
+++ b/src/qt/qt_machinestatus.cpp
@@ -176,24 +176,24 @@ static const QString pixmap_empty_active = QStringLiteral("_empty_active");
 void
 PixmapSetEmpty::load(const QString &basePath)
 {
-    normal = ProgSettings::loadIcon(basePath.arg(QStringLiteral(""))).pixmap(pixmap_size);
-    empty  = ProgSettings::loadIcon(basePath.arg(pixmap_empty)).pixmap(pixmap_size);
+    normal = QIcon(basePath.arg(QStringLiteral(""))).pixmap(pixmap_size);
+    empty  = QIcon(basePath.arg(pixmap_empty)).pixmap(pixmap_size);
 }
 
 void
 PixmapSetActive::load(const QString &basePath)
 {
-    normal = ProgSettings::loadIcon(basePath.arg(QStringLiteral(""))).pixmap(pixmap_size);
-    active = ProgSettings::loadIcon(basePath.arg(pixmap_active)).pixmap(pixmap_size);
+    normal = QIcon(basePath.arg(QStringLiteral(""))).pixmap(pixmap_size);
+    active = QIcon(basePath.arg(pixmap_active)).pixmap(pixmap_size);
 }
 
 void
 PixmapSetEmptyActive::load(QString basePath)
 {
-    normal       = ProgSettings::loadIcon(basePath.arg(QStringLiteral(""))).pixmap(pixmap_size);
-    active       = ProgSettings::loadIcon(basePath.arg(pixmap_active)).pixmap(pixmap_size);
-    empty        = ProgSettings::loadIcon(basePath.arg(pixmap_empty)).pixmap(pixmap_size);
-    empty_active = ProgSettings::loadIcon(basePath.arg(pixmap_empty_active)).pixmap(pixmap_size);
+    normal       = QIcon(basePath.arg(QStringLiteral(""))).pixmap(pixmap_size);
+    active       = QIcon(basePath.arg(pixmap_active)).pixmap(pixmap_size);
+    empty        = QIcon(basePath.arg(pixmap_empty)).pixmap(pixmap_size);
+    empty_active = QIcon(basePath.arg(pixmap_empty_active)).pixmap(pixmap_size);
 }
 }
 
@@ -202,21 +202,21 @@ struct MachineStatus::States {
 
     States(QObject *parent)
     {
-        pixmaps.cartridge.load("/cartridge%1.ico");
-        pixmaps.cassette.load("/cassette%1.ico");
-        pixmaps.floppy_disabled.normal       = ProgSettings::loadIcon(QStringLiteral("/floppy_disabled.ico")).pixmap(pixmap_size);
+        pixmaps.cartridge.load(":/settings/qt/icons/cartridge%1.ico");
+        pixmaps.cassette.load(":/settings/qt/icons/cassette%1.ico");
+        pixmaps.floppy_disabled.normal       = QIcon(":/settings/qt/icons/floppy_disabled.ico").pixmap(pixmap_size);
         pixmaps.floppy_disabled.active       = pixmaps.floppy_disabled.normal;
         pixmaps.floppy_disabled.empty        = pixmaps.floppy_disabled.normal;
         pixmaps.floppy_disabled.empty_active = pixmaps.floppy_disabled.normal;
-        pixmaps.floppy_525.load("/floppy_525%1.ico");
-        pixmaps.floppy_35.load("/floppy_35%1.ico");
-        pixmaps.cdrom.load("/cdrom%1.ico");
-        pixmaps.zip.load("/zip%1.ico");
-        pixmaps.mo.load("/mo%1.ico");
-        pixmaps.hd.load("/hard_disk%1.ico");
-        pixmaps.net.load("/network%1.ico");
-        pixmaps.sound = ProgSettings::loadIcon("/sound.ico").pixmap(pixmap_size);
-        pixmaps.soundMuted = ProgSettings::loadIcon("/sound_mute.ico").pixmap(pixmap_size);
+        pixmaps.floppy_525.load(":/settings/qt/icons/floppy_525%1.ico");
+        pixmaps.floppy_35.load(":/settings/qt/icons/floppy_35%1.ico");
+        pixmaps.cdrom.load(":/settings/qt/icons/cdrom%1.ico");
+        pixmaps.zip.load(":/settings/qt/icons/zip%1.ico");
+        pixmaps.mo.load(":/settings/qt/icons/mo%1.ico");
+        pixmaps.hd.load(":/settings/qt/icons/hard_disk%1.ico");
+        pixmaps.net.load(":/settings/qt/icons/network%1.ico");
+        pixmaps.sound = QIcon(":/settings/qt/icons/sound.ico").pixmap(pixmap_size);
+        pixmaps.soundMuted = QIcon(":/settings/qt/icons/sound_mute.ico").pixmap(pixmap_size);
 
         cartridge[0].pixmaps = &pixmaps.cartridge;
         cartridge[1].pixmaps = &pixmaps.cartridge;
@@ -511,7 +511,7 @@ MachineStatus::refresh(QStatusBar *sbar)
             config_save();
             if (d->sound)
                 d->sound->setPixmap(sound_muted ? d->pixmaps.soundMuted : d->pixmaps.sound);
-            
+
             muteUnmuteAction->setText(sound_muted ? tr("&Unmute") : tr("&Mute"));
         });
     }
@@ -697,7 +697,7 @@ MachineStatus::refresh(QStatusBar *sbar)
     d->sound->setPixmap(sound_muted ? d->pixmaps.soundMuted : d->pixmaps.sound);
     if (muteUnmuteAction)
         muteUnmuteAction->setText(sound_muted ? tr("&Unmute") : tr("&Mute"));
-    
+
     connect(d->sound.get(), &ClickableLabel::clicked, this, [this](QPoint pos) {
         this->soundMenu->popup(pos - QPoint(0, this->soundMenu->sizeHint().height()));
     });
diff --git a/src/qt/qt_mediamenu.cpp b/src/qt/qt_mediamenu.cpp
index fdea16c2a..f7abebdf1 100644
--- a/src/qt/qt_mediamenu.cpp
+++ b/src/qt/qt_mediamenu.cpp
@@ -154,10 +154,10 @@ MediaMenu::refresh(QMenu *parentMenu)
     MachineStatus::iterateCDROM([this, parentMenu](int i) {
         auto *menu   = parentMenu->addMenu("");
         cdromMutePos = menu->children().count();
-        menu->addAction(ProgSettings::loadIcon("/cdrom_mute.ico"), tr("&Mute"), [this, i]() { cdromMute(i); })->setCheckable(true);
+        menu->addAction(QIcon(":/settings/qt/icons/cdrom_mute.ico"), tr("&Mute"), [this, i]() { cdromMute(i); })->setCheckable(true);
         menu->addSeparator();
-        menu->addAction(ProgSettings::loadIcon("/cdrom_image.ico"), tr("&Image..."), [this, i]() { cdromMount(i, 0, nullptr); })->setCheckable(false);
-        menu->addAction(ProgSettings::loadIcon("/cdrom_folder.ico"), tr("&Folder..."), [this, i]() { cdromMount(i, 1, nullptr); })->setCheckable(false);
+        menu->addAction(QIcon(":/settings/qt/icons/cdrom_image.ico"), tr("&Image..."), [this, i]() { cdromMount(i, 0, nullptr); })->setCheckable(false);
+        menu->addAction(QIcon(":/settings/qt/icons/cdrom_folder.ico"), tr("&Folder..."), [this, i]() { cdromMount(i, 1, nullptr); })->setCheckable(false);
         menu->addSeparator();
         for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
             cdromImageHistoryPos[slot] = menu->children().count();
@@ -170,7 +170,7 @@ MediaMenu::refresh(QMenu *parentMenu)
         for (const auto &letter : driveLetters) {
             auto drive = QString("%1:\\").arg(letter);
             if (GetDriveType(drive.toUtf8().constData()) == DRIVE_CDROM)
-                menu->addAction(ProgSettings::loadIcon("/cdrom_host.ico"), tr("Host CD/DVD Drive (%1:)").arg(letter), [this, i, letter] { cdromMount(i, 2, QString(R"(\\.\%1:)").arg(letter)); })->setCheckable(false);
+                menu->addAction(QIcon(":/settings/qt/icons/cdrom_host.ico"), tr("Host CD/DVD Drive (%1:)").arg(letter), [this, i, letter] { cdromMount(i, 2, QString(R"(\\.\%1:)").arg(letter)); })->setCheckable(false);
         }
         menu->addSeparator();
 #endif // Q_OS_WINDOWS
@@ -666,7 +666,7 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
             children              = menu->children();
             imageHistoryUpdatePos = dynamic_cast<QAction *>(children[cdromImageHistoryPos[slot]]);
             if (fn.left(8) == "ioctl://") {
-                menu_icon = ProgSettings::loadIcon("/cdrom_host.ico");
+                menu_icon = QIcon(":/settings/qt/icons/cdrom_host.ico");
 #ifdef Q_OS_WINDOWS
                 menu_item_name = tr("Host CD/DVD Drive (%1)").arg(fn.right(2)).toUtf8().constData();
 #else
@@ -674,7 +674,7 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
 #endif
             } else {
                 fi.setFile(fn);
-                menu_icon = fi.isDir() ? ProgSettings::loadIcon("/cdrom_folder.ico") : ProgSettings::loadIcon("/cdrom_image.ico");
+                menu_icon = fi.isDir() ? QIcon(":/settings/qt/icons/cdrom_folder.ico") : QIcon(":/settings/qt/icons/cdrom_image.ico");
                 menu_item_name = fn.isEmpty() ? tr("previous image").toUtf8().constData() : fn.toUtf8().constData();
             }
             imageHistoryUpdatePos->setIcon(menu_icon);
@@ -727,7 +727,7 @@ MediaMenu::cdromUpdateMenu(int i)
     auto  childs = menu->children();
 
     auto *muteMenu = dynamic_cast<QAction *>(childs[cdromMutePos]);
-    muteMenu->setIcon(ProgSettings::loadIcon((cdrom[i].sound_on == 0) ? "/cdrom_unmute.ico" : "/cdrom_mute.ico"));
+    muteMenu->setIcon(QIcon((cdrom[i].sound_on == 0) ? ":/settings/qt/icons/cdrom_unmute.ico" : ":/settings/qt/icons/cdrom_mute.ico"));
     muteMenu->setText((cdrom[i].sound_on == 0) ? tr("&Unmute") : tr("&Mute"));
 
     auto *imageMenu = dynamic_cast<QAction *>(childs[cdromImagePos]);
@@ -740,13 +740,13 @@ MediaMenu::cdromUpdateMenu(int i)
         menu_item_name = tr("Host CD/DVD Drive (%1)").arg(name.right(name.length() - 8));
 #endif
         name2          = menu_item_name;
-        menu_icon      = ProgSettings::loadIcon("/cdrom_host.ico");
+        menu_icon      = QIcon(":/settings/qt/icons/cdrom_host.ico");
     } else {
         QFileInfo fi(cdrom[i].image_path);
 
         menu_item_name = name.isEmpty() ? QString().toUtf8().constData() : name.toUtf8().constData();
         name2          = name;
-        menu_icon      = fi.isDir() ? ProgSettings::loadIcon("/cdrom_folder.ico") : ProgSettings::loadIcon("/cdrom_image.ico");
+        menu_icon      = fi.isDir() ? QIcon(":/settings/qt/icons/cdrom_folder.ico") : QIcon(":/settings/qt/icons/cdrom_image.ico");
     }
     imageMenu->setIcon(menu_icon);
     imageMenu->setText(QString::asprintf(tr("Eject %s").toUtf8().constData(), menu_item_name.toUtf8().constData()));
diff --git a/src/qt/qt_progsettings.cpp b/src/qt/qt_progsettings.cpp
index ce6c21dd6..2fd108186 100644
--- a/src/qt/qt_progsettings.cpp
+++ b/src/qt/qt_progsettings.cpp
@@ -36,71 +36,16 @@ extern "C" {
 #include <86box/rom.h>
 }
 
-static QMap<QString, QString> iconset_to_qt;
 extern MainWindow            *main_window;
 
 ProgSettings::CustomTranslator *ProgSettings::translator   = nullptr;
 QTranslator                    *ProgSettings::qtTranslator = nullptr;
-QString
-ProgSettings::getIconSetPath()
-{
-    if (iconset_to_qt.isEmpty()) {
-        // Always include default bundled icons
-        iconset_to_qt.insert("", ":/settings/qt/icons");
-        // Walk rom_paths to get the candidates
-        for (rom_path_t *emu_rom_path = &rom_paths; emu_rom_path != nullptr; emu_rom_path = emu_rom_path->next) {
-            // Check for icons subdir in each candidate
-            QDir roms_icons_dir(QString(emu_rom_path->path) + "/icons");
-            if (roms_icons_dir.isReadable()) {
-                auto dirList = roms_icons_dir.entryList(QDir::AllDirs | QDir::Executable | QDir::Readable);
-                for (auto &curIconSet : dirList) {
-                    if (curIconSet == "." || curIconSet == "..") {
-                        continue;
-                    }
-                    iconset_to_qt.insert(curIconSet, (roms_icons_dir.canonicalPath() + '/') + curIconSet);
-                }
-            }
-        }
-    }
-    return iconset_to_qt[icon_set];
-}
-
-QIcon
-ProgSettings::loadIcon(QString file)
-{
-    (void) getIconSetPath();
-    if (!QFile::exists(iconset_to_qt[icon_set] + file))
-        return QIcon(iconset_to_qt[""] + file);
-    return QIcon(iconset_to_qt[icon_set] + file);
-}
 
 ProgSettings::ProgSettings(QWidget *parent)
     : QDialog(parent)
     , ui(new Ui::ProgSettings)
 {
     ui->setupUi(this);
-    (void) getIconSetPath();
-    ui->comboBox->setItemData(0, "");
-    ui->comboBox->setCurrentIndex(0);
-    for (auto i = iconset_to_qt.begin(); i != iconset_to_qt.end(); i++) {
-        if (i.key() == "")
-            continue;
-        QFile iconfile(i.value() + "/iconinfo.txt");
-        iconfile.open(QFile::ReadOnly);
-        QString friendlyName;
-        QString iconsetinfo(iconfile.readAll());
-        iconfile.close();
-        if (iconsetinfo.isEmpty())
-            friendlyName = i.key();
-        else
-            friendlyName = iconsetinfo.split('\n')[0];
-        ui->comboBox->addItem(friendlyName, i.key());
-        if (strcmp(icon_set, i.key().toUtf8().data()) == 0) {
-            ui->comboBox->setCurrentIndex(ui->comboBox->findData(i.key()));
-        }
-    }
-    ui->comboBox->setItemData(0, '(' + tr("Default") + ')', Qt::DisplayRole);
-
     ui->comboBoxLanguage->setItemData(0, 0xFFFF);
     for (auto i = lcid_langcode.begin(); i != lcid_langcode.end(); i++) {
         if (i.key() == 0xFFFF)
@@ -129,7 +74,6 @@ ProgSettings::ProgSettings(QWidget *parent)
 void
 ProgSettings::accept()
 {
-    strcpy(icon_set, ui->comboBox->currentData().toString().toUtf8().data());
     lang_id                 = ui->comboBoxLanguage->currentData().toUInt();
     open_dir_usr_path       = ui->openDirUsrPath->isChecked() ? 1 : 0;
     confirm_exit            = ui->checkBoxConfirmExit->isChecked() ? 1 : 0;
@@ -161,12 +105,6 @@ ProgSettings::~ProgSettings()
     delete ui;
 }
 
-void
-ProgSettings::on_pushButton_released()
-{
-    ui->comboBox->setCurrentIndex(0);
-}
-
 #ifdef Q_OS_WINDOWS
 /* Return the standard font name on Windows, which is overridden per-language
    to prevent CJK fonts with embedded bitmaps being chosen as a fallback. */
diff --git a/src/qt/qt_progsettings.hpp b/src/qt/qt_progsettings.hpp
index 642b2002d..b4e59e02d 100644
--- a/src/qt/qt_progsettings.hpp
+++ b/src/qt/qt_progsettings.hpp
@@ -14,8 +14,6 @@ class ProgSettings : public QDialog {
 public:
     explicit ProgSettings(QWidget *parent = nullptr);
     ~ProgSettings();
-    static QString getIconSetPath();
-    static QIcon   loadIcon(QString file);
 #ifdef Q_OS_WINDOWS
     static QString getFontName(uint32_t lcid);
 #endif
@@ -56,7 +54,6 @@ public:
 protected slots:
     void accept() override;
 private slots:
-    void on_pushButton_released();
     void on_pushButtonLanguage_released();
 
     void on_horizontalSlider_valueChanged(int value);
diff --git a/src/qt/qt_progsettings.ui b/src/qt/qt_progsettings.ui
index f7b32ce84..d3ebf8c85 100644
--- a/src/qt/qt_progsettings.ui
+++ b/src/qt/qt_progsettings.ui
@@ -29,21 +29,14 @@
    <property name="sizeConstraint">
     <enum>QLayout::SizeConstraint::SetFixedSize</enum>
    </property>
-   <item row="5" column="1">
+   <item row="2" column="1">
     <widget class="QPushButton" name="pushButtonLanguage">
      <property name="text">
       <string>Default</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Icon set:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="0">
+   <item row="5" column="0">
     <spacer name="horizontalSpacer_3">
      <property name="orientation">
       <enum>Qt::Orientation::Horizontal</enum>
@@ -56,7 +49,7 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="0" colspan="2">
+   <item row="1" column="0" colspan="2">
     <widget class="QComboBox" name="comboBoxLanguage">
      <property name="maxVisibleItems">
       <number>30</number>
@@ -68,7 +61,7 @@
      </item>
     </widget>
    </item>
-   <item row="9" column="0">
+   <item row="6" column="0">
     <widget class="QCheckBox" name="openDirUsrPath">
      <property name="toolTip">
       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -78,14 +71,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QPushButton" name="pushButton">
-     <property name="text">
-      <string>Default</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0">
+   <item row="2" column="0">
     <spacer name="horizontalSpacer_2">
      <property name="orientation">
       <enum>Qt::Orientation::Horizontal</enum>
@@ -98,14 +84,14 @@
      </property>
     </spacer>
    </item>
-   <item row="8" column="1">
+   <item row="5" column="1">
     <widget class="QPushButton" name="pushButton_2">
      <property name="text">
       <string>Default</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="3">
+   <item row="4" column="0" colspan="3">
     <widget class="QSlider" name="horizontalSlider">
      <property name="minimum">
       <number>10</number>
@@ -127,21 +113,21 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="0" column="0" colspan="2">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Language:</string>
      </property>
     </widget>
    </item>
-   <item row="11" column="0">
+   <item row="8" column="0">
     <widget class="QCheckBox" name="checkBoxConfirmSave">
      <property name="text">
       <string>Ask for confirmation before saving settings</string>
      </property>
     </widget>
    </item>
-   <item row="16" column="0" colspan="2">
+   <item row="13" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Orientation::Horizontal</enum>
@@ -151,63 +137,35 @@
      </property>
     </widget>
    </item>
-   <item row="10" column="0">
+   <item row="7" column="0">
     <widget class="QCheckBox" name="checkBoxMultimediaKeys">
      <property name="text">
       <string>Inhibit multimedia keys on Windows</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="QComboBox" name="comboBox">
-     <property name="editable">
-      <bool>false</bool>
-     </property>
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-     <item>
-      <property name="text">
-       <string>(Default)</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Orientation::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="6" column="0">
+   <item row="3" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Mouse sensitivity:</string>
      </property>
     </widget>
    </item>
-   <item row="13" column="0">
+   <item row="10" column="0">
     <widget class="QCheckBox" name="checkBoxConfirmHardReset">
      <property name="text">
       <string>Ask for confirmation before hard resetting</string>
      </property>
     </widget>
    </item>
-   <item row="12" column="0">
+   <item row="9" column="0">
     <widget class="QCheckBox" name="checkBoxConfirmExit">
      <property name="text">
       <string>Ask for confirmation before quitting</string>
      </property>
     </widget>
    </item>
-   <item row="14" column="0">
+   <item row="11" column="0">
     <widget class="QCheckBox" name="checkBoxFullscreenFirst">
      <property name="text">
       <string>Display hotkey message when entering full-screen mode</string>
diff --git a/src/qt/qt_settings.cpp b/src/qt/qt_settings.cpp
index 471558e22..19a537652 100644
--- a/src/qt/qt_settings.cpp
+++ b/src/qt/qt_settings.cpp
@@ -95,7 +95,7 @@ SettingsModel::data(const QModelIndex &index, int role) const
         case Qt::DisplayRole:
             return tr(pages.at(index.row()).toUtf8().data());
         case Qt::DecorationRole:
-            return QIcon(QString("%1/%2.ico").arg(ProgSettings::getIconSetPath(), page_icons[index.row()]));
+            return QIcon(QString(":/settings/qt/icons/%1.ico").arg(page_icons[index.row()]));
         case Qt::SizeHintRole:
             return QSize(-1, fontHeight * 2);
         default:
diff --git a/src/qt/qt_settingsfloppycdrom.cpp b/src/qt/qt_settingsfloppycdrom.cpp
index cc58d3cde..52d737ae6 100644
--- a/src/qt/qt_settingsfloppycdrom.cpp
+++ b/src/qt/qt_settingsfloppycdrom.cpp
@@ -46,11 +46,11 @@ setFloppyType(QAbstractItemModel *model, const QModelIndex &idx, int type)
 {
     QIcon icon;
     if (type == 0)
-        icon = ProgSettings::loadIcon("/floppy_disabled.ico");
+        icon = QIcon(":/settings/qt/icons/floppy_disabled.ico");
     else if (type >= 1 && type <= 6)
-        icon = ProgSettings::loadIcon("/floppy_525.ico");
+        icon = QIcon(":/settings/qt/icons/floppy_525.ico");
     else
-        icon = ProgSettings::loadIcon("/floppy_35.ico");
+        icon = QIcon(":/settings/qt/icons/floppy_35.ico");
 
     model->setData(idx, QObject::tr(fdd_getname(type)));
     model->setData(idx, type, Qt::UserRole);
@@ -64,12 +64,12 @@ setCDROMBus(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint
 
     switch (bus) {
         case CDROM_BUS_DISABLED:
-            icon = ProgSettings::loadIcon("/cdrom_disabled.ico");
+            icon = QIcon(":/settings/qt/icons/cdrom_disabled.ico");
             break;
         case CDROM_BUS_ATAPI:
         case CDROM_BUS_SCSI:
         case CDROM_BUS_MITSUMI:
-            icon = ProgSettings::loadIcon("/cdrom.ico");
+            icon = QIcon(":/settings/qt/icons/cdrom.ico");
             break;
     }
 
diff --git a/src/qt/qt_settingsharddisks.cpp b/src/qt/qt_settingsharddisks.cpp
index e679dafa5..ded50ac34 100644
--- a/src/qt/qt_settingsharddisks.cpp
+++ b/src/qt/qt_settingsharddisks.cpp
@@ -81,7 +81,7 @@ addRow(QAbstractItemModel *model, hard_disk_t *hd)
 
     QString busName = Harddrives::BusChannelName(hd->bus_type, hd->channel);
     model->setData(model->index(row, ColumnBus), busName);
-    model->setData(model->index(row, ColumnBus), ProgSettings::loadIcon("/hard_disk.ico"), Qt::DecorationRole);
+    model->setData(model->index(row, ColumnBus), QIcon(":/settings/qt/icons/hard_disk.ico"), Qt::DecorationRole);
     model->setData(model->index(row, ColumnBus), hd->bus_type, DataBus);
     model->setData(model->index(row, ColumnBus), hd->bus_type, DataBusPrevious);
     model->setData(model->index(row, ColumnBus), hd->channel, DataBusChannel);
diff --git a/src/qt/qt_settingsotherremovable.cpp b/src/qt/qt_settingsotherremovable.cpp
index 1a6dceacb..8a810a4fb 100644
--- a/src/qt/qt_settingsotherremovable.cpp
+++ b/src/qt/qt_settingsotherremovable.cpp
@@ -46,11 +46,11 @@ setMOBus(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint8_t
     QIcon icon;
     switch (bus) {
         case MO_BUS_DISABLED:
-            icon = ProgSettings::loadIcon("/mo_disabled.ico");
+            icon = QIcon(":/settings/qt/icons/mo_disabled.ico");
             break;
         case MO_BUS_ATAPI:
         case MO_BUS_SCSI:
-            icon = ProgSettings::loadIcon("/mo.ico");
+            icon = QIcon(":/settings/qt/icons/mo.ico");
             break;
 
         default:
@@ -81,11 +81,11 @@ setZIPBus(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint8_
     QIcon icon;
     switch (bus) {
         case ZIP_BUS_DISABLED:
-            icon = ProgSettings::loadIcon("/zip_disabled.ico");
+            icon = QIcon(":/settings/qt/icons/zip_disabled.ico");
             break;
         case ZIP_BUS_ATAPI:
         case ZIP_BUS_SCSI:
-            icon = ProgSettings::loadIcon("/zip.ico");
+            icon = QIcon(":/settings/qt/icons/zip.ico");
             break;
 
         default:
diff --git a/src/unix/unix.c b/src/unix/unix.c
index 81312d25d..c41aee2a4 100644
--- a/src/unix/unix.c
+++ b/src/unix/unix.c
@@ -73,7 +73,6 @@ static int      exit_event         = 0;
 static int      fullscreen_pending = 0;
 uint32_t        lang_id  = 0x0409; // Multilangual UI variables, for now all set to LCID of en-US
 uint32_t        lang_sys = 0x0409; // Multilangual UI variables, for now all set to LCID of en-US
-char            icon_set[256] = "";                  /* name of the iconset to be used */
 
 static const uint16_t sdl_to_xt[0x200] = {
     [SDL_SCANCODE_ESCAPE]       = 0x01,

From 8b72c84c028effa55f4751f25da0c51ec1603ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?=
 <13226155+dhrdlicka@users.noreply.github.com>
Date: Sat, 29 Mar 2025 00:13:10 +0100
Subject: [PATCH 18/59] Use indicator overlays for status bar icons

---
 src/qt/CMakeLists.txt                    |   3 +
 src/qt/icons/active.ico                  | Bin 0 -> 9622 bytes
 src/qt/icons/cartridge_empty.ico         | Bin 9622 -> 0 bytes
 src/qt/icons/cassette_active.ico         | Bin 9622 -> 0 bytes
 src/qt/icons/cassette_empty.ico          | Bin 9622 -> 0 bytes
 src/qt/icons/cassette_empty_active.ico   | Bin 9622 -> 0 bytes
 src/qt/icons/cdrom_active.ico            | Bin 9622 -> 0 bytes
 src/qt/icons/cdrom_empty.ico             | Bin 9622 -> 0 bytes
 src/qt/icons/cdrom_empty_active.ico      | Bin 9622 -> 0 bytes
 src/qt/icons/disabled.ico                | Bin 0 -> 9622 bytes
 src/qt/icons/floppy_35_active.ico        | Bin 9622 -> 0 bytes
 src/qt/icons/floppy_35_empty.ico         | Bin 9622 -> 0 bytes
 src/qt/icons/floppy_35_empty_active.ico  | Bin 9622 -> 0 bytes
 src/qt/icons/floppy_525_active.ico       | Bin 9622 -> 0 bytes
 src/qt/icons/floppy_525_empty.ico        | Bin 9622 -> 0 bytes
 src/qt/icons/floppy_525_empty_active.ico | Bin 9622 -> 0 bytes
 src/qt/icons/hard_disk_active.ico        | Bin 9622 -> 0 bytes
 src/qt/icons/mo_active.ico               | Bin 9622 -> 0 bytes
 src/qt/icons/mo_empty.ico                | Bin 9622 -> 0 bytes
 src/qt/icons/mo_empty_active.ico         | Bin 9622 -> 0 bytes
 src/qt/icons/network_active.ico          | Bin 9622 -> 0 bytes
 src/qt/icons/network_empty.ico           | Bin 6950 -> 0 bytes
 src/qt/icons/sound_mute.ico              | Bin 9622 -> 0 bytes
 src/qt/icons/zip_active.ico              | Bin 9622 -> 0 bytes
 src/qt/icons/zip_empty.ico               | Bin 9622 -> 0 bytes
 src/qt/icons/zip_empty_active.ico        | Bin 9622 -> 0 bytes
 src/qt/qt_iconindicators.cpp             |  33 +++++++++++
 src/qt/qt_iconindicators.hpp             |  15 +++++
 src/qt/qt_machinestatus.cpp              |  72 +++++++++++++----------
 src/qt_resources.qrc                     |  25 +-------
 30 files changed, 94 insertions(+), 54 deletions(-)
 create mode 100644 src/qt/icons/active.ico
 delete mode 100644 src/qt/icons/cartridge_empty.ico
 delete mode 100644 src/qt/icons/cassette_active.ico
 delete mode 100644 src/qt/icons/cassette_empty.ico
 delete mode 100644 src/qt/icons/cassette_empty_active.ico
 delete mode 100644 src/qt/icons/cdrom_active.ico
 delete mode 100644 src/qt/icons/cdrom_empty.ico
 delete mode 100644 src/qt/icons/cdrom_empty_active.ico
 create mode 100644 src/qt/icons/disabled.ico
 delete mode 100644 src/qt/icons/floppy_35_active.ico
 delete mode 100644 src/qt/icons/floppy_35_empty.ico
 delete mode 100644 src/qt/icons/floppy_35_empty_active.ico
 delete mode 100644 src/qt/icons/floppy_525_active.ico
 delete mode 100644 src/qt/icons/floppy_525_empty.ico
 delete mode 100644 src/qt/icons/floppy_525_empty_active.ico
 delete mode 100644 src/qt/icons/hard_disk_active.ico
 delete mode 100644 src/qt/icons/mo_active.ico
 delete mode 100644 src/qt/icons/mo_empty.ico
 delete mode 100644 src/qt/icons/mo_empty_active.ico
 delete mode 100644 src/qt/icons/network_active.ico
 delete mode 100644 src/qt/icons/network_empty.ico
 delete mode 100644 src/qt/icons/sound_mute.ico
 delete mode 100644 src/qt/icons/zip_active.ico
 delete mode 100644 src/qt/icons/zip_empty.ico
 delete mode 100644 src/qt/icons/zip_empty_active.ico
 create mode 100644 src/qt/qt_iconindicators.cpp
 create mode 100644 src/qt/qt_iconindicators.hpp

diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
index 90ea218af..e6e45fc25 100644
--- a/src/qt/CMakeLists.txt
+++ b/src/qt/CMakeLists.txt
@@ -194,6 +194,9 @@ add_library(ui STATIC
     qt_openglshaderconfig.hpp
     qt_openglshaderconfig.cpp
     qt_openglshaderconfig.ui
+
+    qt_iconindicators.hpp
+    qt_iconindicators.cpp
 )
 
 if(RTMIDI)
diff --git a/src/qt/icons/active.ico b/src/qt/icons/active.ico
new file mode 100644
index 0000000000000000000000000000000000000000..9569a3962ba1d76f735492b689bfd8fd1cd95839
GIT binary patch
literal 9622
zcmeHMy-ve05Wb2Egc#`1p<6RD@&<I`IhYWS(UFnIU}9#3H>uPeF)|>`_t`ncazmBG
zNh+1Q>f-q4?(8r2-N_Z1$W&%CL0QPdROD7f=JQa0Jr#LD+hP&wkLM!y7a~Ow>d%n-
zz}PFu;1wD|I|^ArE|VPOmD{RvvWBd3(9=u@WJr*%e$>-c$D!r9%5n~VAzVwCf3x-L
zD9R{no0Wz@1_Ex2&G-&pN6b3g8xZ{r+>Q4)^jD-O_^6&p&v;yRRb8DOJwxFPQg=Io
z94Ycf)q5A6rY{dae!UXIbjx<~v$`AjEmPJ$D-8idU^E2W*Nt<ZOXoJ1yUcd>w;;wX
zq|kB=*0^<tTzUYCW0$`7WoFku(O-$@JR9owD$iWK<=TKesWyIUYmN=mzyI40jSsEw
zvEjeH^s`6(MoJ!8F+W8P>#!Uk1;y%yfFbZ75OD6yxt|l~z9-1B5VuoiJNr4V12GRP
zz$>ukVQXGojz^j=#pM{*gT4CrqH`H)9#u@!d@C+>PJP7abOq2&+MD}nFXz$s91dx}
zjqM>YF#FB--ZA3Ov)E=2VC+$yKdzrtV(^zA@|%P{Dy%=q^!=pnXdY_Q&#CO|+hnai
zwH24O1Fg{zFa!(%L%<L)1Pp<35x@n+5`O^Ul3|0(hBsU~keNWGtbH8E@s!J_Uun`g
A*8l(j

literal 0
HcmV?d00001

diff --git a/src/qt/icons/cartridge_empty.ico b/src/qt/icons/cartridge_empty.ico
deleted file mode 100644
index 9ff90846e3c4d572be3937d43e5bca249e6d21fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmeI0y-piJ5XUDHiWJdMP*A!|nMa`F4NjDfTts;bT&Bz;xS&8TprymlLy^u+r06nx
z$4^?#-m)KOz_RZo>whyl-?KNnvdAYnk+U;VoXO7<kt-27Kkw<s&m#BAySV7-UtdIi
zoQlk5J$<Koe^mCX>gcOl==lnAsd^bt`yvy=sEOrr+3BP(YCsn@n@wlqcC{Kr6(O#`
z41Qy}tOtr71OFDWnd2Wni^Zag6@>4(3tsWt>f;tc_>L7Qy)dv3;unM;(|3IQ;1`6i
zBJbj#n86bN^oo2f=H!nJi#hpQ9cbcsYybF(q3?e?Z`<dGw%uOWp_?;0Zn}Bn=9PPX
z>x{~H*hje-H5tn@#g7`)1@;@gOQEWeM_`sXQZ`seJ}~4lY<$obu~`xy-<(Bkm&Avx
zwFSK|@iFHtPVsr0&U>|cfqq)tm-^Ybpljk|Pg}$me6L)=EA>Msg=*kK=gThQqb|AV
z7j4_<`Lxz^s=3(-x^qjf(DF@xoLk@ZE}ikvhgyuf$gN9CF6uxRO81@ZyP6>HzzuO(
zom?9Iz_7=#@k6JO7)s)2Mx+qmCGjJhvd#K2#&6H!7=6t3kJZHTk8%I-?WFLS_fM)e
ztk>)xW?Txfjhr{`gI9WmPAQhm|5Drg5<hX&qF?lFGuQjpgWkKY-vr$~Y^J|U{c#Ul
zx<4-SAMPW&!femA^-bwz2cUvuzX!X=)g*OHhCv?IMlFrKq+?HD%74@Ki<(o9Qbd1D
z|2Zp4kyyv{AKg;l$WQsN`0hdPD;s{L=G2Z_mg1rG-`=@%=|joCwC~6tO8&Y1wsMD(
zKm9DlDgXWqXPypE+hMM)U1{x+XNIenY5otFI^fbTY6o44RzGm`3WNS*V=Stx>i&=Q
oP2FBeH&~kT?`Ox@+M{37fBLp744SNre@%1qcfEd6oPPxV2L@}=i2wiq

diff --git a/src/qt/icons/cassette_active.ico b/src/qt/icons/cassette_active.ico
deleted file mode 100644
index 32fca20b4bb41aefbd3a03a22c94f0098882b7fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmeHMJ#*YP5QQe5crq^JLWMi4OqqXRSN<KYGWi)SQ|4#5a_#c+Pc)N0@z`hi>_|c0
zTj1fAAViTo>c$_!4Q`3WzV{YO5<F2MoP-DA@#6q{9)5ce!ix~X*;yLD`7wmo@I85w
z#=rj*!mp1)I6qJ0SHS&^*q?#HAsCV$COil3z!rg5pGy@(2dsMH5r;V278o|5_aE|*
zgLXn6!)s2Kd~BP|rf`=zWkAi4v`Z}JZffGxyyfih^3$3wxV)u*u+EJ4e#X_UHShIx
zOdOA8yRIw8T&w)DTEFlb`+0xdn)iCf1ASk2`s%TGWU2A_avMKgzKgr<HeOwRh}-x7
z#E;we@n0P8vc2A2#;eaC;x)R<IY@W5MFL-Yi+`bbf5ynu&Qp9_?@n0led9iZ?Z);S
z?pJJoV2@g<rF#rXflqxY_3-}b7IFf|2K4aL=Ty$)b_ySPXY^b1lV;fOGX<09wEs}I
z%+)K#oSmBrBdh_duQ`0Iu((ET)~}@Y_qof@$B5JWcx-;It<^*FGtSR*%vP|7D|;yG
z=D1R1#@Bopv-RpkEd1j08ok&YSFjobE1$=b)9}iVaW2+!cH@HW5}%EQ%|2q9e#JRH
zYAJTERi3i8kORNUdO>Q(ZcU5F<hpMMRUq!3#rXDVj2EYPR-NJ+o!+|uT-Es8!cXY%
z3%Z_LFY#OY4qCdOc+KzoS~9&orCgs$=P(Uj_q=E859bci0G@5Y>pgu9=}oh9_^Gp?
zPtIStg#A8Ouz9ZD_n1$K@ip<sh_Q3f;2>6<;?mgc0)Cz=&tVCUd`Y);jtR@xPyd-z
zY1Ep7ab8EAMme7W2)9-rCob=69TzU}=vX!M_1B#A$VCnFBM&~e*@@LLV+vR1r;klI
z@oB6%+JYV7_c?g1_-g*%nq2<nd_hacbq+l&*TYy?(-jx}?D&-Y<!jkST)~Aszxfoq
zf*sTcT5D;jF0xjjmA^{<5V7M{Z4dR4`@VhC6^QX+jQ{-*;}!n!-(er)J-48Dp?YzU
zuXp|qJ4b(xuHRuDUtAuqwbpYC^|C(>?$3RF?<$Y92lM`KeduRTd90fQc-fk|wf8P^
zI80wPS!U;Gs}`yO?FxNz?Hl@r4gKdJeR?i3KR=dVR`Zk2{SEr!^44og!_QOC#yP)3
z^b40bVcA;#f#wSO&2{A*ERkEjRG&#TK)!houxoF0ovt1?<v6H^Rc$1bhW;q`%pA0y
zIs=uEwXz<PRlIUgoUHtlY~~i$Tj?5)Y5>b7?vfXCLst_<<1uUNCV$n1Df84o44e1a
z7;`<#2=c+NzjK(Ax_rbaSLI(@KQH~BFKZB2uru`iT8L+EH*rbdV|wcb-o{Q}TrJC3
zzZS!aBU?W&{o?D=nhQ6_`1I!K8|%uo!DT#}4~a+XYidY)fvt0tcF}SAy}1QibMcm&
z(=RnXg7z1=e$--a4VT8-wcVlOuKv6RkJ-xkM-ugQdbBaM@7sL^zT*nu1;kVQ0|+l8
XF7Ps9gO>@LlWygDfUo_M0vpc%<msPl

diff --git a/src/qt/icons/cassette_empty.ico b/src/qt/icons/cassette_empty.ico
deleted file mode 100644
index 16c6e8457748dbb75f7d57531e469d8c0753485d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmeI0y>8S%6om&VLP9htQl#9Hl1E6z8*B{~;xV?Q<S~#VK}(l?iM&P%ewKiU%su1%
ztl`G9W3SC>A->Y?@%=w{Y>zF6@F<*w)6-zM2yae8co9N4J8Se$k3;xiw)68wfBPha
z*H1%OEE@g2<=t59Gt03<tI*gD!iD7>vD8~`LouvYtC%wstzS*fdcBS{z}iH7a(?WJ
zA=c+&2l0bSr4BJ5F(7u3JoV=oBnHF|Vo&?)cvr2QKg}T~tzYuPX<t-*`u*5^jx+q)
ze2e(~>z9bPTfDp7ME&k(<A-m`aVQVv{>!4ZlUy(Bx~l4WSwO|5qJ74;o4DU-zmmMO
zJ!+P?0`YpYqp=u<UYDhKvD0}J`aOnR>|V#N63RDe_c44RJ#t7KNUvDb@grs^cJYG`
zwa~$wy^9|<pR2y<9K?adr~JH+80;YY&^@Mo;Xw?!*nJOgm+o_OddZI8YTmp4;MEu5
znet<neKF<7@mSQXvy58-olm5yuIxGW(w<izd*T(TE$X>tuh8MS{djJ@vUllOj&=pw
zXU&%3RC*YDf9LXzXS;9eSiJq-rVFymP8@!EU`JOjG5AV)E)F}W()7Uw(xWeu2U53-
zKQUvmi$8p+jh@3?To-?A)FM|rG$($LICKzu%HR8l!4A^X>p2eMMJ*pgE$kl2qZfYc
z((zF%r(^f%^Ss}BwET&k3RC_%R<EgQGly!jUQ?q=tG<MOQ)5$o{{LTBK-Xj{*Y<&+
zvJVBzfvCJL(R<j!ei!!RJ#3{9m$S?(aC|GketKy9Yx{TK=YdXz?q6Z<8Az?1-`h*|
z)KdLS?!8C&TIeMXB|mjQ;v<R7{G~ZcetOW;W1soyF%(O^@$Z`7^PO7nGyl{*skdu>
zzt-gJi@ADT^C!IGJwh(M(Mw3YdgvUR{82CI)87Bsa<%b;^Z>n`o*s#pJ(q)>+%(5*
z0Y7$hxTBK~cK8R+PpurnsgEC?<e-y_?)}(HNFC7EF?&0|_fZ@BP$VDp`D&f>`Piv-
z`gYAfb+25#hdRIJ*1DUt=b!uXP?(;7jt`B^63qYe3Ow8u(EaYkzC&EvcZj87H4$F=
H9_YUTai}4j

diff --git a/src/qt/icons/cassette_empty_active.ico b/src/qt/icons/cassette_empty_active.ico
deleted file mode 100644
index e1bf61f612a9628a4416efa842d21d04911c7f65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmeI1y^b736oqSz0U-iAFp{&~&>?TYk`Oy^$2dYfMu!gl2o9}5GAS9uLu_t|93g&|
z1=$qmRQK0YQ`0pwJ=43A@!nDInR{>Db8c1lRJVFVI0<*d{rf?97QVe3!dD@L2M;>`
zhmS&drP#xVo&W5U5We{|gtN2Gf2q1(H1?5d^i>R9ToBGxccewtb4;a*p;awM$CGoI
z*S3kOu_?3qn5Q4xwr#4Zp*3su)GU|F!~v%95=i+i^{HX^CM#><NZ51uyDhDQ`bR&-
z!~wzu4mIL&Ep^uAI|v6z93*ZzV*b93tCr7e7?bnw%A<cMnjgKtFMmsOcysw@!oU9b
zJ>gZ4Z?7(s|Ms6QPrrGOQ~Pl3yKM1it=>;DUT75;ZHx{0rTm5bW*sl&=jMGz+fCYU
zykFU#Ymb`Ae7?%#Q0mp*({{fheuI+<Rc{l^=EvM!&!$b++fLkrZ_;(S2VZK=bC9j=
zG4jzOKDvK0b7`q$*hi=V(>i%Tua)q?{@@(Np40rfagNJ5d5qc$aN&a~F3wb+Av~^S
zEHQjIJ!EWLIo{)lfpCGuK{W77%ysF5G1L+-HOjdCvbN^$ijx=TuzvJ273nkYkGUL*
zd4GIA7CqNnJ8lKy)fX}TdK%;FdvWpNUTn?_e0-|=)%UtzeLaFd`f^w^-?#J#9X{8=
zee0>7rLV!#{wUrY=aSjjpV;q?7HIpuk9|Hz=eqeECZl?rSn8imjkK3$x^;gd|J2|2
z*83qd>idVAzRNu>t%H(l@rnJH9J~BO`d{nMlaUFkxJ{$4<@^mCrN%BF4fEyZxO<ar
z+_yZ=3ApiVn7GWBAF9vJ>(D<jxX^GP)+7%y4j&}$I$|I>kT{5D>DPL2UvQOU;38fk
zb!d?%Zl4@nHJ^BiWnGz<#?U`w=fb>yf4A0L+|0wAtk>LVYV+IBn;Sd!+rR(U6^QZU
z82|ks#y2N1UWIt^IK;)v5F7BxiJrIa=(+1d;X>Gq;)P!%jF_Lp&UBpX;5n@Ii_4oc
z|3=E=Ce%C4R@&vU>gT%pSZVUSk|X_eeazc~xNVyC?vMMJyNBcS-H+`soTAO@sK$D;
z?Au4^r%C&~$!hmNdaUJro$r0_EAy{$6W`jy5&GNapXRh>UC3YO{L$EjlX}p4X<A(C
z!*dF2eGpDL2P^&I`aejsJU4w0X|1@<GIZSLwc>gjJO62n7sz8vja|Oymi1u{%yA#g
z)e`hU4Bt5&8$FmSkJo&()-dDCbOsG#HBRy%J%eT3a_&{OhKzT-RzsZHyvBs&iR05d
zKK0;8e)9a`sv$k?lc!H=@TtWw^Tc-{JYdPA_%Q!62RHGlNIh8ATe_Aj$Ik7eJ2wBh
zwQ79t>-;@$ue)qG|NJg*3iI>N_nXFU32y)1uE6`d0(t>)s(%3KWyEW}j9BVr#PVdZ
iXhYM4u#V?_-1y>7(>(c1?<E#`FVXCQ-+5mdv;P2p4U^RX

diff --git a/src/qt/icons/cdrom_active.ico b/src/qt/icons/cdrom_active.ico
deleted file mode 100644
index 6f2ef197c3da30ddea55518fd0e3e5edf371daef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmdT~JB}SU5ah!OUKlnY1qzhyh7NrI1MA4}F&r5_g*D0?`WT8FD||<JConeLV4-nU
zH;dEcaDHzE8|Fg~XUOiV>LzF2>?fsDdX?V1N$Bs>Z?97NDW&xGtzUooDy6?L_U@fu
z|M7K7zkZX_{k>m*MBLx-{SGlW1%i*GOFtrRXB*+SWpk)u7!z%r8c_U0ydjw5PZ)?}
zW30@tJ*J!sk66M8vF^vCH+UH@uk2jMCZ4+8$2xea--u_vG`P<&^4$38=b|CQ+O_Eq
zu@wf#J->kOTC9%b<9y~&Z0S`SI8}a;Pw~Xc=2{E4N6Rn9Mt+<#&SEo;>2eLGkuGep
zR?;<#r5`^bH;d%~tzale>EfK3MZ2alhLe15y<(YRCtjKqQ|gm3Ogm%M3P#P{#v4xL
zRy_NhZ{)7xRnHjHJI^@6D}BfJ>1G@+r*S+(*pLl0*jwXx8r*a}z>juj%<VWn-Hjuk
zGkDzC^M=nWwm<QVI@qSY4l=~9*)p{9M$sVO44pN@9Dv)JbJds~9O9`FgUwgEITAl&
z0?U0TP0}XJqj)9GG)%Zg#Ie2la-Pzs{%U>1GyZ{4rT!W#`*4rGfTeh08jjakwJtdu
zaX8p|(>LcTtkQGbvFbfwF^p@Bc?pl_9i7W~;9^W`5wD$F)prcfp3i&m+MF7FdOnpr
zCQQ}R>Vj0(>w~x%7OG<(Vn!oaZdJ{xO)cXUU95EeUMjIT(LBd^&Q>rZ9&xFG^ZB!e
zSFj8bF)dcXbF>!AbQqWGYISz;gqd?U%*?-pmvN@L5u?{~{R3RCMb_u}ZR51q8Mj(r
zj;*xM>0x|IcjG0!#&?z5fS#6UkB!;f9p>-g|6q1W@5d*6e|^Sx7r(dg3Z1@(>3i!J
zyh~r%sJ&-|TN+=diZzN0fOFqH8FxV6nsYAW6Weg+`;1hEFU*N;I^*0D#|F0HBfjuV
zsP$QoV*y*a6wGVzGqz*Yb#b*O*)<-;CpJvj>ZMzK8NUV}!K)lugWq$Wk*#xG_30|s
zU$H$7&84y@d~dAeV0pTKdFQnn5Ub%Zz4EPhwC#IhwaxAa4B8$In8GeS=la-Un%`T<
z%i>#nUbnUjKj+-W{>S+I9$Be<s1Nin)tI%_T*%L`b-i38i-nuDf+M^bm&f#dTCD@;
zCSR?$k71mR{%jRT+!yp~f4-%E{*+pYi@nVUY!aXqjt+i|iP*;N;T3N5H*EQkKjL$>
zDosKM!pi$m#OFDijkVa?4aU*ICP!{9=InY2yTj3HC&dgej%{HFj)EPuuj22;4ji^7
zs99{4e#e}zr7-sPT$i5hh#x=Pj?d`^?_Q_z5qd7LGi)e!8q*J0^WPi8*nk+>85oyz
z3yjzH9`}rQvhjnzhutUqZW5;Vuz|n0e0fvdmU=Pt<~4V$k2S`k#<kQMm%9V?131>D
zW18E`F5ZSy{NiSB{E^p3>Z3Hdj&&8}Uf_-6(!hM#Ovl!dI@UBC<Tl<f#lMqVH8{+z
z+VpAwZo|Vt_-nm6)Ava3OZ<WRsD>}a&u5vq)&DE`bIoZWy+*@}^AFs+HAr*m8F}UX
zCybo`ss{P`{j2-<*dB~~Uw937R|9<~-uC%bG%VGD<7`|n!zUIoZEU%>Ao)0d%dKn2
z27a#@uegaP{v8@j=Q?-LfLzGa8abnhKaMS(Pqi1%Qa{yn2}|Su6Mnuk9<TrMek%KI
zNB+jGdTp<P>4dwr&Aq+BUvUF5)PQ@pZDl``Tz9~#2J*9M|K~W1WzEBNIj8Sb2j^5C
z0cTT#xEp@`d{Fpi8lagU=}<rOqk@$>H2mV7)jVUk9_Kb+LvQZq$~SP!SM^~Z`Ew2S
za8tn%e(Gi`eUH0Y1J5<)=6M(H@Uz?8H^xopm4-HV^0TQvS+8SH+%MrT`7d$1f=0sv
z_Z9hDE?eA{hMK#VyK1^?4fb*`Xs|uUyhHB0`Hyl(4Yntcp}3FmJFh?Egn3O*4cRvH
zpEzI6+tV7fNK@7KVphh+$8Y(^oZHVS-8|!01y3;iJ|bOU=WGLd*ol^I&MDnq@TVbo
hMdKLehU~}wY$NFgGq>~x_8mAL!1dn#;Q@bJ`Ul!N$y5LU

diff --git a/src/qt/icons/cdrom_empty.ico b/src/qt/icons/cdrom_empty.ico
deleted file mode 100644
index 45580999cc66d4d9a75aed03ff9fc268592a28d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmciIF>d5W5Cu>gSQs#zY_P$G3LW|g8~Fx=LOC*g2}24U`Uo31ut$KEI`Zlgy2J#|
zln9XMYL4D)tA<T-BzYSUKD+AI|J6;3q-NB0Uv+P~w{N?^lkVp?UH3!Rb?@Ho=6`?P
zb$><d{rlbg*KfM+r*FIN<YYJhBkKMQ?sriWhoP{G2Xr5z?uaowax*q1E-o%c?)CNc
zh(nA*{{7>}MU7lbL#;Vp-Gmqp<ZqsNYc%*z)LK&~2eV&}%ZL9U*TTXneX7Y=ax=9h
zUB;+^N2A1Z%v?<=E<;=`EIG%S6R9V@`FxbT8b~YeyIP1>{FiER)xuJ1;6R$V;^tAe
zKmS=n@3?B=R4om@Fl)@!wlrwT*LZ(64BM+=xH%n$&1GO8xEY2%@Uq~|=ehhgc(=j7
z`!o#YJ`=Z_@qSb8S7rPb_o!zK`<ZdIly%x?Xb(e(_M+yJmUE0Zr_EnK8EJ{nY09-U
za~vPm3l~!Z^^p-D%Ga7=w4j<6s;l==3}&s0JDykC_^|L=Iq`Z8kH@1Xjf{npW9E^X
zyv}&x!NPCl#EV}VNB380&Gv@}!}p*+xq1zc{f*l4EiBxeqviJ@=kxiOfAk$ejF!1t
z@r-yOa<DhJxvwS7DJ?$7YU!a~t7Do_Ur;Ta>Wfy!tVshNqeYu$M)@fm%JZf?clz^T
zyZIE)sq=VF6+8>P8v5J7y9&qnE|0&B=h=Nc*B;_|SDst(3f+AlKb~7Z#=G<jhU+Hd
zvnB11y>>obJ0bjRFPa&7i0h&9T3nCXjI{Mn8?N!lnt9&R#+&oNX`%k*^=%HPJX%~e
z8JGCA2QJK7=JHUyh2gOuYM>hPAU?Sk#qly${0=vxnwq<BC=T%PGL|}=7PhqcsLR^s
zh37b<T3Qo0?pdxg5B|P?v5bW?p}P<1A=jA~qT`He_hN?!qc>j0pfC2X=1_XKF28el
z8B1M`&8)*-J?R@i>(o8T;lic+4IZQu+Is24aA4N97xFEnH`o7jwRzUsj`?P7@wNTa
zn?hRI<2AJT@qo0UJ;<nj4bp}!?a<m^Cu?-4I6N{=adT{lzyBZNJ?lQ+r|#lC>$X3Q
z_pi%%@9N{d>k<Fi4E=e`A1eH%%8$HKSL%yS(L0Y17<TVrCt>;_e!PcWln*XnKI~fy
zU+$0;^8V)Q!#Q^CM!DXS((zN?+0#6G>p|U1df~Bzxd-0xIXx_S%4ctJ-td?nXskth
zj?WW{uj#>h)GQ&s9(clBKi2~-m}^_}wchHddeAR#sHTOPN2kRXj~@0T*U*G&mN4rq
z@SofxGM6{Zd0rVauQiXw@BL|HE^jE0Uule5;&@9~PQX$PZ&-Pj@_IbGhowGw>$Nsb
z$72smdh$`b_#TbB!dolH_R#TI!qP93In?VKy|rAtIp4?JtFOQE{^INBZ7*YuvpwLu
zX4SQ@>{%;EOWwTIgFJ7jK4YzubF^CVs&?Fu%;ycWPF3IK+C0y-YoB+#Vb+Nr_Jb$P
zTyx$nO+1JP#l!gEI$G<Emo;f;#DibbTQ9ufe&eeH>rw;lImDxdw}kkW<-s9sT0EgV
zExfgOU^o%r!4rz}hOg<Z9bVa6{QvY`>VY?Gtv_@Qe#dAZi`ETW-j(O8dFNjB(8A20
zn-B5*&iD@seSiKCU;Nzn{n=f7@pIevr`z}-B0i5e-E2002KIrM{pn4=x!P{}v)jPC
c&v+X1%k2iQp!&d~S9FVh@!9=DM0~IGAARs@lmGw#

diff --git a/src/qt/icons/cdrom_empty_active.ico b/src/qt/icons/cdrom_empty_active.ico
deleted file mode 100644
index a48371bd7b0e0775308bacc103eb0cfb7bb16f8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmchdzi!+{5XSdxCq|IME*!v}Rl3X@<bnXHU1XsqfKml{i9k%}GLN7lg+T$iHdU;b
zxIXn2L5f^+z-cqH<d2>ka`{J6OoRG%XTSNr+2tNdpA^C>JPFUA2f?%O(~}Us4I#XE
z(e(fLG=$$J_VQ)ZfBRVoKYkv<*;&(nCwYGh_qF6mQxuxGKv+xOf+MwDi`wSwNmW&q
zxi>dA8Iv4J`t9nf$*Cllv(f1^d@dR}S8}pel6?NDPODMM#a}(g^0kPP#u9(8K|f<#
zLoP&q<aLnxPdKIy;><CxhiI^VtdFgo98kyFBVPyNCb#n^21oL84g$pCfjUmxbI>53
zuYuv~IAb7M?Vbt5$pztwM#mxMbBU7+YAy#H(EAcMxhLzRI&koZOB@txFPA#-1--^t
zZb<_z#w{MdNon^>N?ZAe)YS)!U#E0krxdpmSB!$!GA_6i+@Gg(c%PEqXXJL1?>BnC
z(&JaTN8RCIO)P5LpG9fr$vT7W8g`!@K0|y4hXhBps)75-z<mi_e+{V%)H*T;4U00?
zu0fWgu99Ys&(!l;CCw%EF(<S@yfV(L4=vDZnRUt6R>%FpHO3z;kT}=M;NX5CPkFRG
z$`E_l$o212<SCyzh=IgUgqlwFfag&uK4!E=>w^c1RIfh9@KBC=%8`-r5-QP;p~d~v
zkL$G^%F`GJIcU)*m$*lGqQg9p3~+s2Q<_6s_$<|;hOQ{nKog`ckX&%6E+co+^qOdZ
zOSBM1(<9?UnBIJq4p*<ze*G-%uAZf>U~Mq|^D5PcO^W-A2BTp8UY=JMX_xU*Fr}kB
zziv0pb4y;K!<TaM-1<S@rSEaDZ-!7~_MBzI`mokqPxemMtVGwJ1AEvTqUjNjPSZY%
zXsh3dhu5TUwR0Q2AuM>HRl>YBl6x2Zk|y!{)bFn)nuEBoezd_sO}Su<k3P@27H<8?
z1@WM7_CvG(N9NG3W5Y9bp#|b$w54f|)+1kR^P_#{E3tcSq3KaMMzP-%kM6TTTUe&H
zu1yTYt1sF`vNwE>!s_bxWAv5NsSPx!0lr5~@iF@34#*P9-tasMX|jHD5Hy&z`OLxd
zsC*xzevomYvQ{T`d!FHU<q(4laxZ2aWZWa;rj|g=bG<fe;d#D~URS&{h{3(9Hu+YY
zHXdG^_}u!@8$z_a$3tl2hX;r@$QpPge-5Gzmb68SJv&Eskb{TEL9z>`?bCEyKTgN*
zR_X9Ar2U(ac7j{MT2bQlpN~?!{3O-4wP0-UXF>VGU@Ko7G<YuWUz@a-_pyV#j~(Ns
ze8JGXhn<P%T29`>D*fW}{s-$;LL7A5pNuU+zrKEdaE;r&+jv&u?avSO%=X9Id(!WD
z<H_^hB4bS*lQrNmg}DaN&S?EgZLMRXhAB_Rng6VJAL^O#M|&<V@}8)H`ONjs{3UBY
z;*U2tw}yw9Kl>bSaH@vPyXXAz#tUzdcnKe3{$3kz(2r9yxTprV|IzRsc!P|?H=p5r
zugg64*BBaqw9xj5H)uTl{i~~?RENg((6z!xMQE2W=LnBly|L+c_xx<+eyFeWo_vp{
zrWxLpq4!oPcJTSro2ydsm_ng8+L|<SQ0pAMxm<W7whZMOr@R^0B-$l3-XDGbcvG8{
zJ6Z#L_AGfN9GgE{<kBzIz&PF@`5vu~A497YH@SH|JRfh+>zMrDbA8|E`v0Sp_;`a}
zM{4K}G(gX#k9SEE9taO4F2=omG}jxR*F@VRJn&<BQw!c;xA3OHyvPAra}XX{@TL&H
zvFtU`Mhj1nakSvg#h&3n01rGt;&_7(=}kF!d2izXr}tD1c!Q<+i%#z|hW1iq-eAew
zcs`i7uaz1~==o#)wEtdy!E^OA#r5Ocx>_CMdUdF)u#X|^1h;~9#`Q{Y70+*0_2#cf
z@#5bv>dm2!7yFp;T=05V%l8tomM<n0cMYBkZuT)=9OM^A#~3ef^$#EP4<6+AO8)_#
CZnLle

diff --git a/src/qt/icons/disabled.ico b/src/qt/icons/disabled.ico
new file mode 100644
index 0000000000000000000000000000000000000000..e2114db542873d06b1a8c3eefa99c1f7932e2200
GIT binary patch
literal 9622
zcmeHNJ#G~-5T1w#glJxo;&pi?Wo|&Kv|J$-qT~o$AV`4(1qDZ-qE4BJ18@aU1av4R
z1!DL<duMmnZ$bOxT~T<X(b!|p_l;-Y+SVo_2XZKzjlk~Y>7mG(h#Vco{^ebf5Abcb
zv43%2<jDh(-7fauBkl+0K12+fK!|=AIYrz|QN){$g+iP<4LAcaDj!$J5Njxg#WOU-
znI*;m@$sB)>ln(<7{jnw_QwiiOvlES`K1E;70?@1y@tMmzJ<Q4`}7YG?lahK!hXa3
zit+|~R3@=^+}o+pz_54ETOsyH;X7y;KD6<T#56o&5yMO9Cq6&k*Y<cE_n0~GJmwrc
zpO;}y!DFngnekrfpDK(^bt+bgD-|dem|6k-`AGHlSoP+$>eo-I-=N<g$3FcWA0a%q
zaD|o=sGVEqxJxe}+<#KdMFU*F*I7I8&E(*|7x8>q%~!8!B1elI@z{?-uK65>Uxn2F
z&LIu2@ei{tKIgYN$91&*JoqU`K77_X=G^75XD~H?q7m0{*fura9BkrKJcr@Z(w|E#
zZ*Oy97o1XoQh`!||F;6F_f&u1QT=s*JJtzw3%!6|LC>R~<D54^cn{k_PoZ`XtN7t^
zJ>glA>Kg1dr$1M$-Q=@W9^f`Ee{Nda#zG#MbEv|v#O?-tKN%aV&vDi%qjdTE?h4E)
z=D<4Stbyn5w$lYJlfyn|!qcRY_%l6&eSQ)qTp@?Vw<v#K4r}wLIV{6Zmi}kJ5lYM3
z+@mwqKH_)zjl=dEvrD~y-5k1WHBNe?^z99XFyF?t8ke_`m*Z=Q)!f@Pcne3VK&e2f
zK&e2fK&e2fz`rYi4-Loo0}wtke8$IyD}0Q&{-Rplsy=_F`T`#&UT&bc+<wG=GjN>q
JIG=Iz<qvy<#~=Uz

literal 0
HcmV?d00001

diff --git a/src/qt/icons/floppy_35_active.ico b/src/qt/icons/floppy_35_active.ico
deleted file mode 100644
index 9600a3af0fe33f0149e8379e76df7d054e5e1e18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmeHLJB}1F5UtU!kPrbIY_Qo*NXQM?h;tAjByK?DkdR{#A(25g5eMM_T%mcdx@)$^
z<8OBl>}toO8oO=RdsSt3*)t*=xs<CbLA{j^mm+UP<obGi{_#xY8~Sc;#^=w^Mc%&<
z*>1<@uh9F0xv!vuCJ@GcRB{KsOc~HWN95-x8B9V5LrxSwfWu_sqwetg`!M|aIOGa-
zSfG9XAr3H1pY7dlmy{O$rTo;-@w4A-FdsDz&i)erfe!tK&~NX5jo;hGxhee?8+1-d
zpX=BlS$^(?oH*Q+KKsb6dkwLT>-|2%oRWTO4->0bUv<Dmyi@4|_uw6*Un%?9$1yL|
z4I8{yaBYrImw5*1M)M8x70Vaos7yIp6U>{_ci?l*U*E4h0bH?6{EUmOuYXrkZF`r2
zcKjheFb$9GTIs>#{!ZEC`+D&nyM46Ze2#r#zh94*_*pDfm-<e)t}$NB+5DWzL&o1*
z)3>C3=<hDnDdA1yoYNy&`*Jxy)$ce{c<eKqxK=f>_de&Z$MZQQ)h5>xJk_84BmP6g
zvv?Nl!<6H5iE&KDEbikx69vLokXyv!<qC2;1bL(97Ov3p8e-?xJKUu+rMicpH)qbl
zIo28<i<fe`+_cYAu!UG0XYKc6YaZBR9iMPxKAikDd~)&qX~|i{W`TwI59Z9Ze+mBC
z{%K7X#9!C8u*Nzr>Gf@izs<3ACY~?sU%LMdk65wf&WYCjZ}z8ZVwCW8+>Gn3E9a(h
zuTf{??`&AYQ^Zf*8ESozT{(RAo86j!r+r*&ALL+gwcuNxuhp7+>7VmqF1}(-IL3R%
zzyDwBU&MzTl!o|YTKb;F^*8;Nn)AIVFusCp=G<!<bT+t$UFbb*3!XcO-NOR^xJ;J@
z+%a}gUvuu!J*_vs@fz&y3&-b+joEtene8}-q|T3)KE*fQ)D6tWCSK2PHfgTuJ%2Et
zXDJK3u779;Z1DW{O#T*M<2g(DeU4Q}I=;HNEjm*S)>!|w`8!<KscZAcYg>C>oBy%-
z&-ir3Ao2b!+5e2!n*6o(&W)Q5YLC5VuC{gMJid26|19<2V|zQSUu|OCA>=CY=ltvG
zCr>Qi#}dD{dDV8qJ(f21_}MeJ*?-!(c5%Mf*5BKCs&;YxBU?{l!-MCq{jO{s&&0Ci
zKgWE`?QS%uj_;O++ruB<aa*5h@2UBf!^PO!cIH3F|0(Q0pBFm!KUDMoGcZR`JZ5j(
TFydN?@fG;@!2c;5a9{idT0{+s

diff --git a/src/qt/icons/floppy_35_empty.ico b/src/qt/icons/floppy_35_empty.ico
deleted file mode 100644
index ac47b4c55d3ed4b093915cb37f77b6bafe5a00dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmeI2y>8nu5XV^{C{T3CkRhYTj(vnoeFM+!RP-q<Ia9|zLWT~71Egyw%P*1F=qspq
zq<)rs5^2%0(V!Ip<1ZfXo2Mfq#JN}Q%3WVO!G-&B<=hA7+|5mx|9b7*lhAH&!~E+T
z=RUu6Zm|gSA0qc#c;AVPJc@=u7jSnXml$=kmW!?|OE0r33XequS%+Wj)jWTHc<{2d
z4E5s}BB#8&-OkHYU{!^A4+9^z)C_u{9ka_ia$Wn|ZLquDZoU0JhIMS6-+qX%^#gyv
z>G9+HQ2eZo#i97w%NU}2$bN_B^RN1Ke`I(>Cpwgl3^cGT*IuS5$^#wk`kwC4i>~|o
z`vV#1@S!7Rf4vSmy1W_)b95?=XK>xv$B&|UKUoJ=_IX*?n@wFWPr=8!);=Tc#`hcT
zS315)k4lV#+z8*Pb4MKXl~~`gboh~1A9yCeRkibeRlOb(-lZPB={@Mt_}OoIMlRyZ
zkbmtv9_uxR-o!Ec_u%*S<>xQdU+X75Jc3QV4(%^>bk6!iXD+7v<9#`X*5=Ur0gtZ9
zPe&5rAMy_xJgZgVb+vt^^z+qf<q`kkSKC$xYn(5v<0tEO-r;lDfrbn^K}$yt`YHb5
z7l<x=5xV2qqCJoB)6$VsUC+ypa!&n}bLt#e`EyII(C)qbIJZ8@T{<z6^&@hpuJ`i9
z`P9~zt+(Mha-F>O>MpkjSpK1Xw)K>KcJ9yEozEdQG^fM@&H9r&M-O^+zpejm&oyUg
z^j;5N=*`%e{g(}tp*aT0&A*-hP{(Z@g}OLCKVJXjk9_7L@~Qm8GZlyGf2vO8Q~vWl
z=OVhnA^)-4<<a_<k?jBYf*g8O(5}JLzh}_*OK*$w0o%xdO2-Z~JLl|$ZgsJ4eeCc@
z{YMsF=J>*SZ*8*vKl@Kk$XzP`@K_|jJ$my^1A2^4e2{zBQtn+Fxp!RxAN@USA$IQM
z$33jn50~+ge9uJeQtOU<f!w!v52qsf&<|=%Jo9dVr{A^0nbiA^(fl2We(dUYP=nBN
z&z`aT*ao}t>$Cd8T6?B)2b+o^FX$&$wMqP}jg2Rl5B;E+j_&^)KX<FC`;Pp)|61$R
z-dz9TuBADd-~Zh~@6GLNWBI8)P*R`hf5E4=57G}##lsj=^^bpJ;~L9{UN99uJeR^T
z@n6a|dS80{^o6NNycTofS6=z)$U=O#wp07h8Zz;}R}1e8fB&@@==h2ri@I)YSsv!-
zh99&x;N#AIj`-1uO%OUhf~;HLSO@3$=l!QvsEHU-Yw&~A7zjP5{*j4c5&1s@`0)+g
V(~roB&-xu=Dc>PB0)GP^{{RswRx<zq

diff --git a/src/qt/icons/floppy_35_empty_active.ico b/src/qt/icons/floppy_35_empty_active.ico
deleted file mode 100644
index 4f0c928d6287dae876ac3ce3d9f4b26115005af0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmeI2yKdY@6oyBJ6CiM57Y^VqDpUFq<R-NXvreiYPqCy_rSv1HaA8n@)27<pm(XkE
z6`1oM&PQ^G<m}E$26E8|<A3K||2do)Uf>We!t?OzRWQ5^zdaA(rx3#H*Zug<Z$tQE
zvNvz~@$cV-@au~ZE-(A>XY>2ZY=1N#`)Lt+xk0!xzf9|*E{D=hySp?^<35|ZcC44N
z3yt~GV;p=x-QK!yXH7v5(0qK{nLmGu)5i$={oZ|c;BMECBP!>b|6}IgZu`93?bh=j
zVC3LL>>sa#@jod)^{^P!4?oq4`ER#<9Y!AT0ed~QR#@U7^E#1l0kOl+OosgEPDO<$
z4nE9f4Y9*-ntvkm`YXQl)*OjR49W391~$#L`_y%F5M$I2@?rkOy1BVI@IhXZ|N6R*
zK|bcdn3$RzzrpL6A0BnwpXfpP-oNX*w&}Xcw#WfW-kQA1;9b}0oU!A^&l{arY9H;4
z%Cv*pm|box-BS1P%;U(p6XJO^>>c(Hdr&!uMSXX>z4O{7XNixSh4UnHE*;xb;^8*L
zn4;;H_>Fsf{j4$1`Cp8u0<s?e?fjg7tf3cj@(<TIy}sG{S#A96R;`jwoRa#j)t9wq
zv1aS<_*u@G9x<-hC4S^t<FO{kZ;2neQq1vVJs!g}XO5qA*445|%q4!vu-R;Ck2OB$
zG(O&JHjePeUb)j4=(xY2hbQ`UJh2PpL52@8!BmbP@^kpX3nUg?Odj~1VtPM<XDY`}
zvF_jh(6zTOyXxxYGD_e6VfU+_Pr#kux9kx*ytU4K>lb^L&a~|MF~6K%x@lJ$>}Pd4
z@qX6FXe>_J$Jn!Vx3<?)`4Dq{2kG;TIfiw}8pz%|#oG9KzNOg6G$+f!8X$Jcb8%b{
zUv$#_aO~dj#NRHAHPvnnb2W-S!}>3+KkrrKP`qiAT->akw|?Yk%_AsQ+D*Z_l+B#~
z-hIb)6z|c)`{CNS_hYSF=ox=>@GC|9bNsP+DCYP-G<J?Z*P|3uPD}jBi>+*|t7Q=`
z_z_2rsSca@b4KkshWlmw&O&bdK*`C2EFBXIc^V6S%5h@9${$~B8N;QH@1<!@^#5o6
z)P&mQ>W@u|)ORM2-!zb~*%^m$UwvcGQ_s5U!$sGA4qf#=9HQjXyIpHo+4xkv^XITj
z%X4L&=deZ}F4tRjpPAb^dihMdvZrwZ^#V_QP8;77*uRc_zQ*#TJ#rzBxbU030UmqS
zTKs;Y_~hhyYl`S5c~ubBAY4lCJ#KHY9jE!$ev5~3n9e_r1M?s6u?ycp%$R2dQ1d<`
zzeO77Pi~K6@>8)WH#LbhpyuQTi{@W4_ay(*{Qm>jUl*}t4aBu4H#PP@Ywy%`e_(fB
z{?+rZX#Lw9_^u~TYIeHJ{(6n+j4S)@(dKV~Jg;gSYe7Cxa&_t~7kD58&ze7V(4=Cn
z12i%5$t%-Gx&9W%=bu4xgEEB&GO+kNY2iB<d5yzt{%|-ppHe+>!QA|@`C53&{J&Oi
z;{Ma;&%SslGT#(S<}X|8YDEb5G<WX$qr+$YeU<0l#yRmG$a67ViIbxAX|B|UF|n}+
z(;V2r;W6e<Omc$A;RvEnxuFN2=Kpm4Su3oGHDs+}53<HU<R$ALpEayk{+|K%a03VV
o5kKQ>-yuGH-?q2Us_N>ZZJRJ+2>lqG>SZs#wzcmP)dTSEZ+yGzegFUf

diff --git a/src/qt/icons/floppy_525_active.ico b/src/qt/icons/floppy_525_active.ico
deleted file mode 100644
index e19baa8a2094ca6d155472f1efa9c38a706e80a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmeHLy>b*W4A#L7KSPl#Qly}`k}^-ggoepuP%)G|!j@DS9wQYsWga3AkSAbxgGHa#
z-<{TL@2+?ExCG8O!nSPblO<W}AhMFRY&N3(R=%u7K8ncsc{Bg{Lga_?E-sq+x7Q+{
z--v9t&HPs7e(BzKDx*Wy(D1dBE0s&MT6vS{`ns;ikYQAcLkgIXy}z&Po0~jA22G{+
zKj>+6$dHac`5{@@HC5jGg*xmYI7_fUhtIQVZw>oQ269R^*YlUidmkTK-u$Nasqsc0
z8{;ATcz-+}E1%1)G4j|`RaG)S4=oS<9v@@x1CP(WzDLsZ&AF!G(fBk}x$)|*u1Q>v
z`)Av_MxD`eWAz603hlers6^Z4g09UT)Bdr&Vd??>9pW9t8ua9H#rqv&$f2pW?hhCT
z(5E^F>m2PohJDBIpN~DyY=LqAFvdgnA!hI~8}^$l;_1lvBjT%iI{FwN-ych#<#A)9
z<*T>JkH^~QW%|aY`iAagi9YPj)pOc>(%1gZz%TF#d-{(&`i;H!AI2%d9gF!Xp5G&K
zrg^%j%8iZxRo6)IS~Oq1I<xPVKB47OiQlbH`j$>KyC2FwNbk>BIyRfCc70;KL!7V<
zokMqsvGe_|=5@btO+5_$n4%xL(bV$%59gX_e~Es@82w$Pe@gT}b^nyukG-TmA6e`R
z^9OnnD>j>lJhEhR{{TDeAC>>Av!y%6fId&igQfH{r{exG>4$9zAGQ7-nPWd?1BPLd
zm+MRXlhe`1pQ0aimei*kYo+?JA2ppcRMSuTyYCnulgH#A*utFP`-*dKvmbl=G43PO
zv($Qy@AvvU$#K=xOV)&1-fDe(?+EjFPip=_>>ak%%~wi%hgJBG%WfN|GljDN&--NV
zm~S&ZV(YuI`^E%&dDpQIm_v8o=SSbTg`0YTRlzRBrL9Zh<BazGPvOQq*r7HodH!SK
z7h%&E!3RtDe-6IJp!l5}=inUtW1s(Dz(+iaVzAKtgYQUx8y~pHT{fHRx!AP2bbh-v
z-52C1)nCPIVaGPm7sO)^J_zxeil4*wHZUKE$KK!DL*sj_)cC35n{RvKpE_%bH}(9~
zmB@qMzuPFsel9-r1RJcU-m(1>_+znB`<B9=`gU6aAK3oyiqtuCyt(+0=R0<a4JZ8O
z{=g4Ya_Hp$|2O{-d)#a0fS>2?d(4Ln>NomQ!doLHljEoMk_VYwt5OTAJCWxPA}@dM
M33KpE+j=8^0H9Cz?*IS*

diff --git a/src/qt/icons/floppy_525_empty.ico b/src/qt/icons/floppy_525_empty.ico
deleted file mode 100644
index 8fa6c6b87c333dee1e85e39c68e15470471d3305..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmeI0J8soL6ov;WLP9htQlz{kB}+)f4lGKj5F4Q8mXs_Z1qE`Xq>U(0HjzyPiH;_X
zIlrARapwAX9?lDNN4olb9{+ib@7Qt(&%#dF-3^AT@Np-EHz9<*y+J;G9>THd_V)+*
z%Zm^`ybNKr8szWB`)$6jjANG;VbB|d1LIAs?n+mSVZC1W+)}i>9h`56hkXnWJ6oy~
zgeM)>9vA)D*;yY0RJdF&c|mx}PdxH~_<-oax%{#zHY<*SEW4K<E=XR`^ltyM!4r}X
zF0yPh`H9gZT+pa)etbO4$?tK|=j10391#6n|M<+!2Or{s=wpoS${+ib$W7CAZQFGl
zc;0nK7p6Cyv|sUb&e(C&pEo+Mw7%LIHL-5p3ua#`FX~(MF(=i+HS<j&dm1Bg6dzkE
z7Iw~-7*(I*Y30VmFUI?-kGS+wi^R$46<^THX|a;~D<9=#c`?z;kJ--TC0vg)evefj
zJ@>ezK93vgOXe4IJ=unvoF82BBgcqc8<yH%d{ch^V}0~KH$Qx0)NHk4{hZu1@9a5r
zV$Z1o&m+0{Wco|93rBwVkMYRtdT!Y(ba-t)o?GwjU3y~O`j43XuH~XRsJ^*5jqR!x
z-*}&L<@i~IOkCwl-Tz)Lcpg4f{q*A1>FK??(LYrE<n!vR)z{RYJ4^g5N64*TzT=hZ
z%Y3u%|8d;$wU?u$e$_FK$u%*&9O9*X;1V-N>@gBo{!d~4)Mw?)zKh^jQ$O5XR4wGm
z<>bzixFz$41Ey*!sh^l&st^3O^@rf?L&^M!!Ca9&#830*+C%wh#r8qFsUQ0__F<s4
z4*;|H)9jzkZ;Uy-Uv2*$wz5JF?8kf9S|2Vq7iZ{W;l}*Nb5gnYC0pp?bI7}I(DVOJ
zAw8)-e2GzuyhG;Vw*RNG|J)0;`wlO6-|^e-|K0CDdyzu+e98Zx7+@-AY+thf<W&7y
z$Z-x&#$Vjh^Uo+et3<zE#Po8;dLtH}|KeOHoVduX0Y8PP=zk*fjVkWbla2AO_CL7?
z%+%{Q*4Ok;3~_HJ-e2`H_7qa9n5FwqY@<>`QSLFHI?z27l6Oh}OKa8qsG~MkEg#;J
z{)qvW_OPUXa)PDzFuZO5_5Xin2yXZPu;?6Ia{n{y+S$X?{m*qSilY_#586$A>^GL}
j`$J>jA=-RAZ`z}awt4%fX-_T(l-!uUD30Yl{?Yyg5+_;a

diff --git a/src/qt/icons/floppy_525_empty_active.ico b/src/qt/icons/floppy_525_empty_active.ico
deleted file mode 100644
index 703d2a64f6d3a3a3ac6726d3411e84959eccd8e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmeHLF>ll`6!ujG2{E)oD|O>WMt;JvFn6fc5hldQ!c0a+e!>k5l}~C{#84eS;&$dD
zF~QO$ywAyZaeQ%XCsz(cjnXf+-}}Dzo*gHgQWLeW4iA;!RK3|(>V;D3=&0&{eyG%?
zjGdfR{SS|ndi_|b>9p!!h~E#feJVb3D-6}RfSQS4M=R^G6oid?S=XW{tZxKMRfsRI
znuk80=5x!@iQ<DM-pxPoR2(YC0nLzq%-6=#<BtL?m&?xB$!)Rbuz?^K=_7vH_<1uo
z@S~A~^`jr=Li(6<TbBlTy5?M8-;RCQ^yu5Vh)HLCFisv{Kh~#TpMH!ZMV~r87svbb
zY13C9+JyKyPoy3D(C7US)X&S(6lJO95ozJqvRvHA_)5l&pzcPTGjiP6^9JV?+DAE~
zI$CQl$b3p4HeHvc&&;<udkW#?Rr8aJ_3cIR-8fHpGJ&_^3_ce=cjx)k!H1+nd#S~_
zgZOq)KWbX6bLRO<jGeQr8`lgqMkD8XpI}|(q9$x&YXKX#QOifMS@ZgH?8C<8VjP?&
zavZh^@sZOaIedgRdHuQEK6z5&OXbdqkNP2Q&Zopj+mt%fHl)k(m>uVL9UtRh+(eEe
zKHmF?IW&K~udh#^lxBWV>e+$CRgLWHw=#cwRqA&y<$Wcn!?=)nytm{NT0N7C@2ywz
zE#1*t&xp(q>BGmpAVZ$4I>3>2vK)o*_*cU{__<wk@;&4t^cs!mIm5j{1b6WLNu64Q
zxzaZYGx*(lCUIMbzbpRO`Qztxm-Xj*^=a6(AFzK=`c|vgneTd{-Mf`x^8Rn}x*hC8
z|C0H2o^l_nznH9_^%iyg|7L%E*oPl=I2J;e*S!zflNYwJ_{rh&;-2Fn6qDrm$pN1f
z?jiA0BNd0lpIXZy@zaMG%OfX#auQ>C&<<-Avt^w0A#yx~|5N;|L27Mihx+qAgs?&L
z=d01pao0}k2l73&SL(A#X)aW$PgNT+el7Fw#qQb&>I&rt10z2i=sx^z?048y0-4Fh
z@2~<tTy8d=p?87cbT6p;Ive$K>ja0)ex+B4j(^p$kPor&p8I4ZHk$n2a*^>ky2vl}
zIq!{4xb6Gj)eGGt4vAr#`S*R7h*JAsqmT4Q=bxp`Na`52vi`!ATzgL+`Hzj^U(bK+
z{@;22b`dl7z?Swu_l?DzJ=o|EKL4nV)Y04+LeGMINaPRJ%k|G)f05%m#A@>oW8i+E
z9uecXc#eXHad0e#A?;QS=+s&*lwtBy7p4R9hg+~wBZfk7XZgppN9G@1e@QB)&G{ku
zyT0B6*qAsU!!h}j8}ZjMWNEwpjDur;3aN|ubNBzYVnqEI$576p{`4D@KRJlGIgH7l
zn#9~Sq~Cr1!}mXHNW5SFdDb~NX8*I+Lu*ez?0?>;B7D$%`)YJ^+_!W4TAv*oGvCvC
tHZi794JuXjiJV_f%;MXgKL2@au5OJ!|E101#%R6L^1FnfPRGkH<~P>c0FM9w

diff --git a/src/qt/icons/hard_disk_active.ico b/src/qt/icons/hard_disk_active.ico
deleted file mode 100644
index 9946a7f2e14e25dccc12b695f445fa2a63e96706..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmeI1zm6P55QqC@3xpilfdglE2@;{-07pCrx&R^Z21FYY@(2zHECOQ4mc-9t3F$)Q
z&;eqouV+7BUAt#@W_I^X;6Bw>cURZ%S6$P8X7@_DC=bh%CnfY%`Tk)k-;`3GJ{{Y?
ze^$zG(f91x*#7B@Qoegs%GK4_eieRy$JnpJC#r!k_J=Aj!tcm3guk*BYABoVRYn{!
z#O&+vp@jGCA2@+=eSLjU;N0i`%gdL;X0xe6y_LEC_}$#xRIcrITXASp7o!^Eqvl~3
zKYolsEc8*tA-?LvyhE6`^VeT4ebDq_#~&Xw?L+?fF7;=;F}HcB@&EY8BtLdJ<#j&T
zzWj9<es~>u3yfa;jA=2zv0n^x(9R#sr9%E$z+kNrd_Q&>{)#8|=P<;Qin+{_%|(68
z^@DRJj+=Vka9&Y<jx*{+rLOV7%6cvIo&EEEFYTV;4m9&j*GX2Ci0Z??uo3T)^*}6h
z@K~RDJx{IIHF#jTXNkqVNB>eh&jB#RM9Z-R&$B?xnyC1oEgpShYFE?m^I$xFJ<N<H
zcJ;+SNqcT&EOVwmF=z*$XXm=e^)^29X72FKSmKL;W{lWVcok$96BrpY$F~m;o4)wx
zSaZCL<E%y>!V|N_q74`JeE!eD6BGX|^ebSRGy1IO{E?Sq1WfQk>OCR%F<Lw^jeD&I
z=l@=YcV7>~+snA89!D;h3x3;j$&#&wdn;a{%kvQLt#9L9`V7VApY^F|?wn2U&#B#d
zJBq|J@538z<h;v~=XSUr*p%26(|_;>$C@=w9_He+4?X+xo^1DgwjG1-SyTgz58Lv=
zvlbsL&tSFqo~7^{gHPOIQ<qa7@UidXz>jB(nE#A}T@G>4Vr!Fw@ww3Nx!dC73l=3~
z(=WcZiV;}gWpPdR;x{%i<Z7{r3!JQ}+n$OaTuPpYvD0s!#Az|@Z}I8JS6t(EKK3&Y
zG0@!c`|f$h=mTaJ=OH%QvBc+{@Ap2ju=V1{E<V^4FvZQ-j78u;Y%^vbzT@Ok+piX*
z)!6OJ>j&ObNyevcOsCY~?)LD>-fP<U#1FmtJGQy#X>dQ4{TUdB&xhgP2gC5sMZ9~B
zXLfk_>=$YLw<Y~}5c`w&u&a<4A-;!g_~G*YN^cJL!9MafcT2rzZu5JtIBxH=-W!-P
zjdA1{dbwKG7ub|oL5Kf{V;4hj|E}pHziauuKiYH3_SE^UeG#|W+2w$_PVsvOdDqnm
z#s~fR?mGv+94$97XfwW3^Mgx~TTNffP5YGmnLEcoozn6X+o||7He6t<bDeRHH8+c5
zxZQvCoyGN+F{#UqmQyXS`dI#qOC4Oa-0dE8jQq5X0iWI}RKc*t{MmP$LGC~CdfNQB
z-_i6rHpdEfjzdngHqW;nzw=SUafqKW6vr}NuB?s!9Q<+<xADRQr}`ZH@XC$u@f(A2
z%$+|u1y6kDrO-#wCbw-lowFMM9zS+5DsX(rEf01Dn|A%sZSLh&AL7s4;<tTrtBsF#
z=Fi_B=kVto%;nB8WNyD>wlVCRzcHF)v_+ntW=xNp@3;9oF8Fi!&4c_s&fGV}-F^pN
z!k=TvT)7T!=Eeu<@oJkpf5)Tq^T_o)hPwM|pU&g*`RiQnLmOXy2X5zb?lv*VANp+H
y_4myq^BaS?xepEJr}A+#5I;a%#y^1K$A~u%HvCjD%E^NY?6M7c6ZoF#=>GtO+SvmD

diff --git a/src/qt/icons/mo_active.ico b/src/qt/icons/mo_active.ico
deleted file mode 100644
index 06b788b4d533b13cbf947d59592360fc02d4c612..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmchbJCYPf5Qb|b2qF|Rgn@ylH8FJrEY5+Y;BklDHZg$EF=X-ZbPnJgx<V_ztom!R
zbE|uLW@ptKNj>xb|IB)H52aj{N9D<rV&!#t{iu|erIe>nYx|$arF^!&XU}T;{V%2b
z`D-cH*R}n(`Tc8ipPP?W4Wag1QC^te$}?O4Ifm0L14H#(I{swSWj43ZpY8eft@=`8
zZ{K#qhsQh)f8ZE~^Drp?k00mx)2Dg<`Lmj}xBLwQAP_3n*RS)8fd|GB|L!Y(eB|5w
zX-h*TGODZ}-RPi<7_^(Y4}NCMUBoYcv<rjs!-r~$2?6AG<gXZP%(aY4Fh~C691gT&
zQHSz@FZGc>{l^|~-@NH-y@(&J#0qcYu1j0<<a5D?yTy6OUz))&uA7^i`S$kK%kGbF
z@VEZDf8f^`rNxTxG)-PE{N2TMRbO=B4}ZW|^<U!$BiJq6!QvQov`<$Hmw8%3WEXGC
zhmw27t{cB^xUYErvO8+!f%6hp^VVVob0{?QJMUy}*=$btXB}E@<2rbqebda(A4@j+
z1K%)R&j^n*fU(x?tn9%vOn^bG*xIX<GPE1!9=wi)FSzXa=I?l4zMQ15<0*gb3@tFv
z(I-4g@<z@YPQTl%t(a?q4*$}>SPw9WS8E`h++W-+7<DuE#XlInLp(I$C!M-yXj6xe
zI{BvLp??dHc^DdX@6o2N_1c4nkMW#j=pE?;i?OzMJsz~sC)1cT3ajZ@<d43+54d0v
zv+|qsN1W0Kf74QrPhC6JotE*K+YugoSis}mFnm9Nr8ODFi@rDxrWtqr>U|&QH+>cZ
z!PGT{C)p;R=4LDs0%qiEb2stg{ER7$snmPP-;eDb)#FKXiFGQ!+wgDQrcjUlTXkVj
z^4_vf=<<h|-dnHiTYBX&-sRr8Q2VfkEoN}n@{s#o!(<TIG8XH~I<iiTY5i4lmaup4
zs#(2bZoK2V)-`<H2jbRQG`&2geEpA@S{yzZ?b1)Fdmv#SegBEE;Ts1;PT_f>u5&JI
z_^6}b#>frNhWeU6u!J4;gCjiNv*BHPHa>XhhL7At4so}>v-C%N<v()39c+ukb7wji
z>x<^79}e1Z#CJ3IE7so6z7Xjj=N{pMNq&fB?On|n#(6MJU}bauj1OMK7Y;GR_lx@J
zBWBw8VLaj<;mem8&M`Q^;GAcCv}jy<D5XF4QIGm#F4y!6KjLWrFs3_5C74=!e8fS?
zoU9*Sa87;TAVxT(1FR7~IcL6f%g5UF8mW6a)?E(s6+hay@TG-0)PMYNi{Bf(i)s7$
zfq=Pi#C?|aqZR$kMGM#%erECge&;u9#vbX9_|h(XYj5JC8-M&{O~1uRQtPTx#(9dt
z`Zn>wjD90*=72B$SX#bL!f#l<KGF{V8otdx7r*BR><x?GTYJ8_zyf<JSCk8zQag`t
zwId#NzQeA~UYO}SY~nvI$In8CP5Hmtbq^Y!5q5(=woj>d?UO-gGu(*X>pJV&oA9fi
zOWmXTrc-JC&MnT-SB%EMH`~q6y&{ty_C40_8Dixz)Z>5X$o%OXd;Gf3#HliIqv7KG
z+(F_Sm1t<+cPDWxJBJ*Q49}hOflE8)BlD;D@5A4@#Yf!m!>PW^AIDD3eTsjTpM3>C
zInMkK5kDN-<BET$hKuB1{FLy+O?^#+-jVH$oTOnIoImmN9R@%6Sp#zzhm&`EuzT}^
zsc%8}S!4R52FAsSmT1;54QuyMJ!BT1#ZQcj`wuSV0DjtNP#(}hAN-Lw)|-Z?L!7S3
zczta2ovXZp2fwr^59rw9mJa6FTzIl|-J{<L%6;S)rnKlAH}>Z`bCgTQbXG}#=AOe(
z{145KR%v7nE@{dM<tTpoBfoU0Z|DB=+>1+VN(qkoNBb}Gi<1)58DtLoYqSs5A32F(
z)E@COmo=t@lY3v>(jh!B#itT&7+PiEfg=r!YY*AlF3!LB;kxhh{rf?C)^LoUJtzIj
z1KO|_qrRQiN|z6Y@`ncM$Kq#>_%k;cm|^7Kton^J{OyWvw7?zr%_#rkr&P?8;-)k#
z@$q{n8vVYeBmfKyZfQ8i&phIXNBoid6n^{_2O1)G<5}!K>4l$h@}-h`<K7)Vz8JWf
zoBo{t%+H({J25odm4E!<9dQSK%K-<mp19WEb59#fI(G5HtNaT`WsCg|H}lb=d85+S
zVi!NYYy6Bg4L$Zz{zv@QcS-)91LEFk`Trbr2Gze82kwdg9vD2<{~(Xyc0TI=0Tp75
ARsaA1

diff --git a/src/qt/icons/mo_empty.ico b/src/qt/icons/mo_empty.ico
deleted file mode 100644
index 30481522a601d51748c1e99c19b1c16f3dce95d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmd7WKW-#t5C!lLX@!JHHrQZ8hlCtqBW~arBE%^?4hcEJ1_a2KAhXE!2F`p1hg@O!
zsy#oe`_bR@jMpGqvffnHtM{t<&&+sQ`=Y&RZ{N0#7wxAvt$o*8d-v`s{`1S$e($;W
z@1NqIziREruUosgc#41PeSdZCH@&C7><Ul$4(&tlJ96v~wR5puUtceJ#9P??_Bi+V
z_mc+v_2b7WhVuJ<)SUY2b>{Bw?k3LT<Ku+l)T-9%uY(33s8@_vEmPyH*G#zl#i>=T
zdemU{$n)1%Gh_}ok*4#o=1+HoG}Y(+^zDr+FJAM<vC9bcuKClaRr}R^{g{yEyiNzw
zu)}V*TWILTFLAHcpkBxyf8Hyn7s}gVCEsuocZcT^X1)9$F8BMJoBjUsfEmj#@b<v(
zSno6a?PhwvsrRcoe(CQ~M~=n$?7Wx8&wJCz{Z5UmAJ_R!bl<_OuU*^B>B)OcJkqvb
z$LD9AR-*e>o~BvWv_`wrG9RSLqcl?k7YB|s%|~axt6XYs#XRTp=^3Hj)M=bEU-r_Z
z1?AV~!-2Ts^f)%39_R5?<T;;@mg^`s56n6(-t+5g_AN|J-t+nB=N!c;&wea0HT6%#
zK2RZ_)V#X7n(EN}_^>?bLN%H`Bh;&B?u|dIH?P$aX~LXOfBAR~M_TIV%%>;O=Mv1i
zxaNDf{Jwuq{n0<Co-kwi<M`>&|7rT%>R+MTxBbuO)(`!=^pRt6-*nz<#m%0di>?`+
zn$hd5iJ|8+Q9Y4vov*yFaNXNt&zd|h_0%~wKMlRKp?vb>=kt55HtN~ZHb1>OH(t}u
zSe`a-sGdltJoxH?*^?ewrz2m|eB{LGA%^&gt~s4!^V5QQVQQOSeLg=8zG9eKG%_!y
zGoN2Aaio>rr_4{A|GAj`uQ9(ppnccQKmSBMkk$z8J)a-fc{~;ML9@;0m-7sX^%S>e
z>Bj=ifM>t8`Q=iZr|%g)&w1g~7FRtr)yzYiCcfDGsf{-++)0IU=^>_xSMyb0YU8UH
z#~f<V9;q!J^{r`}i#8m2(7;Qq`baam=EWC}=Ev(E&Fd}P9exkM%UB+k_Cx>2|EB*y
zaJj(Sh_gP9mwLC;_ppoZ^P&Iw9(G+nT#k>$^VMnpRot8x$XonxVfoO``(_k-rbamG
z%lnOQU5-(WmgfY@L+>@}W>X*GDf`nLX{0xvKC_H=JY|2HBQ%3LZ)gT}So@cM9XTJ)
z7V_qms6X|~axz}=c5mq2!t@kpU!I4uPA|RoN{x(@r$2eQKi@hBYI@aDJ2f-bpZQU|
zwm&X!C=YohswdjfHL&9;`{xWiX+in)9>w$hN4>luuhf(u>DXW2+WuJ+^B!sAnL#{4
zyi@k4vE_|NTMR#Ee;Olgb+|Pvo&W3p_Hd897Sesm{_a7&v=X<@J-(gh&%atCZ`z|7
zM)}mkn_vIrh<S^123qp?P#?r!+n<JK<)z3Q@=jda-&~_!Ggfb1yMC;qe#raS{y5nq
z&pZEL^*@cg^F{~qrdPAuS1x0D-n4k)L+3*uK9ryFpFjWAcx5a<@|L&1{`8hVwm+{#
zTD<H5bAMimGyXsJ$355EO!m*~O&6NA<MRyW!hvQvb^n)m^V&jtnib01e@my<){C35
vd?GJ==$s}$;~BqseJbwa_Xd5Vyn13?_x`)VW&a)Gro#e9`Q)7&hwkm)VQ{kx

diff --git a/src/qt/icons/mo_empty_active.ico b/src/qt/icons/mo_empty_active.ico
deleted file mode 100644
index 29c82845b9f4bba7e17f493a3f11aadce637928e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmciGJ(3(n5C!0pLJ&b<NQQ`zhfGY4usGN<G&WcSr_hdx$r0ATP>dqLQ{d?a^5zOM
zxx!Fc)89^YZrA**7FyB!I<qq0d)a?8no=H>C*|3*Qt@T^^+_o|mQtQS-^YJ{S<0U^
z_u|Dq{_U$$e)+nTmoNA6+uHX}t^Ka{)WgcK&sQi{weQHbo7RqDto3_qS+Cc#9&y55
zS=V0s#G~fp$B&Hz{&92D;)b;+w%UF87d(58wirfmy?_6{^?v&FsbOdy>yO^HUXea*
zTqpYV($`DB#S=#}QvbB`P-XS-3~`A0aQ^i5-sNUJwLpy1xs9=Nk9dT*toQo(&8=2m
zyri$jxg4S1C4Kz3V!rTKw}v?TbvzJ<8LqFdXB>Lf2f1TwP%osfzVDUO3+2tQkS}U7
zUQf>@%<G}Q{b9G;tarOreF6fv6Rsk^srl6czMJwD<2_SfH|>2B@2l8;ukWZM+w6SS
zx?^#yE$xloJUGMyJiL3>mD4`)>v4WFy6+m+-gYeyZ==Ie@a{QVQ5enK`5s$*KVj_n
zg3CRW{fXOsTYEmo-;ApbaGGy4BQE$k{+u^lvv``h4c`4Z^`6B6UFR0Zxlg+}`)eVG
z1M-Pe4CUjpW)3w_tvGA6>s^WP^#1f%I~Qs8{&0Ceiur+g9T)B1AMd9ybJFhp;m<yz
zCN%3d!_29_6;?xmbTa3gH*eZH<X=4uO}x+=PM;Chqo>za->nzN)-vLR*`NN<aSTUX
z)-Um=C!^0LnAgSOZ~N-o-R9=$Zgusv;dVmtD%LlD)z7P+j^KxB{X_fQs$ZeY_jUKV
z^>h6$ePo;6H?{7PIBNSnWb_wvUW$!lU3v0;;J&@@Tu&Ne==p@VoIZzo484QK@H5H1
zO~bPm-0fcMIrH(Pk^PEC+)d*G{<si0`OMt%59uE##ND(n^zXUm8{&pE{)_WZ6CTr;
z{NCRGBmcOddlS-#{(g&mT-UnY-v2mUYcX_=V6V~mg414!@idVt9;i1XuAI->F+=dE
zuZMU1<Dh>j=Kj#5Yb_%`InRGa^~d~YE<G@F=Gff5e>LVg7xh8jdjE2sA+esQ4KH<@
zArI=zx8z?gbJO%a!{<3I^|-~co;j`YgBz!MG5?ucT^qO-1<GX&F-~>iFZwdKdh1cc
zhc#%9%q<@EEphXO8;&$^sLL4ZBhFmQuX^#wzq+bX9G}AL>GuG2IhKdPy<L4#zfV2h
ztzJLcZQhpM>Q$Lz<YT?nZ7Qy6JjU&8{ayPW_Oj|+)!p~7b^LHS-e%8NEqjPKIQl)*
zGjDNTpc?UoxYt`(oxD$8@P&@!eBX>>&(r`9n)!QI#Qb!+?SxFvInC_Ja{|@D_O7Yi
z?VeuJ&AISVJ)ATDNOPtgL)=e4I`6!L^8B<$c#*bqaX1Hy9!6R@fAP6r(9iFp|8xGV
z<$C-4%Jb&<A?K&f)43i#=lauHoU7g$BM-d7i#!bOJzPA|hCHg9y@T%e{N29)aMFOZ
zAx-PB<tGoL_fUI5)jx5r%y`c8PkZDsdvGo2!N|vMhIsYxaf<uY`piQNHEGSTrq$7n
z((o6U*Tj%-@d!_O#S_weoa#BX&I@ia9L*SW=QTaNJrv^Q@sj!7gL-jgJoh}A>Dc_Z
zY2zMw80GOmb^ZL-GSZgM9&pL4hx(xUrTKBVAMT5^A?=Jy^Yb<8<uQ8W+SP3l^+Vdn
z=2w$@<Z0*sulhfYyz_<!(#99w%`2B<dD^&Ws)x>pKJ`$(tH1O7(^4yjBW-!}>(AQq
z$L6P%5f?3Uz&t;#j9vYm`PE*k&6D}_^~MW%t$6E!FEx;tbLYR0Hmy@=PF|tB`A_l0
z*m~9GSUw{y_0T!Z^*Qe9i{o?gI{n_DZ<M#5F|PY|_4=F5=H~Hgb@gboSr@onm9mdv
WzaI6`x7pO+C03VU{hgw(fA=p&LsU%w

diff --git a/src/qt/icons/network_active.ico b/src/qt/icons/network_active.ico
deleted file mode 100644
index 25caaadfa92778dfc1db8b61e63765746c2895a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmc(kJ#HLF5QUqdV8T)$K~$iOObj^m4W!8DaAf!l4#)wNI5K<;LxE#Ep%}@|ocI7d
zfx%GO_<hy=W@~=-mrJ>b+Ul<EdatUwceqQIa#Eg@7cYwJW%=PrDc_b-UcIXG-@hp3
zH~C(_uJfP1Eam%WrCeUt`LBxmS9`x!jD|v}ewp%CaqHy#>B}BnSjV@dv2}>+`@VEt
z|56yJV><b|uEk@m6|-DlUG>-3SA9wG_=vl`y{)l|K@`3E0jFV*2r<r|Sa>3WeKFo1
z-||)&j&H16;$8Fk({tr;9=Q_<BekQ>q58FguN2jOJ<{%)esvKW2rbqa5hq{dsQ4?@
zjnFIbYR`yATHhK*bfAp`Py69tl2s3C{yEmUN8c4ct)Cv?1H*X}&$z1k+XVibo14h{
z!-o&Ol{)ZO3~*NJSS)_zj~~lS!SI>pm^^m<?Cbyex$obrXHxLU<^0+CkZX?f*!=E+
zE%E#CFP#CtZTZ7b4YrJ}+zr&ZF4@0NbuuSXmHk&!9aGHl#Tt9gq}OxhIitr-Ja2ej
zA;0Ju^*|x#b(*1<_RQAf4uYq`W?FfO(OMVBpt55ezPdiXf5Jf&G5^sTah&}U9)6Vb
z0wHqS0gwIQjZ{4N>zX;mzXKixHyQG=1H3BHi6i0Fo<-Mo&u{5`TkpuQ_AmFaB|exq
z@6;#vYihwlV!!e;rsuZdZ+PsFbJjdtV-tfoc5019--+2IUI&9X^38aGCBLB15a+So
zuJFLA+C`s@g#|}uqxx=7IWvyO(>+Ub_}p8^t+T`<*rneG#s_m9M)qesVy3?z9*WoU
zh<=jqL+~8CWE)Q|ZS9!&bz<y&@E~&BI=eQRw9wzZ>ECr1>ecf>KWdD2gOBwK&EH6M
z5A-{$dp_1%&F?Pyp5I&g2wlFB`uEm%`Ye4Ui8B?}Iy<FV+Be<9JoeQ-Hf$A|p93+j
z`y8+JdZubgjE!SEKbM5bb7uMjXXA+X<^n!`EBHLGP@XO1h|F-ar*RNV{v#DPe(Mx_
zAAC0ntfl7+{)(q;Tkglg&)BZP9J}_X<?r(tS@5gW-e-<o@xj=n6;rRRH=QiLO+5;3
zogsI~Ir^?->owzL4v%Yn<5#au@tOOKu@%4FMddxj?J(}xBfM3P;~YFYgu~dv4*_G7
zRxbB^b3K9Ga?ki0kM2&M!%c5E2jZ~^zD2EAhA*3P&uhjs2iS~992J{f2LWT7_`KO`
zT;D4=oW}r~2FAxOeXfAp_ex;{mNBsjZZ^#L#QQs_zlRzhoADXXz!n@c{K@xR<5R<^
zPY2?+ydqcn<-F~8U)p>j<FPB}@7QdEKri^f^xCfYuo1JX9D;8S_jr>f4><P8AAH2Q
z?P6=h=GXqyS^w_tRJoiupZ-tv_#=I;_haz0rwcumMfq&@Myh&}-fDa&z1QCz_#AdA
zeJl0nu#P`mKAxm}<NdQVe+>5E@wteg@~SbT=NogcZO$U^^LQ}=PQS0Qfp6aYnag9Z
z)jW(z9Ma;uc)RErm49dcnO$-7zErFf(P;Y*`zv2*d54X0d%tFW{8`OC?e8J{U{O3a
z#>}%SPp{chWmHNXO?T#YcZd@<+*5%kda<z1TJ80Ud#~O<fZyEzH^2Lz&){?PpZY6z
zWpf^%v;Q!gx6>W+c&{8*chC3FcX6Yg)(<C29*6RSxsOKq@&2oQa1OS0ovzG(hP9Tj
z-gm)`KR;jAjn~z0?rhDKZC>xlVZzVc@B1a|K1Fqkx6Qbl#=)sLbMxG(HLX79F7Z0A
z6~CB+pXz+})o$WvEx2XDobnrgUH|cWPwgu`Kq{_tS(n3<JM&kZ-Cx}|bApYm;~xC2
zZn!P3=@6Saor}3@PU&10xXA%tnS<0hPdUj2C5K^;3!Yf7KbD=)&8F}oo9^9oO(4;)
zd?%Z4hQG~W{zziWi}PR`e8=P`kEQRy_Q7fXY<+GItsfjP`uAVW)ZaJF+qjNi|G*#L
zrB``O`5&wQ1OKE4Q-1dWd+h$Zx7lX?>_0ZYYgw|se^}p@WALk<0^XtGTw7m&J4nFE
z=ep}S_v0Yq6y#bCu?c49p`IugdXk;pUzO9h`cpyE^69>mPj_SO%1BN$Lr<k=o&JF&
Zy^vnlzfaWvA1#e<_4kWA>An7^^dH-s#(e+)

diff --git a/src/qt/icons/network_empty.ico b/src/qt/icons/network_empty.ico
deleted file mode 100644
index 4a1a102846ea018ba6d899b5352dd9fbdcfce858..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6950
zcmeHLJ#Q015S{qj1WO4@kuoJEKY@xW1<fg?Ta+K+i<Cc-65UCd$|;?aI?^c>qIUsq
z+(bghdow$GXI~r%I^cF?&+dHf>{@wmHzEhplcOVn9La~i$U6}^IkEX@Ao2;i(^H#&
z!F+Kja&~6(k0X)UE0NcTK?;Fd^FZuvM_BCm_*l-*&*k#+Qf9N6q-iQwS66a<eJzW{
zLYB*=+}+(tQ4~^^<=$Map*?~21pcNIIM^<h;6qhUx-|6VC8k52s)BGbgtCj?GY`Sg
z6hm6g-m?q?83cDGgnfb-i)RR|6LczcYVpj#>~J5*p}fFns2#BrfZ_;>&<0p;3`NHk
z6Rn_TXMQSU080XbTKje(lI0>vBC^UvzCvb@oJUDJ{Q!GOx-E&bfM&&8;`MXQ@wJYt
z#MJxy`xaN9JGj=?p1{9-0v!NYfUvO+2(MAuQD7P1o9NmhZkn~L3Mx5A!)*{l_Y0s$
z+$LzU$7RgVmOv=iV`nIrQ@=4&LdgYeWlYA}sWe~p@bC`QTAxPh*Ff{?(7n1^XK)z<
z=mS}J5dDV0=s-B8wqgP;nX1a?k&sn|TT1hds&ccIJo^lse-E5D`8~Ul2c6$+>1i*L
zwPf?P6w{_$E!T?wxRT2oeEyUN+Pii9dD=mH0{`y`7`TW1``wlR78yY>#O)Y3N~AP&
zR<v|psMHaT$qjzLj(ASIG_|K8fXCZ3)0lx5ZMZt*QppkyP=fl8Fz{-qpuh48)qDf^
zk|Dnnk{bfQ)K_qmR^wbyRTSCHYvQwk1f-2rW}Q?;L&z`+d}CDUX?0_La1LXll9_m?
z?<2;xr@8sXMcHWH@wa-OFjN(3sDIfB?c}G?H&)AE{!Arb&B0F>;H?}okspu`kQp8<
zoL4djZ*fjZ|2bp|Swfakt}x$V{+O4_V`o_UEk3`?W4E`r?f-~yZf$E%pgn=c3D`TL
zp*984ukm<r>LbsQQ^*nI7&P-Y3gp<>h1?Pxh@OlghB}cL$3zEvF41w<Arxu2TfKkw
z#FJj?>qn~b_)&21G9$ejCDZIQ>v=*26#ghPljYEDIX#e8XsoIL2O1w6shHVQQzD)w
z>)RVtv+<f0VN6<&4)LDD9PH;YHv~G@xwPkEG_!(w_Y%1WZ8gpdb8e9T7YwZ)T^~oY
zZ;z78?KCfp2gT2h15?_=)NeM8c-{-_W?&bwEeFQa%p1j?^{aT6_{92_(Eh2oW99+-
zt{K~i-~9y|@%A@V9nupHzJSTC?UiMbmSwiwq{(!Jiv{i-7m)eSO_DrfP?xxmWUwbS
fnbRNhd66Vj$R%WoX;~!Ga-UqmzJdKQTb927xn~d{

diff --git a/src/qt/icons/sound_mute.ico b/src/qt/icons/sound_mute.ico
deleted file mode 100644
index 89a8407354ce0ef805689d75763cd17fd58ce52b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmeI2F^?QY5QTg3frUWg0!ujC3km%XxJ{hmz$3y#LPCTj#2ygBWDxKJHUNPJ38zQ|
zcNRau(TdPGxd2PZiFL4Mx2Wo#Z>PIwW_NDxI1$iN@9VCvdhd15-pqPr=O%8??e9Cq
z1NY&cbGMyyH*SRaPp>%lqsDID4D&Bub?$@LoI5xO^Y69p56yi`Yjmg#A+F#KweGyF
zEK7-MY)p^By+dDHbLd#2?s<9((G6%GsHMc_-5hDH<x_8CUk4gT(x}y-UpqNDQEckN
z`o;_O9;y9iK2PQ;2eroOTaw#ds}B5iu$s`(GKSOBQ_n%Ih7#_e4@aYEBY4PxgE>fE
zj>d5jeXF+yFZvqtd+5_=-D+t$2Xi>cQ{;T2P#97}4z<K{Y!PUH95|wRS9)iR8n82I
zcd&P#l*;=e>rX^huZt|d7J0reQt7;yDgK~X1Y9Wo{<E$tE{`?;p4N$o-DmW6<L@_i
zzq0m~-lHz5ng6_xrB)vP_G0Y+E_4Zn>rqBraTdITIc;y+;IpxD#LdsMSiBy_d{0t;
z<i(u3`BE<9i2dc9+xg(qD!+&D_XM8^>j90cpO0Mb5zKSW^g5eX()^rSxKe*UU-PUs
z?bKNYV=(9H=JedHkDLQ8koyowejl0u_ho9}(k0HsBkNJz%B_(XX8MU9+&L#)<V75C
zfg4T+IVT)&MqHHia#@1a!$~b%aQ7hsT?i+&aCYQw^%v*oobg&V9?YqAJ{O-Ek4?|R
zMfsQ-YDc5|`L@WjsmL#1ihTP><n|+3fA@~8W^c%HK9$9tY5lx9QaqMLaU@H{zZBOG
zjzx|hix?_cv*(ungm$;I^W1t*e@kCtvvbP(Wzg50rDEPUdSi7WPVU7qqUUwaqv3h&
z-1SI&w{hNB3;P<Zp?ua#PnU6orTWtn!n*Ba5Pt`EtmApcYSi53qs^Ilb^HxyaX1nW
z?5(*sxB0Cg<MJF?EaqqIvElCakB5ve*GxFsW6Eu|TK<!|SR)?S9umLYtI<Gni-sA9
zeA{=(Uw1rgp0jX*wSIl=;yu7&JaKP-Kk)}=?w@(k3L4EBz!%Ws)=U##+Z)dwG{Drq
zb3rTk4NU20vln9x4IMb~%RKn;x&Ay^Z@A*~Y4U1%4`}53&_%9M!cBg@p3kE^#~8#v
zHTY&-<9!WJed`-7G~h&|x3F0ltf3{HXM^T0Y$V$wYSD=1?c_AF(?98Og2V^lU=8Iu
zPp(Om4-T;N-%OFer~13=y2x+W^dD;zk=YYjm(OIicSn|=-;%}4`%-;c>idF+Qt5he
zIFV|8U5dMJN>x>|c=t?}4_?ShUnHy*<!B{xyxiP4?049K_CxLb4lC`&<<&L2MtQ#q
z^;)x3%=^aAzvUy+OrH^Y6w#XZamgOi=iugx5DkI{e2n&B=iAXz{c!eanptViVU)ht
zZr_t)?R1<vF!j+M*msAAwq~ZYv602$+^qKu$n(hasyT<YzVT#Qo;r)c+anuF>~s4w
zvs>TlGQE7hOW&`fZFI&tbpMuXE%p$PZOJEee{9v><$-GhHoAlU{t|8W4;R{CupeIo
zG)m=(`_}J1XVIz6S)mEyDXa$%>0Z&aXlNbx2CoSh`^_=;Kt6Fi7=KseEU2q7*)RL*
z)25a@=BWprCFjmHuz0)Wzpry`=D8Lg+Kj^^aH0Vxb5I$RYeXLPV4g?356$V&{o6IQ
zd~F`_5JKZV@x?yjWDcT9K6%U|^~7UGJPL&&9J|gzvy**Omm_(^nS;bZjXTC5`v$3H
z-yr$Mv7_~!OREe{v_ax%gDrwf2%v?wQYL4QHhDu49`d(YC8y5=>)SXkx`qZGn6v*8
z{DZ#-aHFa7<QhbAQimcQhUU9S%hyKp!5kM&L=(Iy-^luNpWR5E|I4o61SEM8aWav!
zhfn0GzKB?S_K{TjBBHpzzpn0=t70}=Rwt81ad@q&<}Ve+-KoBY(ErC!6ahbetnVeN
eMRD)frN;HWM6p(sLY_+{FJz(Pr`pf7N9`Z+b=u_s

diff --git a/src/qt/icons/zip_active.ico b/src/qt/icons/zip_active.ico
deleted file mode 100644
index 40b3a593000cbced7fb6bcd25fb15421382e7eb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmdT|F^=6f5aq`jHi86*3m5LZje(T8L0sh=sf-*$=~4wbMvx+P%6|wSU{4TixrJfn
zy%C>0e?(EFzJ3DpV|FN#^WJbsj<`zcl%A!RFB9~A`uSN(Kc<vky_%l?exA}_XnXy7
zdj9pRl-_@x(*6DP{0Hp*!PxI$gDMcFcBu3Yc8z7kxGgC`na%k2&oPSO4ZxI4_%p`E
z_}@N^qZ8V&!20u#I2priKRk{jg?6fE-E2==`i^owpJ%Dr&)mUw4a30k$KnA0qdj?L
zD=lBlhVzEdj`NT9vWZ$4bBtE(OZ>vJKE=3VU&E;KD~4QyHQ|^%ZZUuLwdj)nv<rJ@
z@ht3;J$=sod2ecu&bm5(XFm+X7{%rr;*YjeidD4LvmZ;_r@L`{IAOnID{)&<fY>Ah
z?3ibeZY<w0U$Oj-9MxIo_`q(fUV}DUKS$LK7nAd6NM|qt%4XJDbFD3dgaWkXj~vq+
z4AwBTrvlErSN7m}Ea7Ku`JutT**A}cJ*ZqEy&ErMF;>E&Zoyml7O>VZ+3t(hxP-@X
z^e1ZhYPMWYC&c0Umhehg!WO2D(HUmkH}G08=bX}rw}rU}uZG!#mwmUmA|_QG_G@uH
z{Ft8l+IkQpoU_$u&$ouhIp%RWUnp-ZbW{8so^pLjTdWHE5AD-?M19xc5zb0!9ZP=s
zHg6-GPw9v8DZLpV(zke5O)@}JQilw{I0K9CEnK0~_Yl3ee!^XPXIZQnaM;FD>YIA%
ze`h-%4_`Oz;W9rd-_@W!hSmLk)t(gY@(nlT!_V`(pfWt|p#m=VJbh$==j%W62aXo(
zz4%q^aPE8kuVUkzF?V`744-Eh#bdL62)@Ja<=}X&Z80`ECLG5?pQZg=G!N@^f2<uC
z<XFQOp3G_-#Pec#djsF&ZE@JxcxD>#dpIuMAv~9j_^lk*;J0vGi@(Lug`eYRdkb-F
z(lHm-;vdKEdH%ogL(a7L*4pA6YyLClZhX!q$|*(NwY~x0-%Uz&%QGwI7k!uaD*AmK
zKH;s@_F&29*cR<)++SXdAJZM~UZ?R9Q+a@#A;T=EV!UBrZ6APl1}^Vm_mFoG-NOcc
zxV*kp`5k;|oa^qY&R8*?@foPo*x~ZsV(%ICwNo3`1&2Ey{;b&ji1^|y-N4j0`BC+v
zl~X>Dmjxbd|L8}>2jh<Ct}<_%`$7CS=T>wIF=*m0<l3&-ukdejXI{Q<quiVyc{OtS
z=WF?^bI;t|+n&?cZ^qB}NiO7L@w~p?<wMwetMhmK;+FQ@tncNoaT7NdwMBmK18quK
zNLc18=EfXU<L7ws$=0{6`Jh;M8`jxwefh4i#V>AYkEgbh4{Q^c*UHtV8|E);@`|s=
zhuOZA%RBhRE#2$G;*Qu6f6YPM(mg&L#V>B@Rv(V!7q@ha4@dKhTYAffTkwlpy5_^J
z_{A-~=EE-jd`2uk@;z{kl<sa@=f7lgWZRd(U%2bpTK2Y=;<hz^u6MA@cXr*~oAs{!
zSKyET+qOL0J9g*$C(gfxFOJ#bNB{CW0^|PQ%%AjDTF!TzTkCTPd**%o<_$hNy!e#T
e-A8;Xc!J=2M0$XnvkcIX69v^n$^fi0IR6Fnw*xBx

diff --git a/src/qt/icons/zip_empty.ico b/src/qt/icons/zip_empty.ico
deleted file mode 100644
index 4123c7cc24a511cb40688e047ec1ad29dda6be96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmchdJ#O1T5QR5D5Fkk7!i7tfDRTr@Ntudp=~O{ZVW~`+V+1k~x2Y^&!k17HxKU%k
zW@adV#_CzaU6O(q5T57n&6_1dE~KRNCcRBZN6B!Oe!NZTb4uy>cx(TCm(m~eot$j#
zpYK!p{voB=Y-|6vx__4Y(Q52ZW7zr)(y7%ASnX4;Vjo49JD<-xytug7v8@oU7aZh*
zH#aw3?rOE_5Sw^TfUmXX{s`eBKj)x^7`fNi*BvK_-`h}MTMGxXIEVIwpIk+HvB$0f
zpK@s}Ha+_KlcT7;4&9#_B18}IygxCW6Tf0UKQ+u3A$j}y<IAtF>$AnZ(qSH_Mz!Hr
zL>GQ1=Wj*s5k>O6_Tjv3*H>+Od)BtgOT)%+*|tp$TE0JL>~YgQZ~S@X>z6&FMy#DZ
zvU=<xR9y}8GAH&BPHI7}8P^HBhMQ|fZG<(Pksf*|a=&IepZ60k^pG1N+{E{Bk~5T(
z+4E}z7yW9Hx|~yIRlCH^Jo(J@Db;G6Iyil1)uXm@s0|l&ev#=zE;%Knj=a~>hxQVp
z3*4uV*wER%_ubuH_Z(p#;J_{+`Doauj~VkE%k#x^ZwJYvu1ho_j>JH6B1C`w@56a~
z5u+AP?t5^tSQPbb8RPd8JxbW=viH-yy>B+nyj?F>_MV#Cd&=?L@XFp-5q{l?d%oBE
zd&`c{>63kUZ+)|~^n|suAI5_{fpW{iUMprj2KQ1f?gd5ivR=h`xQCRhWY_c<%k90N
zW(oHy;>NES&9iR~YPE*_Re#COdqf<Ozr;;lexX%AIVG+rp6ide)gN(1e(w?Kgd2=F
z@M|8tzDH3EKL}SX_UVTMZV<ns#%uJ$K`n^Cgf;r%fE&aQs(*-n<xno-ihcU&UyI63
zo%MKe|7h-5yHEdEPU>p(v(L2%H#kJU=i0~DUPJ@jefo)ME`CLNk`LnVM413bVv5SC
zcAtLd^`$jaZRc!n+xF4UOAmH#y0>%Iruky$r%O9`HFmB7mv;VgyB@vXdHftUv(Kr0
zIEO9#i_7V2?|opj_@{Sx$pCkUrTss!mYtq@f2pn7rf7jnd(_(0kI|t2E^2#5c|$ZD
zx;L6?G?aQ1kC0vw_Gy4Ksx8H-E9LFez`X*;RE#vx$22@Id{cXB{SXaNZsgZqksa0B
z@I2E}G(Y}`BkEc5!|NA-zqJNGy+O?zYs2pvB5wSOLwi!Mb>12s8pBVmqUH~^;qRLt
zPVJ3Nyo6DH&HQk~p-6lv4w)Zr?Tt-5!YFUZ{BXmiNW2!u%n!Hr#wM;9#mCGKH=K&Z
zOE_hIxV1MnaWL{vnP0i-0TPd}W`1&}Vx*yO{;1|qer7Ta;q(7cy&|5P`MI7`Q8kR2
z-}U-_*&2jsR}IdC4vm%k#7l_Qh`$@g1UhPt+NEAmyl;N*>q~RsnySI6oj>C77>k~-
zh2FQ_oZEj)upfY$X8veD{5;qXKKJ&+&!%b4*7ik&eV=e<-#<7ujs}j)sd#GyYvcP5
DJ}<5+

diff --git a/src/qt/icons/zip_empty_active.ico b/src/qt/icons/zip_empty_active.ico
deleted file mode 100644
index d57860b1050ffb2520c1c04c337435f1fc4a50fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9622
zcmchczi!+{5XSdxCq|IME*!v}Rl3X@_<{gwqr&V0Bvp{7kmxRD9zmtC0+KeBq?fpt
zxFS%aMu5DT+2fB~j=1EKJbMHB<NW*Po8=zwpg6a2&)mzGPVmJ2@yxlOoO7>U9qfO<
zcJ6QSy?%YL|NO?e-@kS4<m6y~l)C>U_pQ{(tuP$?0&XjHGgfGFQ`CE|A*z^retsVD
z?CdPHgR7;M>%h};kPF`2+{D`J>+4t(WJz`RpYk*u)WjThYHotsGy1yfgN~*?&4nxW
zmB7{2)ntGA4b~ctC`A5=`yl;oO|LJtpv=MkvBwf>=e1l>JGBYYLrZN9u^if2h2yCG
z(UU`T5l{OQV{Ysmrt?$7d^sd<s6Rf=uJWrsSv^eS)L4!9Euss*l5=m7Gh&fEt$p}0
zg#CvQcJdT`-C^~E*gk}+8o|pD^gSc5oA|!b_m!@{<Q=tO_4Y{W)gHRWs3QmSGG}AA
zpB+9!d<KUIsRemv@j2D;$fs|U?p|Vz?v|EkW}h*(>WDcVOLu4Z2K8t|S=umSAs<}m
z;A~r*qYoXUoQ3+}vU&#XhEr?O#WS|ET06%X>xCQSY_)qWH-oh!e$}V-?2+6)dJh-r
zOM1XXo$}KMedJ6bb>w|1eQ2LTbb&+qh|Qf{d*9yPcAq67hl72YLh{itq>mZX9Ldua
zds`%rx|k?J6p4Z4<PiP5(~@58nV}X=&OKPybx$XG)Tu5OzNM%<;q+a&zjzbwwlBi|
z;zigA`UI=fH}ZY;k9=SKYVhZty_5LfU&rq)`3dd5my7SM-{iOSiq+c>;Yn@1Pp{H8
zk%PUq7&&X<wO7|W+sATo7QmLX`zGq{wBJY%d%oZVl{@BijF0a!J*K#0kA?g>Zv5a9
z{nWAtAkP7NiT*(jc|bY;G4$uSnPaR+vlsDf>jAZU1Gn|V4bnsN(xraol@;Kk2GsnR
z&>((`kxTi~OA6r~;viPq!}i1;(@#!m5Avu(<CuPOsRi**VTpb?;0E!7);~wT<*;1D
zEsp7@e<@mS>W22;<}S6z^e^S4u0%ikT#9gmbM$Mj?xn0jL<8Jo`ia?G{1)j+K8Qbx
z5&??DELu)$kLg!lUAAVet(;-^Jbdy`!^8Vcxc}(F-Kh(E!JVL26u<XR<agIsf?lvH
z!ky&p{bl?eb|QVYa`8K?)<0aXUxVjBXz|lQZF>=$i*QGr*#AS%T6){7(=(@kuctj<
z#_oDP{^ixh4mu_^FsJF^25p%&p5>vw)~EY2p}~GG273w#e%<S1_5ZBB*^A5`O!X$-
z!#T5$^oNr@wU~>~+WSoZS!XSI?os2)`B(MUPtnT$N|D>!oZmj1SsFyIw$#45a`WRa
z(lBQalK%9t^Wdj9X!Ck@qao&U&Jt9=F5N5mb^hoR>~ST2;-Jmz**aUILu**-*Nc2@
zfew5ieyx?fRwFifIiyz)g@=6jQ*L4w>1omC<!tI~T*pF(jafe&7HwUr4S&h}aN6G3
z#B-R-n=?P$a9Jc?ic98)+xEsLZZQ{MGC$mKS|mP&YvzaB_Qoa-=KO2sx7_pqiRZ9n
zesb1gPQ%#zxte47nMpLX@77~+m-3X%&+}Z1R@0LCRj=-stXYV5t3i3tVPjK%;!}v$
z9Df`}1S;AbYftsc#mDB?zPfA<Tx&Hbwesh9G{&OmmqP6u?tYQ~!E^CERNJSYe7$+7
vwwrrjySvJ{z2HvJN8D}%H<iS_zj#tr@4u73OL+OaM70Fv?-bSE`^*0U&h6FK

diff --git a/src/qt/qt_iconindicators.cpp b/src/qt/qt_iconindicators.cpp
new file mode 100644
index 000000000..dc8e3ceb2
--- /dev/null
+++ b/src/qt/qt_iconindicators.cpp
@@ -0,0 +1,33 @@
+#include <QSize>
+#include <QPainter>
+#include "qt_iconindicators.hpp"
+
+QIcon
+getIndicatorIcon(IconIndicator indicator)
+{
+    switch (indicator) {
+        case Active:
+            return QIcon(":/settings/qt/icons/active.ico");
+        case Disabled:
+            return QIcon(":/settings/qt/icons/disabled.ico");
+        default:
+            return QIcon();
+    }
+}
+
+QPixmap
+getIconWithIndicator(const QIcon &icon, const QSize &size, QIcon::Mode iconMode, IconIndicator indicator)
+{
+    auto iconPixmap = icon.pixmap(size, iconMode);
+
+    if (indicator == None)
+        return iconPixmap;
+
+    auto painter = QPainter(&iconPixmap);
+    auto indicatorPixmap = getIndicatorIcon(indicator).pixmap(size);
+
+    painter.drawPixmap(0, 0, indicatorPixmap);
+    painter.end();
+
+    return iconPixmap;
+}
\ No newline at end of file
diff --git a/src/qt/qt_iconindicators.hpp b/src/qt/qt_iconindicators.hpp
new file mode 100644
index 000000000..553520063
--- /dev/null
+++ b/src/qt/qt_iconindicators.hpp
@@ -0,0 +1,15 @@
+#ifndef QT_ICONINDICATORS_HPP
+#    define QT_INDICATORS_HPP
+
+#include <QPixmap>
+#include <QIcon>
+
+enum IconIndicator {
+    None,
+    Active,
+    Disabled,
+};
+
+QPixmap getIconWithIndicator(const QIcon &icon, const QSize &size, QIcon::Mode iconMode, IconIndicator indicator);
+
+#endif
\ No newline at end of file
diff --git a/src/qt/qt_machinestatus.cpp b/src/qt/qt_machinestatus.cpp
index eff29a232..d555be360 100644
--- a/src/qt/qt_machinestatus.cpp
+++ b/src/qt/qt_machinestatus.cpp
@@ -54,6 +54,7 @@ extern "C" {
 #include "qt_mainwindow.hpp"
 #include "qt_soundgain.hpp"
 #include "qt_progsettings.hpp"
+#include "qt_iconindicators.hpp"
 
 #include <array>
 
@@ -65,19 +66,24 @@ namespace {
 struct PixmapSetActive {
     QPixmap normal;
     QPixmap active;
-    void    load(const QString &basePath);
+    void    load(const QIcon &icon);
+};
+struct PixmapSetDisabled {
+    QPixmap normal;
+    QPixmap disabled;
+    void    load(const QIcon &icon);
 };
 struct PixmapSetEmpty {
     QPixmap normal;
     QPixmap empty;
-    void    load(const QString &basePath);
+    void    load(const QIcon &icon);
 };
 struct PixmapSetEmptyActive {
     QPixmap normal;
     QPixmap active;
     QPixmap empty;
     QPixmap empty_active;
-    void    load(QString basePath);
+    void    load(const QIcon &icon);
 };
 struct Pixmaps {
     PixmapSetEmpty       cartridge;
@@ -90,7 +96,7 @@ struct Pixmaps {
     PixmapSetEmptyActive mo;
     PixmapSetActive      hd;
     PixmapSetEmptyActive net;
-    QPixmap              sound, soundMuted;
+    PixmapSetDisabled    sound;
 };
 
 struct StateActive {
@@ -170,30 +176,35 @@ struct StateEmptyActive {
 };
 
 static QSize         pixmap_size(16, 16);
-static const QString pixmap_empty        = QStringLiteral("_empty");
-static const QString pixmap_active       = QStringLiteral("_active");
-static const QString pixmap_empty_active = QStringLiteral("_empty_active");
+
 void
-PixmapSetEmpty::load(const QString &basePath)
+PixmapSetEmpty::load(const QIcon &icon)
 {
-    normal = QIcon(basePath.arg(QStringLiteral(""))).pixmap(pixmap_size);
-    empty  = QIcon(basePath.arg(pixmap_empty)).pixmap(pixmap_size);
+    normal = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, None);
+    empty  = getIconWithIndicator(icon, pixmap_size, QIcon::Disabled, None);
 }
 
 void
-PixmapSetActive::load(const QString &basePath)
+PixmapSetActive::load(const QIcon &icon)
 {
-    normal = QIcon(basePath.arg(QStringLiteral(""))).pixmap(pixmap_size);
-    active = QIcon(basePath.arg(pixmap_active)).pixmap(pixmap_size);
+    normal = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, None);
+    active = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, Active);
 }
 
 void
-PixmapSetEmptyActive::load(QString basePath)
+PixmapSetDisabled::load(const QIcon &icon)
 {
-    normal       = QIcon(basePath.arg(QStringLiteral(""))).pixmap(pixmap_size);
-    active       = QIcon(basePath.arg(pixmap_active)).pixmap(pixmap_size);
-    empty        = QIcon(basePath.arg(pixmap_empty)).pixmap(pixmap_size);
-    empty_active = QIcon(basePath.arg(pixmap_empty_active)).pixmap(pixmap_size);
+    normal   = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, None);
+    disabled = getIconWithIndicator(icon, pixmap_size, QIcon::Disabled, Disabled);
+}
+
+void
+PixmapSetEmptyActive::load(const QIcon &icon)
+{
+    normal       = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, None);
+    active       = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, Active);
+    empty        = getIconWithIndicator(icon, pixmap_size, QIcon::Disabled, None);
+    empty_active = getIconWithIndicator(icon, pixmap_size, QIcon::Disabled, Active);
 }
 }
 
@@ -202,21 +213,20 @@ struct MachineStatus::States {
 
     States(QObject *parent)
     {
-        pixmaps.cartridge.load(":/settings/qt/icons/cartridge%1.ico");
-        pixmaps.cassette.load(":/settings/qt/icons/cassette%1.ico");
+        pixmaps.cartridge.load(QIcon(":/settings/qt/icons/cartridge.ico"));
+        pixmaps.cassette.load(QIcon(":/settings/qt/icons/cassette.ico"));
         pixmaps.floppy_disabled.normal       = QIcon(":/settings/qt/icons/floppy_disabled.ico").pixmap(pixmap_size);
         pixmaps.floppy_disabled.active       = pixmaps.floppy_disabled.normal;
         pixmaps.floppy_disabled.empty        = pixmaps.floppy_disabled.normal;
         pixmaps.floppy_disabled.empty_active = pixmaps.floppy_disabled.normal;
-        pixmaps.floppy_525.load(":/settings/qt/icons/floppy_525%1.ico");
-        pixmaps.floppy_35.load(":/settings/qt/icons/floppy_35%1.ico");
-        pixmaps.cdrom.load(":/settings/qt/icons/cdrom%1.ico");
-        pixmaps.zip.load(":/settings/qt/icons/zip%1.ico");
-        pixmaps.mo.load(":/settings/qt/icons/mo%1.ico");
-        pixmaps.hd.load(":/settings/qt/icons/hard_disk%1.ico");
-        pixmaps.net.load(":/settings/qt/icons/network%1.ico");
-        pixmaps.sound = QIcon(":/settings/qt/icons/sound.ico").pixmap(pixmap_size);
-        pixmaps.soundMuted = QIcon(":/settings/qt/icons/sound_mute.ico").pixmap(pixmap_size);
+        pixmaps.floppy_525.load(QIcon(":/settings/qt/icons/floppy_525.ico"));
+        pixmaps.floppy_35.load(QIcon(":/settings/qt/icons/floppy_35.ico"));
+        pixmaps.cdrom.load(QIcon(":/settings/qt/icons/cdrom.ico"));
+        pixmaps.zip.load(QIcon(":/settings/qt/icons/zip.ico"));
+        pixmaps.mo.load(QIcon(":/settings/qt/icons/mo.ico"));
+        pixmaps.hd.load(QIcon(":/settings/qt/icons/hard_disk.ico"));
+        pixmaps.net.load(QIcon(":/settings/qt/icons/network.ico"));
+        pixmaps.sound.load(QIcon(":/settings/qt/icons/sound.ico"));
 
         cartridge[0].pixmaps = &pixmaps.cartridge;
         cartridge[1].pixmaps = &pixmaps.cartridge;
@@ -510,7 +520,7 @@ MachineStatus::refresh(QStatusBar *sbar)
             sound_muted ^= 1;
             config_save();
             if (d->sound)
-                d->sound->setPixmap(sound_muted ? d->pixmaps.soundMuted : d->pixmaps.sound);
+                d->sound->setPixmap(sound_muted ? d->pixmaps.sound.disabled : d->pixmaps.sound.normal);
 
             muteUnmuteAction->setText(sound_muted ? tr("&Unmute") : tr("&Mute"));
         });
@@ -694,7 +704,7 @@ MachineStatus::refresh(QStatusBar *sbar)
     }
 
     d->sound = std::make_unique<ClickableLabel>();
-    d->sound->setPixmap(sound_muted ? d->pixmaps.soundMuted : d->pixmaps.sound);
+    d->sound->setPixmap(sound_muted ? d->pixmaps.sound.disabled : d->pixmaps.sound.normal);
     if (muteUnmuteAction)
         muteUnmuteAction->setText(sound_muted ? tr("&Unmute") : tr("&Mute"));
 
diff --git a/src/qt_resources.qrc b/src/qt_resources.qrc
index 6ca323b89..dc8db2c06 100644
--- a/src/qt_resources.qrc
+++ b/src/qt_resources.qrc
@@ -1,16 +1,9 @@
 <RCC>
     <qresource prefix="/settings">
         <file>qt/icons/cartridge.ico</file>
-        <file>qt/icons/cartridge_empty.ico</file>
         <file>qt/icons/cassette.ico</file>
-        <file>qt/icons/cassette_active.ico</file>
-        <file>qt/icons/cassette_empty.ico</file>
-        <file>qt/icons/cassette_empty_active.ico</file>
         <file>qt/icons/cdrom.ico</file>
-        <file>qt/icons/cdrom_active.ico</file>
         <file>qt/icons/cdrom_disabled.ico</file>
-        <file>qt/icons/cdrom_empty.ico</file>
-        <file>qt/icons/cdrom_empty_active.ico</file>
         <file>qt/icons/cdrom_mute.ico</file>
         <file>qt/icons/cdrom_unmute.ico</file>
         <file>qt/icons/cdrom_image.ico</file>
@@ -18,38 +11,24 @@
         <file>qt/icons/cdrom_host.ico</file>
         <file>qt/icons/display.ico</file>
         <file>qt/icons/floppy_35.ico</file>
-        <file>qt/icons/floppy_35_active.ico</file>
-        <file>qt/icons/floppy_35_empty.ico</file>
-        <file>qt/icons/floppy_35_empty_active.ico</file>
         <file>qt/icons/floppy_525.ico</file>
-        <file>qt/icons/floppy_525_active.ico</file>
-        <file>qt/icons/floppy_525_empty.ico</file>
-        <file>qt/icons/floppy_525_empty_active.ico</file>
         <file>qt/icons/floppy_and_cdrom_drives.ico</file>
         <file>qt/icons/floppy_disabled.ico</file>
         <file>qt/icons/hard_disk.ico</file>
-        <file>qt/icons/hard_disk_active.ico</file>
         <file>qt/icons/input_devices.ico</file>
         <file>qt/icons/machine.ico</file>
         <file>qt/icons/mo.ico</file>
-        <file>qt/icons/mo_active.ico</file>
         <file>qt/icons/mo_disabled.ico</file>
-        <file>qt/icons/mo_empty.ico</file>
-        <file>qt/icons/mo_empty_active.ico</file>
         <file>qt/icons/network.ico</file>
-        <file>qt/icons/network_active.ico</file>
-        <file>qt/icons/network_empty.ico</file>
         <file>qt/icons/other_peripherals.ico</file>
         <file>qt/icons/other_removable_devices.ico</file>
         <file>qt/icons/ports.ico</file>
         <file>qt/icons/sound.ico</file>
-        <file>qt/icons/sound_mute.ico</file>
         <file>qt/icons/storage_controllers.ico</file>
         <file>qt/icons/zip.ico</file>
-        <file>qt/icons/zip_active.ico</file>
         <file>qt/icons/zip_disabled.ico</file>
-        <file>qt/icons/zip_empty.ico</file>
-        <file>qt/icons/zip_empty_active.ico</file>
+        <file>qt/icons/active.ico</file>
+        <file>qt/icons/disabled.ico</file>
         <file>qt/icons/86Box-gray.ico</file>
         <file>qt/icons/86Box-green.ico</file>
         <file>qt/icons/86Box-red.ico</file>

From fcd6bd9c664564eb2e0d03086cafb46e6163d585 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 29 Mar 2025 01:22:35 +0100
Subject: [PATCH 19/59] Serial: Give the OKI IF386AX 16450 serial ports instead
 of 8250.

---
 src/device/serial.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/device/serial.c b/src/device/serial.c
index deb97225a..8483f7fe3 100644
--- a/src/device/serial.c
+++ b/src/device/serial.c
@@ -999,7 +999,8 @@ void
 serial_standalone_init(void)
 {
     while (next_inst < SERIAL_MAX)
-        device_add_inst(&ns8250_device, next_inst + 1);
+        device_add_inst(!strcmp(machine_get_internal_name(), "if386sx") ? &ns16450_device :
+                        &ns8250_device, next_inst + 1);
 };
 
 const device_t ns8250_device = {

From 2ed64c83996e762eb10c296666d759068c8ec69f Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 29 Mar 2025 08:11:04 +0100
Subject: [PATCH 20/59] Machine settings: Reduce the two loops to determine
 present machine types to a single loop, reduces the number of iterations from
 (number of machine types * number of machines) to just (number of machines),
 speeding things up.

---
 src/qt/qt_settingsmachine.cpp | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/qt/qt_settingsmachine.cpp b/src/qt/qt_settingsmachine.cpp
index 9b1f9849e..34968b288 100644
--- a/src/qt/qt_settingsmachine.cpp
+++ b/src/qt/qt_settingsmachine.cpp
@@ -88,20 +88,31 @@ SettingsMachine::SettingsMachine(QWidget *parent)
     ui->comboBoxPitMode->setCurrentIndex(-1);
     ui->comboBoxPitMode->setCurrentIndex(pit_mode + 1);
 
-    int   selectedMachineType = 0;
-    auto *machineTypesModel   = ui->comboBoxMachineType->model();
-    for (int i = 1; i < MACHINE_TYPE_MAX; ++i) {
-        int j = 0;
-        while (machine_get_internal_name_ex(j) != nullptr) {
-            if (machine_available(j) && (machine_get_type(j) == i)) {
+    int         selectedMachineType = 0;
+    auto *      machineTypesModel   = ui->comboBoxMachineType->model();
+    int         i                   = -1;
+    int         j                   = 0;
+    int         cur_j               = 0;
+    const void *miname;
+    do {
+        miname = machine_get_internal_name_ex(j);
+
+        if ((miname == nullptr) || (machine_get_type(j) != i)) {
+            if ((i != -1) && (cur_j != 0)) {
                 int row = Models::AddEntry(machineTypesModel, machine_types[i].name, machine_types[i].id);
                 if (machine_types[i].id == machine_get_type(machine))
                     selectedMachineType = row;
-                break;
             }
-            j++;
+
+            i = machine_get_type(j);
+            cur_j = 0;
         }
-    }
+
+        if (machine_available(j))
+            cur_j++;
+
+        j++;
+    } while (miname != nullptr);
 
     ui->comboBoxMachineType->setCurrentIndex(-1);
     ui->comboBoxMachineType->setCurrentIndex(selectedMachineType);

From bb22e1dccb39b0ce1af9bfbb3202c5a78da3bdb3 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 29 Mar 2025 08:14:30 +0100
Subject: [PATCH 21/59] Moved the Packard Bell PB450 to the correct place on
 the machines list.

---
 src/machine/machine_table.c | 80 ++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index aa9bae305..fa383139b 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -6981,46 +6981,6 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* has a Phoenix PLCC Multikey copyrighted 1993, version unknown. */
-    {
-        .name = "[OPTi 895] Packard Bell PB450",
-        .internal_name = "pb450",
-        .type = MACHINE_TYPE_486_S3_PCI,
-        .chipset = MACHINE_CHIPSET_OPTI_895_802G,
-        .init = machine_at_pb450_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_SUPER_IO | MACHINE_IDE_DUAL | MACHINE_VIDEO,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = &pb450_device,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = &gd5428_vlb_onboard_device,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
     /* Uses an NEC 90M002A (UPD82C42C, 8042 clone) with unknown firmware. */
     {
         .name = "[SiS 461] Acer V10",
@@ -7915,6 +7875,46 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
+    /* has a Phoenix PLCC Multikey copyrighted 1993, version unknown. */
+    {
+        .name = "[OPTi 895] Packard Bell PB450",
+        .internal_name = "pb450",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_OPTI_895_802G,
+        .init = machine_at_pb450_init,
+        .p1_handler = NULL,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_SUPER_IO | MACHINE_IDE_DUAL | MACHINE_VIDEO,
+        .ram = {
+            .min = 1024,
+            .max = 65536,
+            .step = 1024
+        },
+        .nvrmask = 255,
+        .kbc_device = NULL,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &pb450_device,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &gd5428_vlb_onboard_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     /* This has an AMIKey-2, which is an updated version of type 'H'. */
     {
         .name = "[i420EX] ASUS PVI-486AP4",

From 6d43f7e2df212fd7d9bf662a0fcf6caa18c75541 Mon Sep 17 00:00:00 2001
From: TC1995 <mariogplayer90@gmail.com>
Date: Sat, 29 Mar 2025 14:24:20 +0100
Subject: [PATCH 22/59] More fixes for 5380-based SCSI chips of the day (March
 29th, 2025)

1. Avoid audio stops when they don't need to be.
2. And improved the MMIO-based NCR 53c400 timings to be similar to the port I/O-based one (T130B).
3. Minor timing fixes to the T128/PAS as well (especially for the hdd, when entering Windows 1.x using a SCSI HDD).
---
 src/scsi/scsi_ncr5380.c   |  3 --
 src/scsi/scsi_ncr53c400.c | 94 ++++++++++++++++++++++++++++-----------
 src/scsi/scsi_t128.c      | 15 ++++---
 3 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/src/scsi/scsi_ncr5380.c b/src/scsi/scsi_ncr5380.c
index 048194a96..132fade37 100644
--- a/src/scsi/scsi_ncr5380.c
+++ b/src/scsi/scsi_ncr5380.c
@@ -95,9 +95,6 @@ ncr5380_reset(ncr_t *ncr)
 
     ncr->timer(ncr->priv, 0.0);
 
-    for (int i = 0; i < 8; i++)
-        scsi_device_reset(&scsi_devices[ncr->bus][i]);
-
     scsi_bus->state = STATE_IDLE;
     scsi_bus->clear_req = 0;
     scsi_bus->wait_complete = 0;
diff --git a/src/scsi/scsi_ncr53c400.c b/src/scsi/scsi_ncr53c400.c
index fc62a1cab..f91dc83a9 100644
--- a/src/scsi/scsi_ncr53c400.c
+++ b/src/scsi/scsi_ncr53c400.c
@@ -29,11 +29,11 @@
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/io.h>
-#include <86box/timer.h>
 #include <86box/dma.h>
 #include <86box/pic.h>
 #include <86box/mca.h>
 #include <86box/mem.h>
+#include <86box/timer.h>
 #include <86box/rom.h>
 #include <86box/device.h>
 #include <86box/nvr.h>
@@ -41,6 +41,7 @@
 #include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/scsi_ncr5380.h>
+#include "cpu.h"
 
 #define LCS6821N_ROM            "roms/scsi/ncr5380/Longshine LCS-6821N - BIOS version 1.04.bin"
 #define COREL_LS2000_ROM        "roms/scsi/ncr5380/Corel LS2000 - BIOS ROM - Ver 1.65.bin"
@@ -80,6 +81,7 @@ typedef struct ncr53c400_t {
     int buffer_host_pos;
 
     int     busy;
+    int     reset;
     uint8_t pos_regs[8];
 
     pc_timer_t timer;
@@ -126,6 +128,9 @@ ncr53c400_write(uint32_t addr, uint8_t val, void *priv)
 
     addr &= 0x3fff;
 
+    if (addr >= 0x3880)
+        ncr53c400_log("%04X:%08X: memio_write(%04x)=%02x\n", CS, cpu_state.pc, addr, val);
+
     if (addr >= 0x3a00)
         ncr400->ext_ram[addr - 0x3a00] = val;
     else {
@@ -147,6 +152,8 @@ ncr53c400_write(uint32_t addr, uint8_t val, void *priv)
                     if (ncr400->buffer_host_pos == MIN(128, dev->buffer_length)) {
                         ncr400->status_ctrl |= STATUS_BUFFER_NOT_READY;
                         ncr400->busy = 1;
+                        if (ncr400->type != ROM_T130B)
+                            timer_on_auto(&ncr400->timer, 1.0);
                     }
                 } else
                     ncr53c400_log("No Write.\n");
@@ -155,6 +162,19 @@ ncr53c400_write(uint32_t addr, uint8_t val, void *priv)
             case 0x3980:
                 switch (addr) {
                     case 0x3980: /* Control */
+                        /*Parity bits*/
+                        /*This is to avoid RTBios 8.10R BIOS problems with the hard disk and detection.*/
+                        /*If the parity bits are set, bit 0 of the 53c400 status port should be set as well.*/
+                        /*Required by RTASPI10.SYS otherwise it won't initialize.*/
+                        if (val & 0x80) {
+                            if (ncr->mode & 0x30) {
+                                if (!(ncr->mode & MODE_DMA)) {
+                                    ncr->mode = 0x00;
+                                    ncr400->reset = 1;
+                                }
+                            }
+                        }
+
                         ncr53c400_log("NCR 53c400 control=%02x, mode=%02x.\n", val, ncr->mode);
                         if ((val & CTRL_DATA_DIR) && !(ncr400->status_ctrl & CTRL_DATA_DIR)) {
                             ncr400->buffer_host_pos = MIN(128, dev->buffer_length);
@@ -180,10 +200,7 @@ ncr53c400_write(uint32_t addr, uint8_t val, void *priv)
                         }
                         if ((ncr->mode & MODE_DMA) && (dev->buffer_length > 0)) {
                             memset(ncr400->buffer, 0, MIN(128, dev->buffer_length));
-                            if (ncr400->type == ROM_T130B)
-                                timer_on_auto(&ncr400->timer, 10.0);
-                            else
-                                timer_on_auto(&ncr400->timer, scsi_bus->period);
+                            timer_on_auto(&ncr400->timer, 10.0);
                             ncr53c400_log("DMA timer on=%02x, callback=%lf, scsi buflen=%d, waitdata=%d, waitcomplete=%d, clearreq=%d, p=%lf enabled=%d.\n",
                                   ncr->mode & MODE_MONITOR_BUSY, scsi_device_get_callback(dev), dev->buffer_length, scsi_bus->wait_data, scsi_bus->wait_complete, scsi_bus->clear_req, scsi_bus->period, timer_is_enabled(&ncr400->timer));
                         } else
@@ -241,6 +258,20 @@ ncr53c400_read(uint32_t addr, void *priv)
 
                     if (ncr400->buffer_host_pos == MIN(128, dev->buffer_length)) {
                         ncr400->status_ctrl |= STATUS_BUFFER_NOT_READY;
+                        if (ncr400->type != ROM_T130B) {
+                            if (!ncr400->block_count_loaded) {
+                                scsi_bus->tx_mode = PIO_TX_BUS;
+                                ncr53c400_log("IO End of read transfer\n");
+                                ncr->isr |= STATUS_END_OF_DMA;
+                                if (ncr->mode & MODE_ENA_EOP_INT) {
+                                    ncr53c400_log("NCR read irq\n");
+                                    ncr5380_irq(ncr, 1);
+                                }
+                            } else if (!timer_is_enabled(&ncr400->timer)) {
+                                ncr53c400_log("Timer re-enabled.\n");
+                                timer_on_auto(&ncr400->timer, 1.0);
+                            }
+                        }
                     }
                 }
                 break;
@@ -252,11 +283,10 @@ ncr53c400_read(uint32_t addr, void *priv)
                         ncr53c400_log("NCR status ctrl read=%02x.\n", ncr400->status_ctrl & STATUS_BUFFER_NOT_READY);
                         if (!ncr400->busy)
                             ret |= STATUS_5380_ACCESSIBLE;
-                        if (ncr->mode & 0x30) {            /*Parity bits*/
-                            if (!(ncr->mode & MODE_DMA)) { /*This is to avoid RTBios 8.10R BIOS problems with the hard disk and detection.*/
-                                ret |= 0x01;               /*If the parity bits are set, bit 0 of the 53c400 status port should be set as well.*/
-                                ncr->mode = 0x00;          /*Required by RTASPI10.SYS otherwise it won't initialize.*/
-                            }
+
+                        if (ncr400->reset) {
+                            ncr400->reset = 0;
+                            ret |= 0x01;
                         }
                         ncr53c400_log("NCR 53c400 status=%02x.\n", ret);
                         break;
@@ -267,7 +297,10 @@ ncr53c400_read(uint32_t addr, void *priv)
                         break;
 
                     case 0x3982: /* switch register read */
-                        ret = 0xff;
+                        if (ncr->irq != -1) {
+                            ret = 0xf8;
+                            ret += ncr->irq;
+                        }
                         ncr53c400_log("Switches read=%02x.\n", ret);
                         break;
 
@@ -282,7 +315,7 @@ ncr53c400_read(uint32_t addr, void *priv)
     }
 
     if (addr >= 0x3880)
-        ncr53c400_log("memio_read(%08x)=%02x\n", addr, ret);
+        ncr53c400_log("%04X:%08X: memio_read(%04x)=%02x\n", CS, cpu_state.pc, addr, ret);
 
     return ret;
 }
@@ -424,11 +457,8 @@ ncr53c400_callback(void *priv)
     uint8_t        status;
 
     if (scsi_bus->tx_mode != PIO_TX_BUS) {
-        if (ncr400->type == ROM_T130B) {
-            ncr53c400_log("PERIOD T130B DMA=%lf.\n", scsi_bus->period / 225.0);
-            timer_on_auto(&ncr400->timer, scsi_bus->period / 225.0);
-        } else
-            timer_on_auto(&ncr400->timer, 1.0);
+        ncr53c400_log("PERIOD T130B DMA=%lf.\n", scsi_bus->period / 225.0);
+        timer_on_auto(&ncr400->timer, scsi_bus->period / 225.0);
     }
 
     if (scsi_bus->data_wait & 1) {
@@ -538,14 +568,17 @@ ncr53c400_callback(void *priv)
                     ncr400->block_count = (ncr400->block_count - 1) & 0xff;
                     ncr53c400_log("NCR 53c400 Remaining blocks to be read=%d\n", ncr400->block_count);
                     if (!ncr400->block_count) {
-                        scsi_bus->tx_mode = PIO_TX_BUS;
                         ncr400->block_count_loaded = 0;
-                        ncr53c400_log("IO End of read transfer\n");
-                        ncr->isr |= STATUS_END_OF_DMA;
-                        if (ncr->mode & MODE_ENA_EOP_INT) {
-                            ncr53c400_log("NCR read irq\n");
-                            ncr5380_irq(ncr, 1);
-                        }
+                        if (ncr400->type == ROM_T130B) {
+                            scsi_bus->tx_mode = PIO_TX_BUS;
+                            ncr53c400_log("IO End of read transfer\n");
+                            ncr->isr |= STATUS_END_OF_DMA;
+                            if (ncr->mode & MODE_ENA_EOP_INT) {
+                                ncr53c400_log("NCR read irq\n");
+                                ncr5380_irq(ncr, 1);
+                            }
+                        } else
+                            timer_on_auto(&ncr400->timer, 1.0);
                     }
                     break;
                 }
@@ -732,8 +765,17 @@ ncr53c400_init(const device_t *info)
 
     scsi_bus_set_speed(ncr->bus, 5000000.0);
     scsi_bus->speed = 0.2;
-    scsi_bus->divider = 2.0;
-    scsi_bus->multi = 1.750;
+    if (ncr400->type == ROM_T130B) {
+        scsi_bus->divider = 2.0;
+        scsi_bus->multi = 1.750;
+    } else {
+        scsi_bus->divider = 1.0;
+        scsi_bus->multi = 1.0;
+    }
+
+    for (int i = 0; i < 8; i++)
+        scsi_device_reset(&scsi_devices[ncr->bus][i]);
+
     return ncr400;
 }
 
diff --git a/src/scsi/scsi_t128.c b/src/scsi/scsi_t128.c
index eada27246..3f273d1bb 100644
--- a/src/scsi/scsi_t128.c
+++ b/src/scsi/scsi_t128.c
@@ -95,9 +95,10 @@ t128_write(uint32_t addr, uint8_t val, void *priv)
                         t128->status, scsi_bus->period, timer_is_enabled(&t128->timer), t128->block_loaded);
 
                 t128->status &= ~0x04;
-                timer_on_auto(&t128->timer, 10.0);
+                timer_on_auto(&t128->timer, 1.0);
             }
-        }
+        } else
+            t128_log("Write not allowed.\n");
     }
 }
 
@@ -136,20 +137,18 @@ t128_read(uint32_t addr, void *priv)
                 t128_log("T128 Transfer busy read, status=%02x, period=%lf, enabled=%d.\n",
                         t128->status, scsi_bus->period, timer_is_enabled(&t128->timer));
 
+                t128->status &= ~0x04;
                 if (!t128->block_loaded) {
                     ncr->isr |= STATUS_END_OF_DMA;
                     if (ncr->mode & MODE_ENA_EOP_INT) {
                         t128_log("T128 read irq\n");
                         ncr5380_irq(ncr, 1);
                     }
-                    t128->status &= ~0x04;
                     scsi_bus->bus_out |= BUS_CD;
                     scsi_bus->tx_mode = PIO_TX_BUS;
                     timer_stop(&t128->timer);
                 } else if (!timer_is_enabled(&t128->timer))
-                    timer_on_auto(&t128->timer, 10.0);
-                else
-                    t128->status &= ~0x04;
+                    timer_on_auto(&t128->timer, 1.0);
             }
         } else {
             /*According to the WinNT DDK sources, just get the status timeout bit from here.*/
@@ -522,6 +521,10 @@ t128_init(const device_t *info)
     scsi_bus->speed = 0.2;
     scsi_bus->divider = 1.0;
     scsi_bus->multi = 1.0;
+
+    for (int i = 0; i < 8; i++)
+        scsi_device_reset(&scsi_devices[ncr->bus][i]);
+
     return t128;
 }
 

From c91f2255ad7795573ab2383e2a3205df69d308ad Mon Sep 17 00:00:00 2001
From: TC1995 <mariogplayer90@gmail.com>
Date: Sat, 29 Mar 2025 14:42:25 +0100
Subject: [PATCH 23/59] Vast overhaul for the Mach8/32/8514/A (March 29th,
 2025)

1. Implemented the FIFO test data to pass some tests of the Mach8 POST ROM and tests (not complete yet).
2. Overhauled the mode switches again, but this time with way less hacks and more on manual instructions.
3. Use a function pointer to determine if the Mach8 type used is a VGA combo or add-on.
4. Mach32 mode tests are no longer incorrectly green (was caused by improper pixtrans parts).
5. Implemented overscan color to the Mach32 as well as the CRT offset.
6. And fixed a PCI LFB GPF issue with the Mach32 2.3 drivers on Win3.1x.
7. Implemented memory boundary for both the Mach32 SVGA and its accelerator.
8. Added undocumented ports used by the FIFO (such as ports 0x8AEE and 0xEAEE).
9. Plus resetting the device right a la s3.
10. Temporarily switched the bus type of the Mach8 to 8-bit in both MCA and ISA variants.
---
 src/include/86box/vid_8514a.h     |   21 +-
 src/include/86box/vid_ati_mach8.h |   14 +-
 src/video/vid_8514a.c             |  696 +++++----
 src/video/vid_ati_mach8.c         | 2381 +++++++++++++++++++----------
 4 files changed, 1939 insertions(+), 1173 deletions(-)

diff --git a/src/include/86box/vid_8514a.h b/src/include/86box/vid_8514a.h
index bfde22d5e..153bface4 100644
--- a/src/include/86box/vid_8514a.h
+++ b/src/include/86box/vid_8514a.h
@@ -18,6 +18,12 @@
 #ifndef VIDEO_8514A_H
 #define VIDEO_8514A_H
 
+#define INT_VSY         (1 << 0)
+#define INT_GE_BSY      (1 << 1)
+#define INT_FIFO_OVR    (1 << 2)
+#define INT_FIFO_EMP    (1 << 3)
+#define INT_MASK        0xf
+
 typedef struct hwcursor8514_t {
     int      ena;
     int      x;
@@ -61,6 +67,7 @@ typedef struct ibm8514_t {
     uint32_t vram_mask;
     uint32_t pallook[512];
     uint32_t bios_addr;
+    uint32_t ma_latch;
 
     PALETTE   vgapal;
     uint8_t   hwcursor_oddeven;
@@ -85,8 +92,8 @@ typedef struct ibm8514_t {
         uint16_t advfunc_cntl;
         uint16_t cur_y;
         uint16_t cur_x;
-        int16_t  destx;
-        int16_t  desty;
+        uint16_t destx;
+        uint16_t desty;
         int16_t  desty_axstp;
         int16_t  destx_distp;
         int16_t  err_term;
@@ -117,6 +124,8 @@ typedef struct ibm8514_t {
         int      y1;
         int      y2;
         int      temp_cnt;
+        int16_t  dx_ibm;
+        int16_t  dy_ibm;
         int16_t  cx;
         int16_t  cx_back;
         int16_t  cy;
@@ -216,10 +225,9 @@ typedef struct ibm8514_t {
     uint16_t subsys_cntl;
     uint8_t subsys_stat;
 
-    atomic_int fifo_idx;
-    atomic_int ext_fifo_idx;
     atomic_int force_busy;
     atomic_int force_busy2;
+    atomic_int fifo_idx;
 
     int      blitter_busy;
     uint64_t blitter_time;
@@ -235,6 +243,11 @@ typedef struct ibm8514_t {
     PALETTE  _8514pal;
 
     latch8514_t latch;
+
+    void (*vblank_start)(void *priv);
+    void (*accel_out_fifo)(void *priv, uint16_t port, uint16_t val, int len);
+    void (*update_irqs)(void *priv);
+
 } ibm8514_t;
 
 #endif /*VIDEO_8514A_H*/
diff --git a/src/include/86box/vid_ati_mach8.h b/src/include/86box/vid_ati_mach8.h
index 849446def..4a5d3deb5 100644
--- a/src/include/86box/vid_ati_mach8.h
+++ b/src/include/86box/vid_ati_mach8.h
@@ -25,6 +25,7 @@ typedef struct mach_t {
     rom_t         bios_rom;
     rom_t         bios_rom2;
     mem_mapping_t mmio_linear_mapping;
+    mem_mapping_t banked_mapping;
 
     int mca_bus;
     int pci_bus;
@@ -71,7 +72,12 @@ typedef struct mach_t {
     uint8_t  bank_r;
     uint16_t shadow_set;
     uint16_t shadow_cntl;
-    int override_resolution;
+    uint8_t overscan_col_8;
+    uint8_t overscan_b_col_24;
+    uint8_t overscan_g_col_24;
+    uint8_t overscan_r_col_24;
+    uint16_t fifo_test_data[17];
+    int resolution_crt;
 
     struct {
         uint8_t  line_idx;
@@ -79,9 +85,9 @@ typedef struct mach_t {
         uint8_t  patt_idx;
         uint8_t  patt_len;
         uint8_t  pix_trans[2];
-        uint8_t  eeprom_control;
         uint8_t  alu_bg_fn;
         uint8_t  alu_fg_fn;
+        uint16_t eeprom_control;
         uint16_t clip_left;
         uint16_t clip_right;
         uint16_t clip_top;
@@ -92,6 +98,7 @@ typedef struct mach_t {
         uint16_t src_x_end;
         uint16_t src_x_start;
         uint16_t src_x;
+        uint16_t r_src_x;
         uint16_t src_y;
         int16_t  bres_count;
         uint16_t clock_sel;
@@ -100,6 +107,8 @@ typedef struct mach_t {
         uint16_t dest_cmp_fn;
         uint16_t dp_config;
         uint16_t ext_ge_config;
+        uint16_t crt_offset_lo;
+        uint16_t crt_offset_hi;
         uint16_t ge_offset_lo;
         uint16_t ge_offset_hi;
         uint16_t linedraw_opt;
@@ -159,6 +168,7 @@ typedef struct mach_t {
     } accel;
 
     atomic_int force_busy;
+    atomic_int fifo_test_idx;
 } mach_t;
 
 #endif /*VIDEO_ATI_MACH8_H*/
diff --git a/src/video/vid_8514a.c b/src/video/vid_8514a.c
index 765258237..efb05a307 100644
--- a/src/video/vid_8514a.c
+++ b/src/video/vid_8514a.c
@@ -15,6 +15,7 @@
  *
  *          Copyright 2022-2024 TheCollector1995.
  */
+#include <inttypes.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -32,7 +33,6 @@
 #include <86box/mca.h>
 #include <86box/rom.h>
 #include <86box/plat.h>
-#include <86box/thread.h>
 #include <86box/video.h>
 #include <86box/vid_8514a.h>
 #include <86box/vid_8514a_device.h>
@@ -153,12 +153,15 @@ CLAMP(int16_t in, int16_t min, int16_t max)
                 dest_dat = ~(src_dat & dest_dat);                                                     \
                 break;                                                                                \
             case 0x09:                                                                                \
+            case 0x11:                                                                                \
                 dest_dat = ~src_dat | dest_dat;                                                       \
                 break;                                                                                \
             case 0x0a:                                                                                \
+            case 0x12:                                                                                \
                 dest_dat = src_dat | ~dest_dat;                                                       \
                 break;                                                                                \
             case 0x0b:                                                                                \
+            case 0x13:                                                                                \
                 dest_dat = src_dat | dest_dat;                                                        \
                 break;                                                                                \
             case 0x0c:                                                                                \
@@ -176,56 +179,43 @@ CLAMP(int16_t in, int16_t min, int16_t max)
             case 0x10:                                                                                \
                 dest_dat = MIN(src_dat, dest_dat);                                                    \
                 break;                                                                                \
-            case 0x11:                                                                                \
-                dest_dat = dest_dat - src_dat;                                                        \
-                break;                                                                                \
-            case 0x12:                                                                                \
-                dest_dat = src_dat - dest_dat;                                                        \
-                break;                                                                                \
-            case 0x13:                                                                                \
-                dest_dat = src_dat + dest_dat;                                                        \
-                break;                                                                                \
             case 0x14:                                                                                \
                 dest_dat = MAX(src_dat, dest_dat);                                                    \
                 break;                                                                                \
             case 0x15:                                                                                \
-                dest_dat = (dest_dat - src_dat) >> 1;                                                 \
+                dest_dat = (src_dat | ~dest_dat) >> 1;                                                \
                 break;                                                                                \
             case 0x16:                                                                                \
-                dest_dat = (src_dat - dest_dat) >> 1;                                                 \
+                dest_dat = (~src_dat | dest_dat) >> 1;                                                \
                 break;                                                                                \
             case 0x17:                                                                                \
-                dest_dat = (dest_dat + src_dat) >> 1;                                                 \
+                dest_dat = (src_dat | dest_dat) >> 1;                                                 \
                 break;                                                                                \
             case 0x18:                                                                                \
-                dest_dat = MAX(0, (dest_dat - src_dat));                                              \
-                break;                                                                                \
             case 0x19:                                                                                \
-                dest_dat = MAX(0, (dest_dat - src_dat));                                              \
+                dest_dat = MAX(0, ~src_dat | dest_dat);                                               \
                 break;                                                                                \
             case 0x1a:                                                                                \
-                dest_dat = MAX(0, (src_dat - dest_dat));                                              \
+                dest_dat = MAX(0, src_dat | ~dest_dat);                                               \
                 break;                                                                                \
             case 0x1b:                                                                                \
                 if (dev->bpp)                                                                         \
-                    dest_dat = MIN(0xffff, (dest_dat + src_dat));                                     \
+                    dest_dat = MIN(0xffff, src_dat | dest_dat);                                       \
                 else                                                                                  \
-                    dest_dat = MIN(0xff, (dest_dat + src_dat));                                       \
+                    dest_dat = MIN(0xff, src_dat | dest_dat);                                         \
                 break;                                                                                \
             case 0x1c:                                                                                \
-                dest_dat = MAX(0, (dest_dat - src_dat)) / 2;                                          \
-                break;                                                                                \
             case 0x1d:                                                                                \
-                dest_dat = MAX(0, (dest_dat - src_dat)) / 2;                                          \
+                dest_dat = MAX(0, ~src_dat | dest_dat) >> 1;                                          \
                 break;                                                                                \
             case 0x1e:                                                                                \
-                dest_dat = MAX(0, (src_dat - dest_dat)) / 2;                                          \
+                dest_dat = MAX(0, src_dat | ~dest_dat) >> 1;                                          \
                 break;                                                                                \
             case 0x1f:                                                                                \
                 if (dev->bpp)                                                                         \
-                    dest_dat = (0xffff < (src_dat + dest_dat)) ? 0xffff : ((src_dat + dest_dat) / 2); \
+                    dest_dat = (0xffff < (src_dat | dest_dat)) ? 0xffff : ((src_dat | dest_dat) >> 1); \
                 else                                                                                  \
-                    dest_dat = (0xff < (src_dat + dest_dat)) ? 0xff : ((src_dat + dest_dat) / 2);     \
+                    dest_dat = (0xff < (src_dat | dest_dat)) ? 0xff : ((src_dat | dest_dat) >> 1);    \
                 break;                                                                                \
         }                                                                                             \
     }
@@ -233,10 +223,10 @@ CLAMP(int16_t in, int16_t min, int16_t max)
 #define WRITE(addr, dat)                                                               \
     if (dev->bpp) {                                                                    \
         vram_w[((addr)) & (dev->vram_mask >> 1)]                    = dat;             \
-        dev->changedvram[(((addr)) & (dev->vram_mask >> 1)) >> 11] = changeframecount; \
+        dev->changedvram[(((addr)) & (dev->vram_mask >> 1)) >> 11] = svga->monitor->mon_changeframecount; \
     } else {                                                                           \
         dev->vram[((addr)) & (dev->vram_mask)]                = dat;                   \
-        dev->changedvram[(((addr)) & (dev->vram_mask)) >> 12] = changeframecount;      \
+        dev->changedvram[(((addr)) & (dev->vram_mask)) >> 12] = svga->monitor->mon_changeframecount;      \
     }
 
 int ibm8514_active = 0;
@@ -246,7 +236,7 @@ ibm8514_cpu_src(svga_t *svga)
 {
     const ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (!(dev->accel.cmd & 0x100))
+    if (dev->accel.cmd_back)
         return 0;
 
     if (dev->accel.cmd & 1)
@@ -260,7 +250,7 @@ ibm8514_cpu_dest(svga_t *svga)
 {
     const ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (!(dev->accel.cmd & 0x100))
+    if (dev->accel.cmd_back)
         return 0;
 
     if (dev->accel.cmd & 1)
@@ -282,7 +272,7 @@ ibm8514_accel_out_pixtrans(svga_t *svga, UNUSED(uint16_t port), uint32_t val, in
     int        bkgd_mix  = (dev->accel.bkgd_mix >> 5) & 3;
     int        cmd       = dev->accel.cmd >> 13;
 
-    if (dev->accel.cmd & 0x100) {
+    if (!dev->accel.cmd_back) {
         if (len == 2) {
             /*Bus size*/
             if (dev->accel.cmd & 0x200) /*16-bit*/
@@ -344,27 +334,184 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
 {
     ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port != 0x9ae8 && port != 0xe2e8)
-        ibm8514_log("Port OUT FIFO=%04x, val=%04x, len=%d.\n", port, val, len);
-
     switch (port) {
+        case 0x2e8:
+            WRITE8(port, dev->htotal, val);
+            ibm8514_log("IBM 8514/A compatible: (0x%04x): htotal=0x%02x.\n", port, val);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x6e8:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            WRITE8(port, dev->hdisped, val);
+            dev->hdisp = (dev->hdisped + 1) << 3;
+            ibm8514_log("[%04X:%08X]: IBM 8514/A: (0x%04x): hdisp=0x%02x.\n", CS, cpu_state.pc, port, val);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x6e9:
+            WRITE8(port, dev->htotal, val);
+            ibm8514_log("IBM 8514/A compatible: (0x%04x): htotal=0x%02x.\n", port, val);
+            svga_recalctimings(svga);
+            break;
+
+        case 0xae8:
+            WRITE8(port, dev->hsync_start, val);
+            pclog("IBM 8514/A compatible: (0x%04x): val=0x%02x, hsync_start=%d.\n", port, val, (val + 1) << 3);
+            svga_recalctimings(svga);
+            break;
+
+        case 0xee8:
+            WRITE8(port, dev->hsync_width, val);
+            pclog("IBM 8514/A compatible: (0x%04x): val=0x%02x, hsync_width=%d, hsyncpol=%02x.\n", port, val & 0x1f, ((val & 0x1f) + 1) << 3, val & 0x20);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x12e8:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            if (len == 2) {
+                dev->v_total_reg = val;
+                dev->v_total_reg &= 0x1fff;
+                dev->v_total = dev->v_total_reg + 1;
+                if (dev->interlace)
+                    dev->v_total >>= 1;
+
+                ibm8514_log("IBM 8514/A compatible: (0x%04x): vtotal=0x%02x.\n", port, val);
+                svga_recalctimings(svga);
+            } else {
+                WRITE8(port, dev->v_total_reg, val);
+            }
+            break;
+        case 0x12e9:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            if (len == 1) {
+                WRITE8(port, dev->v_total_reg, val);
+                dev->v_total_reg &= 0x1fff;
+                dev->v_total = dev->v_total_reg + 1;
+                if (dev->interlace)
+                    dev->v_total >>= 1;
+
+                ibm8514_log("IBM 8514/A compatible: (0x%04x): vtotal=0x%02x.\n", port, val);
+                svga_recalctimings(svga);
+            }
+            break;
+
+        case 0x16e8:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            if (len == 2) {
+                dev->v_disp = val;
+                dev->v_disp &= 0x1fff;
+                dev->vdisp = (dev->v_disp + 1) >> 1;
+                ibm8514_log("IBM 8514/A: V_DISP write 16E8 = %d\n", dev->v_disp);
+                ibm8514_log("IBM 8514/A: (0x%04x): vdisp=0x%02x.\n", port, val);
+                svga_recalctimings(svga);
+            } else {
+                WRITE8(port, dev->v_disp, val);
+            }
+            break;
+        case 0x16e9:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            if (len == 1) {
+                WRITE8(port, dev->v_disp, val);
+                dev->v_disp &= 0x1fff;
+                dev->vdisp = (dev->v_disp + 1) >> 1;
+                ibm8514_log("IBM 8514/A: V_DISP write 16E8 = %d\n", dev->v_disp);
+                ibm8514_log("IBM 8514/A: (0x%04x): vdisp=0x%02x.\n", port, val);
+                svga_recalctimings(svga);
+            }
+            break;
+
+        case 0x1ae8:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            if (len == 2) {
+                dev->v_sync_start = val;
+                dev->v_sync_start &= 0x1fff;
+                dev->v_syncstart = dev->v_sync_start + 1;
+                if (dev->interlace)
+                    dev->v_syncstart >>= 1;
+
+                ibm8514_log("IBM 8514/A compatible: V_SYNCSTART write 1AE8 = %d\n", dev->v_syncstart);
+                ibm8514_log("IBM 8514/A compatible: (0x%04x): vsyncstart=0x%02x.\n", port, val);
+                svga_recalctimings(svga);
+            } else {
+                WRITE8(port, dev->v_sync_start, val);
+            }
+            break;
+        case 0x1ae9:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            if (len == 1) {
+                WRITE8(port, dev->v_sync_start, val);
+                dev->v_sync_start &= 0x1fff;
+                dev->v_syncstart = dev->v_sync_start + 1;
+                if (dev->interlace)
+                    dev->v_syncstart >>= 1;
+
+                ibm8514_log("IBM 8514/A compatible: V_SYNCSTART write 1AE8 = %d\n", dev->v_syncstart);
+                ibm8514_log("IBM 8514/A compatible: (0x%04x): vsyncstart=0x%02x.\n", port, val);
+                svga_recalctimings(svga);
+            }
+            break;
+
+        case 0x22e8:
+            dev->disp_cntl = val;
+            dev->interlace = !!(dev->disp_cntl & 0x10);
+            ibm8514_log("IBM 8514/A compatible: DISP_CNTL write %04x=%02x, interlace=%d.\n", port, dev->disp_cntl, dev->interlace);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x1ee8:
+        case 0x1ee9:
+            ibm8514_log("IBM 8514/A compatible: V_SYNC_WID write 1EE8 = %02x\n", val);
+            ibm8514_log("IBM 8514/A compatible: (0x%04x): vsyncwidth=0x%02x.\n", port, val);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x42e8:
+            ibm8514_log("VBLANK stat=%02x, val=%02x.\n", dev->subsys_stat, val);
+            if (len == 2) {
+                dev->subsys_cntl = val;
+                dev->subsys_stat &= ~val;
+                if ((val & 0xc000) == 0x8000) {
+                    dev->force_busy = 0;
+                    dev->force_busy2 = 0;
+                }
+            } else {
+                WRITE8(port, dev->subsys_cntl, val);
+                dev->subsys_stat &= ~val;
+            }
+            break;
+        case 0x42e9:
+            if (len == 1) {
+                WRITE8(port, dev->subsys_cntl, val);
+                if ((val & 0xc0) == 0x80) {
+                    dev->force_busy = 0;
+                    dev->force_busy2 = 0;
+                }
+            }
+            break;
+
+        case 0x4ae8:
+            WRITE8(port, dev->accel.advfunc_cntl, val);
+            dev->on = dev->accel.advfunc_cntl & 0x01;
+            ibm8514_log("[%04X:%08X]: IBM 8514/A: (0x%04x): ON=%d, shadow crt=%x, hdisp=%d, vdisp=%d.\n", CS, cpu_state.pc, port, dev->on, dev->accel.advfunc_cntl & 0x04, dev->hdisp, dev->vdisp);
+            ibm8514_log("IBM mode set %s resolution.\n", (dev->accel.advfunc_cntl & 0x04) ? "2: 1024x768" : "1: 640x480");
+            svga_recalctimings(svga);
+            break;
+
         case 0x82e8:
         case 0xc2e8:
-            dev->fifo_idx++;
             if (len == 2)
                 dev->accel.cur_y = val & 0x7ff;
             break;
 
         case 0x86e8:
         case 0xc6e8:
-            dev->fifo_idx++;
             if (len == 2)
                 dev->accel.cur_x = val & 0x7ff;
             break;
 
         case 0x8ae8:
         case 0xcae8:
-            dev->fifo_idx++;
             if (len == 2) {
                 dev->accel.desty       = val & 0x7ff;
                 dev->accel.desty_axstp = val & 0x3fff;
@@ -375,7 +522,6 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
 
         case 0x8ee8:
         case 0xcee8:
-            dev->fifo_idx++;
             if (len == 2) {
                 dev->accel.destx       = val & 0x7ff;
                 dev->accel.destx_distp = val & 0x3fff;
@@ -385,7 +531,6 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
             break;
 
         case 0x92e8:
-            dev->fifo_idx++;
             if (len == 2)
                 dev->test = val;
             fallthrough;
@@ -400,7 +545,6 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
 
         case 0x96e8:
         case 0xd6e8:
-            dev->fifo_idx++;
             if (len == 2) {
                 dev->accel.maj_axis_pcnt = val & 0x7ff;
                 dev->accel.maj_axis_pcnt_no_limit = val;
@@ -409,7 +553,6 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
 
         case 0x9ae8:
         case 0xdae8:
-            dev->fifo_idx++;
             dev->accel.ssv_state = 0;
             if (len == 2) {
                 dev->data_available  = 0;
@@ -419,14 +562,13 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
                 if (dev->accel.cmd & 0x100)
                     dev->accel.cmd_back = 0;
 
-                ibm8514_log("8514/A CMD=%04x, back=%d.\n", dev->accel.cmd, dev->accel.cmd_back);
+                ibm8514_log("8514/A CMD=%04x, back=%d, frgd color=%04x, frgdmix=%02x, pixcntl=%02x.\n", dev->accel.cmd, dev->accel.cmd_back, dev->accel.frgd_color, dev->accel.frgd_mix, dev->accel.multifunc[0x0a]);
                 ibm8514_accel_start(-1, 0, -1, 0, svga, len);
             }
             break;
 
         case 0x9ee8:
         case 0xdee8:
-            dev->fifo_idx++;
             dev->accel.ssv_state = 1;
             if (len == 2) {
                 dev->accel.short_stroke = val;
@@ -451,7 +593,6 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
 
         case 0xa2e8:
         case 0xe2e8:
-            dev->fifo_idx++;
             if (port == 0xe2e8) {
                 if (len == 2) {
                     if (dev->accel.cmd_back)
@@ -470,7 +611,6 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
 
         case 0xa6e8:
         case 0xe6e8:
-            dev->fifo_idx++;
             if (port == 0xe6e8) {
                 if (len == 2) {
                     if (dev->accel.cmd_back)
@@ -489,40 +629,34 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
 
         case 0xaae8:
         case 0xeae8:
-            dev->fifo_idx++;
             if (len == 2)
                 dev->accel.wrt_mask = val;
             break;
 
         case 0xaee8:
         case 0xeee8:
-            dev->fifo_idx++;
             if (len == 2)
                 dev->accel.rd_mask = val;
             break;
 
         case 0xb2e8:
         case 0xf2e8:
-            dev->fifo_idx++;
             if (len == 2)
                 dev->accel.color_cmp = val;
             break;
 
         case 0xb6e8:
         case 0xf6e8:
-            dev->fifo_idx++;
             dev->accel.bkgd_mix = val & 0xff;
             break;
 
         case 0xbae8:
         case 0xfae8:
-            dev->fifo_idx++;
             dev->accel.frgd_mix = val & 0xff;
             break;
 
         case 0xbee8:
         case 0xfee8:
-            dev->fifo_idx++;
             if (len == 2) {
                 dev->accel.multifunc_cntl                             = val;
                 dev->accel.multifunc[dev->accel.multifunc_cntl >> 12] = dev->accel.multifunc_cntl & 0xfff;
@@ -631,115 +765,13 @@ ibm8514_accel_out(uint16_t port, uint32_t val, svga_t *svga, int len)
 {
     ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port & 0x8000)
-        ibm8514_accel_out_fifo(svga, port, val, len);
-    else {
-        switch (port) {
-            case 0x2e8:
-            case 0x6e9:
-                WRITE8(port, dev->htotal, val);
-                ibm8514_log("IBM 8514/A compatible: (0x%04x): htotal=0x%02x.\n", port, val);
-                svga_recalctimings(svga);
-                break;
-
-            case 0x6e8:
-                /*In preparation to switch from VGA to 8514/A mode*/
-                dev->hdisped = val;
-                dev->hdisp = (dev->hdisped + 1) << 3;
-                ibm8514_log("[%04X:%08X]: IBM 8514/A: (0x%04x): hdisp=0x%02x.\n", CS, cpu_state.pc, port, val);
-                svga_recalctimings(svga);
-                break;
-
-            case 0xae8:
-                dev->hsync_start = val;
-                ibm8514_log("IBM 8514/A compatible: (0x%04x): val=0x%02x, hsync_start=%d.\n", port, val, (val + 1) << 3);
-                svga_recalctimings(svga);
-                break;
-
-            case 0xee8:
-                dev->hsync_width = val;
-                ibm8514_log("IBM 8514/A compatible: (0x%04x): val=0x%02x, hsync_width=%d, hsyncpol=%02x.\n", port, val & 0x1f, ((val & 0x1f) + 1) << 3, val & 0x20);
-                svga_recalctimings(svga);
-                break;
-
-            case 0x12e8:
-            case 0x12e9:
-                /*In preparation to switch from VGA to 8514/A mode*/
-                WRITE8(port, dev->v_total_reg, val);
-                dev->v_total_reg &= 0x1fff;
-                dev->v_total = dev->v_total_reg + 1;
-                if (dev->interlace)
-                    dev->v_total >>= 1;
-
-                ibm8514_log("IBM 8514/A compatible: (0x%04x): vtotal=0x%02x.\n", port, val);
-                svga_recalctimings(svga);
-                break;
-
-            case 0x16e8:
-            case 0x16e9:
-                /*In preparation to switch from VGA to 8514/A mode*/
-                WRITE8(port, dev->v_disp, val);
-                dev->v_disp &= 0x1fff;
-                dev->vdisp = (dev->v_disp + 1) >> 1;
-                ibm8514_log("IBM 8514/A: V_DISP write 16E8 = %d\n", dev->v_disp);
-                ibm8514_log("IBM 8514/A: (0x%04x): vdisp=0x%02x.\n", port, val);
-                svga_recalctimings(svga);
-                break;
-
-            case 0x1ae8:
-            case 0x1ae9:
-                /*In preparation to switch from VGA to 8514/A mode*/
-                WRITE8(port, dev->v_sync_start, val);
-                dev->v_sync_start &= 0x1fff;
-                dev->v_syncstart = dev->v_sync_start + 1;
-                if (dev->interlace)
-                    dev->v_syncstart >>= 1;
-
-                ibm8514_log("IBM 8514/A compatible: V_SYNCSTART write 1AE8 = %d\n", dev->v_syncstart);
-                ibm8514_log("IBM 8514/A compatible: (0x%04x): vsyncstart=0x%02x.\n", port, val);
-                svga_recalctimings(svga);
-                break;
-
-            case 0x1ee8:
-            case 0x1ee9:
-                ibm8514_log("IBM 8514/A compatible: V_SYNC_WID write 1EE8 = %02x\n", val);
-                ibm8514_log("IBM 8514/A compatible: (0x%04x): vsyncwidth=0x%02x.\n", port, val);
-                svga_recalctimings(svga);
-                break;
-
-            case 0x22e8:
-                dev->disp_cntl = val;
-                dev->interlace = !!(dev->disp_cntl & 0x10);
-                ibm8514_log("IBM 8514/A compatible: DISP_CNTL write %04x=%02x, interlace=%d.\n", port, dev->disp_cntl, dev->interlace);
-                svga_recalctimings(svga);
-                break;
-
-            case 0x42e8:
-                ibm8514_log("VBLANK stat=%02x, val=%02x.\n", dev->subsys_stat, val);
-                dev->subsys_cntl = (dev->subsys_cntl & 0xff00) | val;
-                dev->subsys_stat &= ~val;
-                break;
-            case 0x42e9:
-                dev->subsys_cntl = (dev->subsys_cntl & 0xff) | (val << 8);
-                if ((val & 0xc0) == 0x80) {
-                    dev->fifo_idx = 0;
-                    dev->force_busy = 0;
-                    dev->force_busy2 = 0;
-                }
-                break;
-
-            case 0x4ae8:
-                WRITE8(port, dev->accel.advfunc_cntl, val);
-                dev->on = dev->accel.advfunc_cntl & 0x01;
-                ibm8514_log("[%04X:%08X]: IBM 8514/A: (0x%04x): ON=%d, shadow crt=%x, hdisp=%d, vdisp=%d.\n", CS, cpu_state.pc, port, dev->on, dev->accel.advfunc_cntl & 0x04, dev->hdisp, dev->vdisp);
-                ibm8514_log("IBM mode set %s resolution.\n", (dev->accel.advfunc_cntl & 0x04) ? "2: 1024x768" : "1: 640x480");
-                svga_recalctimings(svga);
-                break;
-
-            default:
-                break;
-        }
+    if (dev->accel.cmd_back) {
+        dev->fifo_idx++;
+        if (dev->fifo_idx > 8)
+            dev->fifo_idx = 8;
     }
+
+    ibm8514_accel_out_fifo(svga, port, val, len);
 }
 
 static void
@@ -790,28 +822,21 @@ ibm8514_accel_in_fifo(svga_t *svga, uint16_t port, int len)
 
         case 0x9ae8:
         case 0xdae8:
-            if ((dev->fifo_idx >= 1) && (dev->fifo_idx <= 8)) {
-                temp |= (1 << (dev->fifo_idx - 1));
-                switch (dev->accel.cmd >> 13) {
-                    case 2:
-                    case 3:
-                    case 4:
-                    case 6:
-                        if (dev->accel.sy < 0)
-                            dev->fifo_idx = 0;
-                        break;
-                    default:
-                        if (!dev->accel.sy)
-                            dev->fifo_idx = 0;
-                        break;
-                }
-            }
             if (len == 2) {
+                if (dev->fifo_idx <= 8) {
+                    for (int i = 1; i <= dev->fifo_idx; i++)
+                        temp |= (1 << (7 - (i - 1)));
+                } else
+                    temp = 0x00ff;
+
+                if (dev->fifo_idx > 0)
+                    dev->fifo_idx--;
+
                 if (dev->force_busy)
-                    temp |= 0x200; /*Hardware busy*/
+                    temp |= 0x0200; /*Hardware busy*/
                 dev->force_busy = 0;
                 if (dev->data_available) {
-                    temp |= 0x100; /*Read Data available*/
+                    temp |= 0x0100; /*Read Data available*/
                     dev->data_available = 0;
                 }
             }
@@ -819,8 +844,11 @@ ibm8514_accel_in_fifo(svga_t *svga, uint16_t port, int len)
         case 0x9ae9:
         case 0xdae9:
             if (len == 1) {
+                dev->fifo_idx = 0;
+
                 if (dev->force_busy2)
                     temp |= 0x02; /*Hardware busy*/
+
                 dev->force_busy2 = 0;
                 if (dev->data_available2) {
                     temp |= 0x01; /*Read Data available*/
@@ -868,7 +896,7 @@ ibm8514_accel_in(uint16_t port, svga_t *svga)
 
     switch (port) {
         case 0x2e8:
-            if (dev->vc == dev->dispend)
+            if (dev->vc == dev->v_syncstart)
                 temp |= 0x02;
 
             ibm8514_log("Read: Display Status1=%02x.\n", temp);
@@ -896,36 +924,35 @@ ibm8514_accel_in(uint16_t port, svga_t *svga)
 
         case 0x42e8:
         case 0x42e9:
-            if ((dev->subsys_cntl & 0x01) && !(dev->subsys_stat & 0x01) && (dev->vc == dev->dispend))
-                temp |= 0x01;
+            if (!(port & 1)) {
+                if ((dev->subsys_cntl & INT_VSY) && !(dev->subsys_stat & INT_VSY) && (dev->vc == dev->dispend))
+                    temp |= INT_VSY;
 
-            if (cmd == 6) {
-                if ((dev->subsys_cntl & 0x02) &&
-                    !(dev->subsys_stat & 0x02) &&
-                    (dev->accel.dx >= clip_l) &&
-                    (dev->accel.dx <= clip_r_ibm) &&
-                    (dev->accel.dy >= clip_t) &&
-                    (dev->accel.dy <= clip_b_ibm))
-                    temp |= 0x02;
-            } else {
-                if ((dev->subsys_cntl & 0x02) &&
-                    !(dev->subsys_stat & 0x02) &&
-                    (dev->accel.cx >= clip_l) &&
-                    (dev->accel.cx <= clip_r_ibm) &&
-                    (dev->accel.cy >= clip_t) &&
-                    (dev->accel.cy <= clip_b_ibm))
-                    temp |= 0x02;
-            }
+                if (cmd == 6) {
+                    if ((dev->subsys_cntl & INT_GE_BSY) &&
+                        !(dev->subsys_stat & INT_GE_BSY) &&
+                        (dev->accel.dx_ibm >= clip_l) &&
+                        (dev->accel.dx_ibm <= clip_r_ibm) &&
+                        (dev->accel.dy_ibm >= clip_t) &&
+                        (dev->accel.dy_ibm <= clip_b_ibm))
+                        temp |= INT_GE_BSY;
+                } else {
+                    if ((dev->subsys_cntl & INT_GE_BSY) &&
+                        !(dev->subsys_stat & INT_GE_BSY) &&
+                        (dev->accel.cx >= clip_l) &&
+                        (dev->accel.cx <= clip_r_ibm) &&
+                        (dev->accel.cy >= clip_t) &&
+                        (dev->accel.cy <= clip_b_ibm))
+                        temp |= INT_GE_BSY;
+                }
 
-            if (!dev->fifo_idx) {
-                if (!dev->force_busy && !dev->force_busy2)
-                    temp |= 0x08;
-            }
-
-            if (port & 1) {
-                temp = dev->vram_512k_8514 ? 0x00 : 0x80;
-                temp |= (dev->subsys_cntl >> 8);
-            } else {
+                if (dev->accel.cmd_back) {
+                    dev->force_busy = 0;
+                    dev->force_busy2 = 0;
+                    dev->data_available = 0;
+                    dev->data_available2 = 0;
+                    temp |= INT_FIFO_EMP;
+                }
                 temp |= (dev->subsys_stat | (dev->vram_512k_8514 ? 0x00 : 0x80));
                 temp |= 0x20;
             }
@@ -1024,7 +1051,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
         rd_mask_polygon &= 0xff;
     }
 
-    if (dev->accel.cmd & 0x100) {
+    if (!dev->accel.cmd_back) {
         dev->force_busy  = 1;
         dev->force_busy2 = 1;
     }
@@ -1129,8 +1156,8 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
 
     old_mix_dat = mix_dat;
 
-    if (cmd == 5 || cmd == 1 || (cmd == 2 && (dev->accel.multifunc[0x0a] & 0x06)))
-        ibm8514_log("CMD=%d, full=%04x, pixcntl=%d, filling=%02x.\n", cmd, dev->accel.cmd, pixcntl, dev->accel.multifunc[0x0a] & 0x06);
+    if (cmd != 0)
+        ibm8514_log("CMD=%d, full=%04x, pixcntl=%d, filling=%02x, ssvdraw=%02x.\n", cmd, dev->accel.cmd, pixcntl, dev->accel.multifunc[0x0a] & 0x06, dev->accel.ssv_draw);
 
     /*Bit 4 of the Command register is the draw yes bit, which enables writing to memory/reading from memory when enabled.
       When this bit is disabled, no writing to memory/reading from memory is allowed. (This bit is almost meaningless on
@@ -1146,7 +1173,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                         (dev->accel.cx <= clip_r) &&
                         (dev->accel.cy >= clip_t) &&
                         (dev->accel.cy <= clip_b)) {
-                        dev->subsys_stat |= 0x02;
+                        dev->subsys_stat |= INT_GE_BSY;
                         switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                             case 0:
                                 src_dat = bkgd_color;
@@ -1197,6 +1224,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
 
                     if (!dev->accel.ssv_len) {
                         dev->accel.cmd_back = 1;
+                        dev->fifo_idx = 0;
                         break;
                     }
 
@@ -1242,7 +1270,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                         (dev->accel.cx <= clip_r) &&
                         (dev->accel.cy >= clip_t) &&
                         (dev->accel.cy <= clip_b)) {
-                        dev->subsys_stat |= 0x02;
+                        dev->subsys_stat |= INT_GE_BSY;
                         switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                             case 0:
                                 src_dat = bkgd_color;
@@ -1293,6 +1321,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
 
                     if (!dev->accel.ssv_len) {
                         dev->accel.cmd_back = 1;
+                        dev->fifo_idx = 0;
                         break;
                     }
 
@@ -1378,7 +1407,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                         (dev->accel.cx <= clip_r) &&
                         (dev->accel.cy >= clip_t) &&
                         (dev->accel.cy <= clip_b)) {
-                        dev->subsys_stat |= 0x02;
+                        dev->subsys_stat |= INT_GE_BSY;
                         if (ibm8514_cpu_dest(svga) && (pixcntl == 0)) {
                             mix_dat = mix_mask; /* Mix data = forced to foreground register. */
                         } else if (ibm8514_cpu_dest(svga) && (pixcntl == 3)) {
@@ -1468,6 +1497,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
 
                     if (!dev->accel.sy) {
                         dev->accel.cmd_back = 1;
+                        dev->fifo_idx = 0;
                         if (!cpu_input) {
                             dev->accel.cur_x = dev->accel.cx;
                             dev->accel.cur_y = dev->accel.cy;
@@ -1537,7 +1567,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                             (dev->accel.cx <= clip_r) &&
                             (dev->accel.cy >= clip_t) &&
                             (dev->accel.cy <= clip_b)) {
-                            dev->subsys_stat |= 0x02;
+                            dev->subsys_stat |= INT_GE_BSY;
                             if (ibm8514_cpu_dest(svga)) {
                                 READ((dev->accel.cy * dev->pitch) + dev->accel.cx, src_dat);
                             } else
@@ -1588,6 +1618,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
 
                         if (!dev->accel.sy) {
                             dev->accel.cmd_back = 1;
+                            dev->fifo_idx = 0;
                             break;
                         }
 
@@ -1629,7 +1660,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                             (dev->accel.cx <= clip_r) &&
                             (dev->accel.cy >= clip_t) &&
                             (dev->accel.cy <= clip_b)) {
-                            dev->subsys_stat |= 0x02;
+                            dev->subsys_stat |= INT_GE_BSY;
                             if (ibm8514_cpu_dest(svga) && (pixcntl == 0)) {
                                 mix_dat = mix_mask; /* Mix data = forced to foreground register. */
                             } else if (ibm8514_cpu_dest(svga) && (pixcntl == 3)) {
@@ -1691,6 +1722,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
 
                         if (!dev->accel.sy) {
                             dev->accel.cmd_back = 1;
+                            dev->fifo_idx = 0;
                             if (!cpu_input) {
                                 dev->accel.cur_x = dev->accel.cx;
                                 dev->accel.cur_y = dev->accel.cy;
@@ -1828,7 +1860,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                                 (dev->accel.cx <= clip_r) &&
                                 (dev->accel.cy >= clip_t) &&
                                 (dev->accel.cy <= clip_b)) {
-                                dev->subsys_stat |= 0x02;
+                                dev->subsys_stat |= INT_GE_BSY;
                                 switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                                     case 0:
                                         src_dat = bkgd_color;
@@ -1970,8 +2002,10 @@ skip_vector_rect_write:
                                 dev->accel.sy--;
                                 dev->accel.x_count = 0;
 
-                                if (dev->accel.sy < 0)
+                                if (dev->accel.sy < 0) {
                                     dev->accel.cmd_back = 1;
+                                    dev->fifo_idx = 0;
+                                }
                                 return;
                             }
                         }
@@ -1986,7 +2020,7 @@ skip_vector_rect_write:
                             (dev->accel.cx <= clip_r) &&
                             (dev->accel.cy >= clip_t) &&
                             (dev->accel.cy <= clip_b)) {
-                            dev->subsys_stat |= 0x02;
+                            dev->subsys_stat |= INT_GE_BSY;
                             if (ibm8514_cpu_dest(svga) && (pixcntl == 0)) {
                                 mix_dat = mix_mask; /* Mix data = forced to foreground register. */
                             } else if (ibm8514_cpu_dest(svga) && (pixcntl == 3)) {
@@ -2129,8 +2163,10 @@ skip_nibble_rect_write:
                             dev->accel.sy--;
                             dev->accel.x_count = 0;
 
-                            if (dev->accel.sy < 0)
+                            if (dev->accel.sy < 0) {
                                 dev->accel.cmd_back = 1;
+                                dev->fifo_idx = 0;
+                            }
                             return;
                         }
                     }
@@ -2148,7 +2184,7 @@ skip_nibble_rect_write:
                                     (dev->accel.cx <= clip_r) &&
                                     (dev->accel.cy >= clip_t) &&
                                     (dev->accel.cy <= clip_b)) {
-                                    dev->subsys_stat |= 0x02;
+                                    dev->subsys_stat |= INT_GE_BSY;
                                     switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                                         case 0:
                                             src_dat = bkgd_color;
@@ -2215,8 +2251,10 @@ skip_nibble_rect_write:
 
                                     dev->accel.sy--;
 
-                                    if (dev->accel.sy < 0)
+                                    if (dev->accel.sy < 0) {
                                         dev->accel.cmd_back = 1;
+                                        dev->fifo_idx = 0;
+                                    }
                                     return;
                                 }
                             }
@@ -2231,7 +2269,7 @@ skip_nibble_rect_write:
                                     (dev->accel.cx <= clip_r) &&
                                     (dev->accel.cy >= clip_t) &&
                                     (dev->accel.cy <= clip_b)) {
-                                    dev->subsys_stat |= 0x02;
+                                    dev->subsys_stat |= INT_GE_BSY;
                                     switch ((mix_dat & 0x01) ? frgd_mix : bkgd_mix) {
                                         case 0:
                                             src_dat = bkgd_color;
@@ -2301,6 +2339,7 @@ skip_nibble_rect_write:
                                             dev->accel.cur_y = dev->accel.cy;
                                         }
                                         dev->accel.cmd_back = 1;
+                                        dev->fifo_idx = 0;
                                         return;
                                     }
                                 }
@@ -2313,7 +2352,7 @@ skip_nibble_rect_write:
                                 (dev->accel.cx <= clip_r) &&
                                 (dev->accel.cy >= clip_t) &&
                                 (dev->accel.cy <= clip_b)) {
-                                dev->subsys_stat |= 0x02;
+                                dev->subsys_stat |= INT_GE_BSY;
                                 switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                                     case 0:
                                         src_dat = bkgd_color;
@@ -2412,6 +2451,7 @@ skip_nibble_rect_write:
                                 if (dev->accel.sy < 0) {
                                     ibm8514_log(".\n");
                                     dev->accel.cmd_back = 1;
+                                    dev->fifo_idx = 0;
                                     dev->accel.cur_x = dev->accel.cx;
                                     dev->accel.cur_y = dev->accel.cy;
                                     return;
@@ -2419,13 +2459,13 @@ skip_nibble_rect_write:
                             }
                         }
                     } else {
-                        ibm8514_log("Polygon Draw Type=%02x, CX=%d, CY=%d, SY=%d, CL=%d, CR=%d.\n", dev->accel.multifunc[0x0a] & 0x06, dev->accel.cx, dev->accel.cy, dev->accel.sy, clip_l, clip_r);
+                        ibm8514_log("Polygon Draw Type=%02x, CX=%d, CY=%d, SY=%d, CL=%d, CR=%d, frgdmix=%d, bkgdmix=%d, cmpmode=%02x, pitch=%d.\n", dev->accel.multifunc[0x0a] & 0x06, dev->accel.cx, dev->accel.cy, dev->accel.sy, clip_l, clip_r, frgd_mix, bkgd_mix, compare_mode, dev->pitch);
                         while (count-- && (dev->accel.sy >= 0)) {
                             if ((dev->accel.cx >= clip_l) &&
                                 (dev->accel.cx <= clip_r) &&
                                 (dev->accel.cy >= clip_t) &&
                                 (dev->accel.cy <= clip_b)) {
-                                dev->subsys_stat |= 0x02;
+                                dev->subsys_stat |= INT_GE_BSY;
                                 switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                                     case 0:
                                         src_dat = bkgd_color;
@@ -2501,6 +2541,7 @@ skip_nibble_rect_write:
                                         dev->accel.cur_y = dev->accel.cy;
                                     }
                                     dev->accel.cmd_back = 1;
+                                    dev->fifo_idx = 0;
                                     return;
                                 }
                             }
@@ -2548,7 +2589,7 @@ skip_nibble_rect_write:
                         (dev->accel.cx <= clip_r) &&
                         (dev->accel.cy >= clip_t) &&
                         (dev->accel.cy <= clip_b)) {
-                        dev->subsys_stat |= 0x02;
+                        dev->subsys_stat |= INT_GE_BSY;
                         switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                             case 0:
                                 src_dat = bkgd_color;
@@ -2603,6 +2644,7 @@ skip_nibble_rect_write:
 
                     if (!dev->accel.sy) {
                         dev->accel.cmd_back = 1;
+                        dev->fifo_idx = 0;
                         break;
                     }
 
@@ -2656,7 +2698,7 @@ skip_nibble_rect_write:
                         (dev->accel.cx <= clip_r) &&
                         (dev->accel.cy >= clip_t) &&
                         (dev->accel.cy <= clip_b)) {
-                        dev->subsys_stat |= 0x02;
+                        dev->subsys_stat |= INT_GE_BSY;
                         switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                             case 0:
                                 src_dat = bkgd_color;
@@ -2707,6 +2749,7 @@ skip_nibble_rect_write:
 
                     if (!dev->accel.sy) {
                         dev->accel.cmd_back = 1;
+                        dev->fifo_idx = 0;
                         break;
                     }
 
@@ -2753,13 +2796,8 @@ skip_nibble_rect_write:
             {
                 dev->accel.x_count = 0;
 
-                dev->accel.dx = dev->accel.destx;
-                if (dev->accel.destx >= 0x600)
-                    dev->accel.dx |= ~0x5ff;
-
-                dev->accel.dy = dev->accel.desty;
-                if (dev->accel.desty >= 0x600)
-                    dev->accel.dy |= ~0x5ff;
+                dev->accel.dx_ibm = dev->accel.destx;
+                dev->accel.dy_ibm = dev->accel.desty;
 
                 dev->accel.cx = dev->accel.cur_x;
                 if (dev->accel.cur_x >= 0x600)
@@ -2774,13 +2812,13 @@ skip_nibble_rect_write:
 
                 if ((dev->accel_bpp == 24) || (dev->accel_bpp <= 8)) {
                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
+                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
                 } else if (dev->bpp) {
                     dev->accel.src  = (dev->accel.ge_offset << 1) + (dev->accel.cy * dev->pitch);
-                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy * dev->pitch);
+                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy_ibm * dev->pitch);
                 } else {
                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
+                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
                 }
                 dev->accel.fill_state = 0;
 
@@ -2805,17 +2843,16 @@ skip_nibble_rect_write:
                     dev->data_available  = 1;
                     dev->data_available2 = 1;
                     return; /*Wait for data from CPU*/
-                }
+                } else
+                    ibm8514_log("BitBLT normal: Parameters: DX=%d, DY=%d, CX=%d, CY=%d, dstwidth=%d, dstheight=%d, clipl=%d, clipr=%d, clipt=%d, clipb=%d.\n", dev->accel.dx_ibm, dev->accel.dy_ibm, dev->accel.cx, dev->accel.cy, dev->accel.sx, dev->accel.sy, clip_l, clip_r, clip_t, clip_b);
             }
 
-            ibm8514_log("BitBLT: full=%04x, odd=%d, c(%d,%d), d(%d,%d), xcount=%d, and3=%d, len(%d,%d), CURX=%d, Width=%d, pixcntl=%d, mix_dat=%08x, count=%d, cpu_data=%08x, cpu_input=%d.\n", dev->accel.cmd, dev->accel.input, dev->accel.cx, dev->accel.cy, dev->accel.dx, dev->accel.dy, dev->accel.x_count, and3, dev->accel.sx, dev->accel.sy, dev->accel.cur_x, dev->accel.maj_axis_pcnt, pixcntl, mix_dat, count, cpu_dat, cpu_input);
             if (cpu_input) {
                 while (count-- && (dev->accel.sy >= 0)) {
-                    if ((dev->accel.dx >= clip_l) &&
-                        (dev->accel.dx <= clip_r) &&
-                        (dev->accel.dy >= clip_t) &&
-                        (dev->accel.dy <= clip_b)) {
-                        dev->subsys_stat |= 0x02;
+                    if ((dev->accel.dx_ibm >= clip_l) &&
+                        (dev->accel.dx_ibm <= clip_r) &&
+                        (dev->accel.dy_ibm >= clip_t) &&
+                        (dev->accel.dy_ibm <= clip_b)) {
                         if (pixcntl == 3) {
                             if (!(dev->accel.cmd & 0x10) && ((frgd_mix != 3) || (bkgd_mix != 3))) {
                                 READ(dev->accel.src + dev->accel.cx, mix_dat);
@@ -2879,7 +2916,7 @@ skip_nibble_rect_write:
                             }
                         }
 
-                        READ(dev->accel.dest + dev->accel.dx, dest_dat);
+                        READ(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
 
                         if ((compare_mode == 0) ||
                             ((compare_mode == 0x10) && (dest_dat >= compare)) ||
@@ -2895,20 +2932,20 @@ skip_nibble_rect_write:
                                     goto skip_nibble_bitblt_write;
 
                                 dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
+                                WRITE(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
                             } else {
                                 MIX(mix_dat & mix_mask, dest_dat, src_dat);
                                 dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
+                                WRITE(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
                             }
                         }
                     }
 
                     if (dev->accel.cmd & 0x20) {
-                        dev->accel.dx++;
+                        dev->accel.dx_ibm++;
                         dev->accel.cx++;
                     } else {
-                        dev->accel.dx--;
+                        dev->accel.dx_ibm--;
                         dev->accel.cx--;
                     }
 
@@ -2935,37 +2972,39 @@ skip_nibble_bitblt_write:
                         dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
 
                         if (dev->accel.cmd & 0x20) {
-                            dev->accel.dx -= (dev->accel.sx + 1);
+                            dev->accel.dx_ibm -= (dev->accel.sx + 1);
                             dev->accel.cx -= (dev->accel.sx + 1);
                         } else {
-                            dev->accel.dx += (dev->accel.sx + 1);
+                            dev->accel.dx_ibm += (dev->accel.sx + 1);
                             dev->accel.cx += (dev->accel.sx + 1);
                         }
 
                         if (dev->accel.cmd & 0x80) {
-                            dev->accel.dy++;
+                            dev->accel.dy_ibm++;
                             dev->accel.cy++;
                         } else {
-                            dev->accel.dy--;
+                            dev->accel.dy_ibm--;
                             dev->accel.cy--;
                         }
 
                         if ((dev->accel_bpp == 24) || (dev->accel_bpp <= 8)) {
                             dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                            dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
+                            dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
                         } else if (dev->bpp) {
                             dev->accel.src  = (dev->accel.ge_offset << 1) + (dev->accel.cy * dev->pitch);
-                            dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy * dev->pitch);
+                            dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy_ibm * dev->pitch);
                         } else {
                             dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                            dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
+                            dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
                         }
 
                         dev->accel.sy--;
                         dev->accel.x_count = 0;
 
-                        if (dev->accel.sy < 0)
+                        if (dev->accel.sy < 0) {
                             dev->accel.cmd_back = 1;
+                            dev->fifo_idx = 0;
+                        }
                         return;
                     }
                 }
@@ -2979,11 +3018,10 @@ skip_nibble_bitblt_write:
                                 mix_dat >>= 8;
                                 dev->accel.temp_cnt = 8;
                             }
-                            if ((dev->accel.dx >= clip_l) &&
-                                (dev->accel.dx <= clip_r) &&
-                                (dev->accel.dy >= clip_t) &&
-                                (dev->accel.dy <= clip_b)) {
-                                dev->subsys_stat |= 0x02;
+                            if ((dev->accel.dx_ibm >= clip_l) &&
+                                (dev->accel.dx_ibm <= clip_r) &&
+                                (dev->accel.dy_ibm >= clip_t) &&
+                                (dev->accel.dy_ibm <= clip_b)) {
                                 switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                                     case 0:
                                         src_dat = bkgd_color;
@@ -3002,7 +3040,7 @@ skip_nibble_bitblt_write:
                                         break;
                                 }
 
-                                READ(dev->accel.dest + dev->accel.dx, dest_dat);
+                                READ(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
 
                                 if ((compare_mode == 0) ||
                                     ((compare_mode == 0x10) && (dest_dat >= compare)) ||
@@ -3014,7 +3052,7 @@ skip_nibble_bitblt_write:
                                     old_dest_dat = dest_dat;
                                     MIX(mix_dat & mix_mask, dest_dat, src_dat);
                                     dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                    WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
+                                    WRITE(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
                                 }
                             }
 
@@ -3025,10 +3063,10 @@ skip_nibble_bitblt_write:
                             }
 
                             if (dev->accel.cmd & 0x20) {
-                                dev->accel.dx++;
+                                dev->accel.dx_ibm++;
                                 dev->accel.cx++;
                             } else {
-                                dev->accel.dx--;
+                                dev->accel.dx_ibm--;
                                 dev->accel.cx--;
                             }
 
@@ -3037,36 +3075,38 @@ skip_nibble_bitblt_write:
                                 dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
 
                                 if (dev->accel.cmd & 0x20) {
-                                    dev->accel.dx -= (dev->accel.sx + 1);
+                                    dev->accel.dx_ibm -= (dev->accel.sx + 1);
                                     dev->accel.cx -= (dev->accel.sx + 1);
                                 } else {
-                                    dev->accel.dx += (dev->accel.sx + 1);
+                                    dev->accel.dx_ibm += (dev->accel.sx + 1);
                                     dev->accel.cx += (dev->accel.sx + 1);
                                 }
 
                                 if (dev->accel.cmd & 0x80) {
-                                    dev->accel.dy++;
+                                    dev->accel.dy_ibm++;
                                     dev->accel.cy++;
                                 } else {
-                                    dev->accel.dy--;
+                                    dev->accel.dy_ibm--;
                                     dev->accel.cy--;
                                 }
 
                                 if ((dev->accel_bpp == 24) || (dev->accel_bpp <= 8)) {
                                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
                                 } else if (dev->bpp) {
                                     dev->accel.src  = (dev->accel.ge_offset << 1) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy_ibm * dev->pitch);
                                 } else {
                                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
                                 }
 
                                 dev->accel.sy--;
 
-                                if (dev->accel.sy < 0)
+                                if (dev->accel.sy < 0) {
                                     dev->accel.cmd_back = 1;
+                                    dev->fifo_idx = 0;
+                                }
                                 return;
                             }
                         }
@@ -3077,11 +3117,10 @@ skip_nibble_bitblt_write:
                                 dev->accel.temp_cnt = 8;
                                 mix_dat = old_mix_dat;
                             }
-                            if ((dev->accel.dx >= clip_l) &&
-                                (dev->accel.dx <= clip_r) &&
-                                (dev->accel.dy >= clip_t) &&
-                                (dev->accel.dy <= clip_b)) {
-                                dev->subsys_stat |= 0x02;
+                            if ((dev->accel.dx_ibm >= clip_l) &&
+                                (dev->accel.dx_ibm <= clip_r) &&
+                                (dev->accel.dy_ibm >= clip_t) &&
+                                (dev->accel.dy_ibm <= clip_b)) {
                                 switch ((mix_dat & 0x01) ? frgd_mix : bkgd_mix) {
                                     case 0:
                                         src_dat = bkgd_color;
@@ -3100,7 +3139,7 @@ skip_nibble_bitblt_write:
                                         break;
                                 }
 
-                                READ(dev->accel.dest + dev->accel.dx, dest_dat);
+                                READ(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
 
                                 if ((compare_mode == 0) ||
                                     ((compare_mode == 0x10) && (dest_dat >= compare)) ||
@@ -3112,7 +3151,7 @@ skip_nibble_bitblt_write:
                                     old_dest_dat = dest_dat;
                                     MIX(mix_dat & 0x01, dest_dat, src_dat);
                                     dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                    WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
+                                    WRITE(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
                                 }
                             }
 
@@ -3120,10 +3159,10 @@ skip_nibble_bitblt_write:
                             mix_dat >>= 1;
 
                             if (dev->accel.cmd & 0x20) {
-                                dev->accel.dx++;
+                                dev->accel.dx_ibm++;
                                 dev->accel.cx++;
                             } else {
-                                dev->accel.dx--;
+                                dev->accel.dx_ibm--;
                                 dev->accel.cx--;
                             }
 
@@ -3132,37 +3171,38 @@ skip_nibble_bitblt_write:
                                 dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
 
                                 if (dev->accel.cmd & 0x20) {
-                                    dev->accel.dx -= (dev->accel.sx + 1);
+                                    dev->accel.dx_ibm -= (dev->accel.sx + 1);
                                     dev->accel.cx -= (dev->accel.sx + 1);
                                 } else {
-                                    dev->accel.dx += (dev->accel.sx + 1);
+                                    dev->accel.dx_ibm += (dev->accel.sx + 1);
                                     dev->accel.cx += (dev->accel.sx + 1);
                                 }
 
                                 if (dev->accel.cmd & 0x80) {
-                                    dev->accel.dy++;
+                                    dev->accel.dy_ibm++;
                                     dev->accel.cy++;
                                 } else {
-                                    dev->accel.dy--;
+                                    dev->accel.dy_ibm--;
                                     dev->accel.cy--;
                                 }
 
                                 if ((dev->accel_bpp == 24) || (dev->accel_bpp <= 8)) {
                                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
                                 } else if (dev->bpp) {
                                     dev->accel.src  = (dev->accel.ge_offset << 1) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy_ibm * dev->pitch);
                                 } else {
                                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
                                 }
                                 dev->accel.sy--;
 
                                 if (dev->accel.sy < 0) {
-                                    dev->accel.destx = dev->accel.dx;
-                                    dev->accel.desty = dev->accel.dy;
+                                    dev->accel.destx = dev->accel.dx_ibm;
+                                    dev->accel.desty = dev->accel.dy_ibm;
                                     dev->accel.cmd_back = 1;
+                                    dev->fifo_idx = 0;
                                     return;
                                 }
                             }
@@ -3174,15 +3214,13 @@ skip_nibble_bitblt_write:
                         int64_t dx;
 
                         cx = (int64_t) dev->accel.cx;
-                        dx = (int64_t) dev->accel.dx;
+                        dx = (int64_t) dev->accel.dx_ibm;
 
                         while (1) {
                             if ((dx >= (((int64_t)clip_l) * 3)) &&
                                 (dx <= (((uint64_t)clip_r) * 3)) &&
-                                (dev->accel.dy >= (clip_t << 1)) &&
-                                (dev->accel.dy <= (clip_b << 1))) {
-                                dev->subsys_stat |= 0x02;
-
+                                (dev->accel.dy_ibm >= (clip_t << 1)) &&
+                                (dev->accel.dy_ibm <= (clip_b << 1))) {
                                 READ(dev->accel.src + cx, src_dat);
                                 READ(dev->accel.dest + dx, dest_dat);
                                 dest_dat = (src_dat & wrt_mask) | (dest_dat & ~wrt_mask);
@@ -3195,16 +3233,16 @@ skip_nibble_bitblt_write:
                             dev->accel.sx--;
                             if (dev->accel.sx < 0) {
                                 dev->accel.cmd_back = 1;
+                                dev->fifo_idx = 0;
                                 return;
                             }
                         }
                     } else {
                         while (count-- && dev->accel.sy >= 0) {
-                            if ((dev->accel.dx >= clip_l) &&
-                                (dev->accel.dx <= clip_r) &&
-                                (dev->accel.dy >= clip_t) &&
-                                (dev->accel.dy <= clip_b)) {
-                                dev->subsys_stat |= 0x02;
+                            if ((dev->accel.dx_ibm >= clip_l) &&
+                                (dev->accel.dx_ibm <= clip_r) &&
+                                (dev->accel.dy_ibm >= clip_t) &&
+                                (dev->accel.dy_ibm <= clip_b)) {
                                 if (pixcntl == 3) {
                                     if (!(dev->accel.cmd & 0x10) && ((frgd_mix != 3) || (bkgd_mix != 3))) {
                                         READ(dev->accel.src + dev->accel.cx, mix_dat);
@@ -3238,7 +3276,7 @@ skip_nibble_bitblt_write:
                                         break;
                                 }
 
-                                READ(dev->accel.dest + dev->accel.dx, dest_dat);
+                                READ(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
 
                                 if ((compare_mode == 0) ||
                                     ((compare_mode == 0x10) && (dest_dat >= compare)) ||
@@ -3250,12 +3288,14 @@ skip_nibble_bitblt_write:
                                     old_dest_dat = dest_dat;
                                     MIX(mix_dat & mix_mask, dest_dat, src_dat);
                                     dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
+
                                     if (dev->accel.cmd & 0x04) {
                                         if (dev->accel.sx) {
-                                            WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
+                                            WRITE(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
                                         }
                                     } else {
-                                        WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
+                                        WRITE(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
+                                        ibm8514_log("BitBLT DX=%d, DY=%d, data=%02x, old=%02x, src=%02x, frmix=%02x, bkmix=%02x, pixcntl=%d.\n", dev->accel.dx_ibm, dev->accel.dy_ibm, dest_dat, old_dest_dat, src_dat, dev->accel.frgd_mix & 0x1f, dev->accel.bkgd_mix & 0x1f, pixcntl);
                                     }
                                 }
                             }
@@ -3264,10 +3304,10 @@ skip_nibble_bitblt_write:
                             mix_dat |= 1;
 
                             if (dev->accel.cmd & 0x20) {
-                                dev->accel.dx++;
+                                dev->accel.dx_ibm++;
                                 dev->accel.cx++;
                             } else {
-                                dev->accel.dx--;
+                                dev->accel.dx_ibm--;
                                 dev->accel.cx--;
                             }
 
@@ -3277,37 +3317,38 @@ skip_nibble_bitblt_write:
                                 dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
 
                                 if (dev->accel.cmd & 0x20) {
-                                    dev->accel.dx -= (dev->accel.sx + 1);
+                                    dev->accel.dx_ibm -= (dev->accel.sx + 1);
                                     dev->accel.cx -= (dev->accel.sx + 1);
                                 } else {
-                                    dev->accel.dx += (dev->accel.sx + 1);
+                                    dev->accel.dx_ibm += (dev->accel.sx + 1);
                                     dev->accel.cx += (dev->accel.sx + 1);
                                 }
 
                                 if (dev->accel.cmd & 0x80) {
-                                    dev->accel.dy++;
+                                    dev->accel.dy_ibm++;
                                     dev->accel.cy++;
                                 } else {
-                                    dev->accel.dy--;
+                                    dev->accel.dy_ibm--;
                                     dev->accel.cy--;
                                 }
 
                                 if ((dev->accel_bpp == 24) || (dev->accel_bpp <= 8)) {
                                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
                                 } else if (dev->bpp) {
                                     dev->accel.src  = (dev->accel.ge_offset << 1) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy_ibm * dev->pitch);
                                 } else {
                                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
                                 }
                                 dev->accel.sy--;
 
                                 if (dev->accel.sy < 0) {
-                                    dev->accel.destx = dev->accel.dx;
-                                    dev->accel.desty = dev->accel.dy;
+                                    dev->accel.destx = dev->accel.dx_ibm;
+                                    dev->accel.desty = dev->accel.dy_ibm;
                                     dev->accel.cmd_back = 1;
+                                    dev->fifo_idx = 0;
                                     return;
                                 }
                             }
@@ -3334,7 +3375,7 @@ ibm8514_render_blank(svga_t *svga)
         dev->firstline_draw = dev->displine;
     dev->lastline_draw = dev->displine;
 
-    uint32_t *line_ptr   = &svga->monitor->target_buffer->line[dev->displine + svga->y_add][svga->x_add];
+    uint32_t *line_ptr   = &buffer32->line[dev->displine + svga->y_add][svga->x_add];
     uint32_t  line_width = (uint32_t)(dev->h_disp) * sizeof(uint32_t);
 
     if (dev->h_disp > 0)
@@ -3628,7 +3669,7 @@ ibm8514_poll(void *priv)
     int      wx;
     int      wy;
 
-    ibm8514_log("IBM 8514/A poll=%x.\n", dev->on);
+    ibm8514_log("IBM 8514/A poll=%x offtime=%" PRIu64 ", ontime=%" PRIu64 ".\n", dev->on, dev->dispofftime, dev->dispontime);
     if (dev->on) {
         ibm8514_log("ON!\n");
         if (!dev->linepos) {
@@ -3713,7 +3754,7 @@ ibm8514_poll(void *priv)
             dev->vc &= 0xfff;
 
             if (dev->vc == dev->dispend) {
-                dev->subsys_stat |= 0x01;
+                dev->vblank_start(svga);
                 ibm8514_log("VBLANK irq.\n");
                 dev->dispon = 0;
 
@@ -3751,16 +3792,16 @@ ibm8514_poll(void *priv)
                 svga->vslines    = 0;
 
                 if (dev->interlace && dev->oddeven)
-                    dev->ma = dev->maback = (dev->rowoffset << 1);
+                    dev->ma = dev->maback = dev->ma_latch + (dev->rowoffset << 1);
                 else
-                    dev->ma = dev->maback = 0;
+                    dev->ma = dev->maback = dev->ma_latch;
 
                 dev->ma     = (dev->ma << 2);
                 dev->maback = (dev->maback << 2);
             }
             if (dev->vc == dev->v_total) {
                 dev->vc       = 0;
-                dev->sc       = 0;
+                dev->sc       = (svga->crtc[0x8] & 0x1f);
                 dev->dispon   = 1;
                 dev->displine = (dev->interlace && dev->oddeven) ? 1 : 0;
 
@@ -3876,6 +3917,15 @@ ibm8514_mca_reset(void *priv)
     svga_set_poll(svga);
 }
 
+static void
+ibm8514_vblank_start(void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    dev->subsys_stat |= INT_VSY;
+}
+
 static void *
 ibm8514_init(const device_t *info)
 {
@@ -3938,6 +3988,7 @@ ibm8514_init(const device_t *info)
 
             fallthrough;
         default:
+            dev->extensions = 0;
             ibm8514_io_set(svga);
 
             if (dev->type & DEVICE_MCA) {
@@ -3945,8 +3996,11 @@ ibm8514_init(const device_t *info)
                 dev->pos_regs[1] = 0xef;
                 mca_add(ibm8514_mca_read, ibm8514_mca_write, ibm8514_mca_feedb, ibm8514_mca_reset, svga);
             }
+
+            dev->vblank_start = ibm8514_vblank_start;
             break;
     }
+
     return svga;
 }
 
@@ -3981,7 +4035,7 @@ ibm8514_force_redraw(void *priv)
 {
     svga_t *svga = (svga_t *) priv;
 
-    svga->fullchange = changeframecount;
+    svga->fullchange = svga->monitor->mon_changeframecount;
 }
 
 // clang-format off
diff --git a/src/video/vid_ati_mach8.c b/src/video/vid_ati_mach8.c
index d35257ea7..9f1bb99d6 100644
--- a/src/video/vid_ati_mach8.c
+++ b/src/video/vid_ati_mach8.c
@@ -70,6 +70,10 @@ static uint16_t ati8514_accel_inw(uint16_t port, void *priv);
 static uint32_t ati8514_accel_inl(uint16_t port, void *priv);
 
 static void mach32_updatemapping(mach_t *mach, svga_t *svga);
+static __inline void mach32_writew_linear(uint32_t addr, uint16_t val, mach_t *mach);
+static __inline void mach32_write_common(uint32_t addr, uint8_t val, int linear, mach_t *mach, svga_t *svga);
+
+static mach_t *reset_state = NULL;
 
 #ifdef ENABLE_MACH_LOG
 int mach_do_log = ENABLE_MACH_LOG;
@@ -121,14 +125,14 @@ mach_log(const char *fmt, ...)
     }
 
 #define READ_PIXTRANS_WORD(cx, n)                                                                                                          \
-    if ((cmd == 0) || (cmd == 1) || (cmd == 5) || (mach->accel.cmd_type == -1)) {                                                          \
+    if ((cmd == 0) || (cmd == 1) || (cmd == 5) || ((mach->accel.cmd_type == -1) && (cmd != 2))) {                                                          \
         if (dev->bpp)                                                                                                                      \
             temp = vram_w[((dev->accel.cy * dev->pitch) + (cx) + (n)) & (dev->vram_mask >> 1)];                                            \
         else {                                                                                                                             \
             temp = dev->vram[((dev->accel.cy * dev->pitch) + (cx) + (n)) & dev->vram_mask];                                                \
             temp |= (dev->vram[((dev->accel.cy * dev->pitch) + (cx) + (n + 1)) & dev->vram_mask] << 8);                                    \
         }                                                                                                                                  \
-    } else if ((mach->accel.cmd_type == 2) || (mach->accel.cmd_type == 5)) {                                                               \
+    } else if (((cmd == 2) && (mach->accel.cmd_type == -1)) || (mach->accel.cmd_type == 2) || (mach->accel.cmd_type == 5)) {                                                               \
         if (dev->bpp)                                                                                                                      \
             temp = vram_w[((dev->accel.dest) + (cx) + (n)) & (dev->vram_mask >> 1)];                                                       \
         else {                                                                                                                             \
@@ -184,12 +188,15 @@ mach_log(const char *fmt, ...)
                 dest_dat = ~(src_dat & dest_dat);                                                     \
                 break;                                                                                \
             case 0x09:                                                                                \
+            case 0x11:                                                                                \
                 dest_dat = ~src_dat | dest_dat;                                                       \
                 break;                                                                                \
             case 0x0a:                                                                                \
+            case 0x12:                                                                                \
                 dest_dat = src_dat | ~dest_dat;                                                       \
                 break;                                                                                \
             case 0x0b:                                                                                \
+            case 0x13:                                                                                \
                 dest_dat = src_dat | dest_dat;                                                        \
                 break;                                                                                \
             case 0x0c:                                                                                \
@@ -207,56 +214,43 @@ mach_log(const char *fmt, ...)
             case 0x10:                                                                                \
                 dest_dat = MIN(src_dat, dest_dat);                                                    \
                 break;                                                                                \
-            case 0x11:                                                                                \
-                dest_dat = dest_dat - src_dat;                                                        \
-                break;                                                                                \
-            case 0x12:                                                                                \
-                dest_dat = src_dat - dest_dat;                                                        \
-                break;                                                                                \
-            case 0x13:                                                                                \
-                dest_dat = src_dat + dest_dat;                                                        \
-                break;                                                                                \
             case 0x14:                                                                                \
                 dest_dat = MAX(src_dat, dest_dat);                                                    \
                 break;                                                                                \
             case 0x15:                                                                                \
-                dest_dat = (dest_dat - src_dat) / 2;                                                  \
+                dest_dat = (src_dat | ~dest_dat) >> 1;                                                \
                 break;                                                                                \
             case 0x16:                                                                                \
-                dest_dat = (src_dat - dest_dat) / 2;                                                  \
+                dest_dat = (~src_dat | dest_dat) >> 1;                                                \
                 break;                                                                                \
             case 0x17:                                                                                \
-                dest_dat = (dest_dat + src_dat) / 2;                                                  \
+                dest_dat = (src_dat | dest_dat) >> 1;                                                 \
                 break;                                                                                \
             case 0x18:                                                                                \
-                dest_dat = MAX(0, (dest_dat - src_dat));                                              \
-                break;                                                                                \
             case 0x19:                                                                                \
-                dest_dat = MAX(0, (dest_dat - src_dat));                                              \
+                dest_dat = MAX(0, ~src_dat | dest_dat);                                               \
                 break;                                                                                \
             case 0x1a:                                                                                \
-                dest_dat = MAX(0, (src_dat - dest_dat));                                              \
+                dest_dat = MAX(0, src_dat | ~dest_dat);                                               \
                 break;                                                                                \
             case 0x1b:                                                                                \
                 if (dev->bpp)                                                                         \
-                    dest_dat = MIN(0xffff, (dest_dat + src_dat));                                     \
+                    dest_dat = MIN(0xffff, src_dat | dest_dat);                                       \
                 else                                                                                  \
-                    dest_dat = MIN(0xff, (dest_dat + src_dat));                                       \
+                    dest_dat = MIN(0xff, src_dat | dest_dat);                                         \
                 break;                                                                                \
             case 0x1c:                                                                                \
-                dest_dat = MAX(0, (dest_dat - src_dat)) / 2;                                          \
-                break;                                                                                \
             case 0x1d:                                                                                \
-                dest_dat = MAX(0, (dest_dat - src_dat)) / 2;                                          \
+                dest_dat = MAX(0, ~src_dat | dest_dat) >> 1;                                          \
                 break;                                                                                \
             case 0x1e:                                                                                \
-                dest_dat = MAX(0, (src_dat - dest_dat)) / 2;                                          \
+                dest_dat = MAX(0, src_dat | ~dest_dat) >> 1;                                          \
                 break;                                                                                \
             case 0x1f:                                                                                \
                 if (dev->bpp)                                                                         \
-                    dest_dat = (0xffff < (src_dat + dest_dat)) ? 0xffff : ((src_dat + dest_dat) / 2); \
+                    dest_dat = (0xffff < (src_dat | dest_dat)) ? 0xffff : ((src_dat | dest_dat) >> 1); \
                 else                                                                                  \
-                    dest_dat = (0xff < (src_dat + dest_dat)) ? 0xff : ((src_dat + dest_dat) / 2);     \
+                    dest_dat = (0xff < (src_dat | dest_dat)) ? 0xff : ((src_dat | dest_dat) >> 1);    \
                 break;                                                                                \
         }                                                                                             \
     }
@@ -265,10 +259,10 @@ mach_log(const char *fmt, ...)
 #define WRITE(addr, dat)                                                               \
     if (dev->bpp) {                                                                    \
         vram_w[((addr)) & (dev->vram_mask >> 1)]                    = dat;             \
-        dev->changedvram[(((addr)) & (dev->vram_mask >> 1)) >> 11] = changeframecount; \
+        dev->changedvram[(((addr)) & (dev->vram_mask >> 1)) >> 11] = svga->monitor->mon_changeframecount; \
     } else {                                                                           \
         dev->vram[((addr)) & (dev->vram_mask)]                = dat;                   \
-        dev->changedvram[(((addr)) & (dev->vram_mask)) >> 12] = changeframecount;      \
+        dev->changedvram[(((addr)) & (dev->vram_mask)) >> 12] = svga->monitor->mon_changeframecount;      \
     }
 
 static int
@@ -297,6 +291,8 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
     uint16_t      rd_mask      = dev->accel.rd_mask;
     uint16_t      wrt_mask     = dev->accel.wrt_mask;
     uint16_t      dest_cmp_clr = dev->accel.color_cmp;
+    uint16_t      frgd_color   = dev->accel.frgd_color;
+    uint16_t      bkgd_color   = dev->accel.bkgd_color;
     int           frgd_sel;
     int           bkgd_sel;
     int           mono_src;
@@ -313,9 +309,16 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
     int16_t       clip_b    = dev->accel.clip_bottom;
     int16_t       clip_r    = dev->accel.clip_right;
 
+    if (clip_l < 0)
+        clip_l = 0;
+    if (clip_t < 0)
+        clip_t = 0;
+
     if (!dev->bpp) {
         rd_mask &= 0xff;
         dest_cmp_clr &= 0xff;
+        frgd_color &= 0xff;
+        bkgd_color &= 0xff;
     }
 
     compare_mode = (mach->accel.dest_cmp_fn >> 3) & 7;
@@ -341,6 +344,8 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                  dev->accel.rd_mask, mach->accel.dp_config, clip_l, clip_r, clip_t, clip_b, mach->accel.linedraw_opt, dev->accel_bpp, cmd_type, mach->accel.ge_offset, count, cpu_input, mono_src, frgd_sel, dev->accel.cur_x, dev->accel.cur_y,
                  mach->accel.dest_x_end, dev->ext_pitch, dev->ext_crt_pitch, mach->accel.dp_config & 1, mach->accel.mono_pattern_enable);
 
+    mach_log("cmd_type = %i, frgd_sel = %i, bkgd_sel = %i, mono_src = %i.\n", cmd_type, frgd_sel, bkgd_sel, mono_src);
+
     switch (cmd_type) {
         case 1: /*Extended Raw Linedraw from bres_count register (0x96ee)*/
             if (!cpu_input) {
@@ -438,13 +443,12 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                         (dev->accel.dx <= clip_r) &&
                         (dev->accel.dy >= clip_t) &&
                         (dev->accel.dy <= clip_b)) {
-                        dev->subsys_stat |= 0x02;
                         switch (mix ? frgd_sel : bkgd_sel) {
                             case 0:
-                                src_dat = dev->accel.bkgd_color;
+                                src_dat = bkgd_color;
                                 break;
                             case 1:
-                                src_dat = dev->accel.frgd_color;
+                                src_dat = frgd_color;
                                 break;
                             case 2:
                                 src_dat = cpu_dat;
@@ -547,9 +551,11 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                     if ((mono_src == 1) && !count) {
                         dev->accel.cmd_back = 1;
+                        dev->fifo_idx = 0;
                         break;
                     } else if ((mono_src != 1) && (dev->accel.sx >= mach->accel.width)) {
                         dev->accel.cmd_back = 1;
+                        dev->fifo_idx = 0;
                         break;
                     }
 
@@ -662,13 +668,13 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                         (dev->accel.dx <= clip_r) &&
                         (dev->accel.dy >= clip_t) &&
                         (dev->accel.dy <= clip_b)) {
-                        dev->subsys_stat |= 0x02;
+                        dev->subsys_stat |= INT_GE_BSY;
                         switch (mix ? frgd_sel : bkgd_sel) {
                             case 0:
-                                src_dat = dev->accel.bkgd_color;
+                                src_dat = bkgd_color;
                                 break;
                             case 1:
-                                src_dat = dev->accel.frgd_color;
+                                src_dat = frgd_color;
                                 break;
                             case 2:
                                 src_dat = cpu_dat;
@@ -772,9 +778,11 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                     if ((mono_src == 1) && !count) {
                         dev->accel.cmd_back = 1;
+                        dev->fifo_idx = 0;
                         break;
                     } else if ((mono_src != 1) && (dev->accel.sx >= mach->accel.width)) {
                         dev->accel.cmd_back = 1;
+                        dev->fifo_idx = 0;
                         break;
                     }
 
@@ -997,6 +1005,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
             if (mach->accel.dy_end == mach->accel.dy_start) {
                 mach_log("No DEST.\n");
                 dev->accel.cmd_back = 1;
+                dev->fifo_idx = 0;
                 return;
             }
 
@@ -1004,6 +1013,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 if (mach->accel.sx_end == mach->accel.sx_start) {
                     mach_log("No SRC.\n");
                     dev->accel.cmd_back = 1;
+                    dev->fifo_idx = 0;
                     return;
                 }
             }
@@ -1015,6 +1025,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                     if (dev->accel.sy == mach->accel.height) {
                         mach_log("No Blit on DPCONFIG=3251.\n");
                         dev->accel.cmd_back = 1;
+                        dev->fifo_idx = 0;
                         return;
                     }
                 }
@@ -1069,7 +1080,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                     (dev->accel.dx <= clip_r) &&
                     (dev->accel.dy >= clip_t) &&
                     (dev->accel.dy <= clip_b)) {
-                    dev->subsys_stat |= 0x02;
+                    dev->subsys_stat |= INT_GE_BSY;
                     if (mach->accel.dp_config & 0x02) {
                         READ(dev->accel.src + dev->accel.cx, poly_src);
                         poly_src = ((poly_src & rd_mask) == rd_mask);
@@ -1080,10 +1091,10 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                     if (mach->accel.poly_fill || !(mach->accel.dp_config & 0x02)) {
                         switch (mix ? frgd_sel : bkgd_sel) {
                             case 0:
-                                src_dat = dev->accel.bkgd_color;
+                                src_dat = bkgd_color;
                                 break;
                             case 1:
-                                src_dat = dev->accel.frgd_color;
+                                src_dat = frgd_color;
                                 break;
                             case 2:
                                 src_dat = cpu_dat;
@@ -1232,6 +1243,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                     if (dev->accel.sy >= mach->accel.height) {
                         dev->accel.cmd_back = 1;
+                        dev->fifo_idx = 0;
                         if ((mono_src == 2) || (mono_src == 3) || (frgd_sel == 3) || (bkgd_sel == 3) || (mach->accel.dp_config & 0x02))
                             return;
                         if ((mono_src == 1) && (frgd_sel == 5) && (dev->accel_bpp == 24))
@@ -1311,14 +1323,14 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                             (dev->accel.cx <= clip_r) &&
                             (dev->accel.cy >= clip_t) &&
                             (dev->accel.cy <= clip_b)) {
-                            dev->subsys_stat |= 0x02;
+                            dev->subsys_stat |= INT_GE_BSY;
                             mach->accel.clip_overrun = 0;
                             switch (mix ? frgd_sel : bkgd_sel) {
                                 case 0:
-                                    src_dat = dev->accel.bkgd_color;
+                                    src_dat = bkgd_color;
                                     break;
                                 case 1:
-                                    src_dat = dev->accel.frgd_color;
+                                    src_dat = frgd_color;
                                     break;
                                 case 2:
                                     src_dat = cpu_dat;
@@ -1391,6 +1403,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                         if (!count) {
                             dev->accel.cmd_back = 1;
+                            dev->fifo_idx = 0;
                             break;
                         }
 
@@ -1445,7 +1458,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                             (dev->accel.cx <= clip_r) &&
                             (dev->accel.cy >= clip_t) &&
                             (dev->accel.cy <= clip_b)) {
-                            dev->subsys_stat |= 0x02;
+                            dev->subsys_stat |= INT_GE_BSY;
                             mach->accel.clip_overrun = 0;
                             if (mach->accel.linedraw_opt & 0x02) {
                                 if (dev->bpp) {
@@ -1459,10 +1472,10 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                             switch (mix ? frgd_sel : bkgd_sel) {
                                 case 0:
-                                    src_dat = dev->accel.bkgd_color;
+                                    src_dat = bkgd_color;
                                     break;
                                 case 1:
-                                    src_dat = dev->accel.frgd_color;
+                                    src_dat = frgd_color;
                                     break;
                                 case 2:
                                     src_dat = cpu_dat;
@@ -1561,6 +1574,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                         if (dev->accel.sx >= mach->accel.width) {
                             dev->accel.cmd_back = 1;
+                            dev->fifo_idx = 0;
                             break;
                         }
 
@@ -1604,14 +1618,14 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                             (dev->accel.cx <= clip_r) &&
                             (dev->accel.cy >= clip_t) &&
                             (dev->accel.cy <= clip_b)) {
-                            dev->subsys_stat |= 0x02;
+                            dev->subsys_stat |= INT_GE_BSY;
                             mach->accel.clip_overrun = 0;
                             switch (mix ? frgd_sel : bkgd_sel) {
                                 case 0:
-                                    src_dat = dev->accel.bkgd_color;
+                                    src_dat = bkgd_color;
                                     break;
                                 case 1:
-                                    src_dat = dev->accel.frgd_color;
+                                    src_dat = frgd_color;
                                     break;
                                 case 2:
                                     src_dat = cpu_dat;
@@ -1685,6 +1699,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                         if (!count) {
                             dev->accel.cmd_back = 1;
+                            dev->fifo_idx = 0;
                             break;
                         }
 
@@ -1739,14 +1754,14 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                             (dev->accel.cx <= clip_r) &&
                             (dev->accel.cy >= clip_t) &&
                             (dev->accel.cy <= clip_b)) {
-                            dev->subsys_stat |= 0x02;
+                            dev->subsys_stat |= INT_GE_BSY;
                             mach->accel.clip_overrun = 0;
                             switch (mix ? frgd_sel : bkgd_sel) {
                                 case 0:
-                                    src_dat = dev->accel.bkgd_color;
+                                    src_dat = bkgd_color;
                                     break;
                                 case 1:
-                                    src_dat = dev->accel.frgd_color;
+                                    src_dat = frgd_color;
                                     break;
                                 case 2:
                                     src_dat = cpu_dat;
@@ -1843,6 +1858,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                         if (dev->accel.sx >= mach->accel.width) {
                             dev->accel.cmd_back = 1;
+                            dev->fifo_idx = 0;
                             break;
                         }
 
@@ -1873,8 +1889,9 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
             mach->accel.poly_fill = 0;
             mach->accel.line_array[(cmd_type == 4) ? 4 : 0] = dev->accel.cx;
             mach->accel.line_array[(cmd_type == 4) ? 5 : 1] = dev->accel.cy;
-            dev->accel.cur_x                                = mach->accel.line_array[(cmd_type == 4) ? 4 : 0];
-            dev->accel.cur_y                                = mach->accel.line_array[(cmd_type == 4) ? 5 : 1];
+            dev->accel.cur_x = dev->accel.cx;
+            dev->accel.cur_y = dev->accel.cy;
+            mach_log("Done: %i, %i\n", dev->accel.cur_x, dev->accel.cur_y);
             break;
 
         case 5: /*Horizontal Raster Draw from scan_to_x register (0xcaee)*/
@@ -1920,12 +1937,16 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 if (mach->accel.dest_y_end >= 0x600)
                     mach->accel.dy_end |= ~0x5ff;
 
-                if (mach->accel.dy_end > mach->accel.dy_start)
+                if (mach->accel.dy_end > mach->accel.dy_start) {
+                    dev->accel.sy = (mach->accel.dy_end - mach->accel.dy_start);
                     mach->accel.stepy = 1;
-                else if (mach->accel.dy_end < mach->accel.dy_start)
+                } else if (mach->accel.dy_end < mach->accel.dy_start) {
+                    dev->accel.sy = (mach->accel.dy_start - mach->accel.dy_end);
                     mach->accel.stepy = -1;
-                else
+                } else {
                     mach->accel.stepy = 0;
+                    dev->accel.sy = 0;
+                }
 
                 if (dev->bpp)
                     dev->accel.dest = (mach->accel.ge_offset << 1) + (dev->accel.dy * (dev->pitch));
@@ -1969,9 +1990,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 else
                     dev->accel.src = (mach->accel.ge_offset << 2) + (dev->accel.cy * (dev->pitch));
 
-                mach_log("ScanToX=%04x, MonoSRC=%d, FrgdSel=%d, BkgdSel=%d, Pitch=%d, C(%d,%d), SRCWidth=%d, WH(%d,%d), colorpattidx=%d, pattlen=%d.\n",
-                         mach->accel.dp_config, mono_src, frgd_sel, bkgd_sel, dev->ext_pitch, dev->accel.cx, dev->accel.cy, mach->accel.src_width,
-                         mach->accel.width, mach->accel.height, mach->accel.color_pattern_idx, mach->accel.patt_len);
+                mach_log("ScanToX: Parameters=%04x: DX=%d, DY=%d, CX=%d, CY=%d, dstwidth=%d, srcwidth=%d, height=%d, clipl=%d, clipr=%d, clipt=%d, clipb=%d, frmix=%02x.\n", mach->accel.dp_config, dev->accel.dx, dev->accel.dy, dev->accel.cx, dev->accel.cy, mach->accel.width, mach->accel.src_width, dev->accel.sy, clip_l, clip_r, clip_t, clip_b, dev->accel.frgd_mix & 0x1f);
 
                 if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach)) {
                     if (mach_pixel_write(mach)) {
@@ -2035,13 +2054,13 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                     (dev->accel.dx <= clip_r) &&
                     (dev->accel.dy >= clip_t) &&
                     (dev->accel.dy <= clip_b)) {
-                    dev->subsys_stat |= 0x02;
+                    dev->subsys_stat |= INT_GE_BSY;
                     switch (mix ? frgd_sel : bkgd_sel) {
                         case 0:
-                            src_dat = dev->accel.bkgd_color;
+                            src_dat = bkgd_color;
                             break;
                         case 1:
-                            src_dat = dev->accel.frgd_color;
+                            src_dat = frgd_color;
                             break;
                         case 2:
                             src_dat = cpu_dat;
@@ -2104,6 +2123,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                     if (mach->accel.dp_config & 0x10) {
                         WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
+                        mach_log("ScanToX: DXS=%d, DYS=%d, dest data=%02x, lineidx=%d.\n", dev->accel.dx, dev->accel.dy, dest_dat, mach->accel.line_idx);
                     }
                 }
 
@@ -2148,7 +2168,14 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                         mach->accel.line_array[0] = dev->accel.dx;
                         mach->accel.line_array[4] = dev->accel.dx;
                     }
+                    if (dev->accel.sy >= 0)
+                        dev->accel.sy--;
+
                     dev->accel.cmd_back = 1;
+                    dev->fifo_idx = 0;
+                    dev->force_busy = 0;
+                    dev->force_busy2 = 0;
+                    mach->force_busy = 0;
                     return;
                 }
             }
@@ -2278,16 +2305,14 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
                             mach->bank_r |= ((mach->regs[0xae] & 0x0c) << 2);
                             mach->bank_w |= ((mach->regs[0xae] & 3) << 4);
                         }
-                        if (dev->on)
-                            mach_log("Separate B2Bank = %02x, AEbank = %02x.\n", mach->regs[0xb2], mach->regs[0xae]);
+                        mach_log("Separate B2Bank = %02x, AEbank = %02x.\n", mach->regs[0xb2], mach->regs[0xae]);
                     } else { /* Single bank mode */
                         mach->bank_w = ((mach->regs[0xb2] & 0x1e) >> 1);
                         if ((dev->local & 0xff) >= 0x02)
                             mach->bank_w |= ((mach->regs[0xae] & 3) << 4);
 
                         mach->bank_r = mach->bank_w;
-                        if (dev->on)
-                            mach_log("Single B2Bank = %02x, AEbank = %02x.\n", mach->regs[0xb2], mach->regs[0xae]);
+                        mach_log("Single B2Bank = %02x, AEbank = %02x.\n", mach->regs[0xb2], mach->regs[0xae]);
                     }
                     svga->read_bank  = mach->bank_r << 16;
                     svga->write_bank = mach->bank_w << 16;
@@ -2420,7 +2445,7 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
                         svga->fullchange = 3;
                         svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
-                        svga->fullchange = changeframecount;
+                        svga->fullchange = svga->monitor->mon_changeframecount;
                         svga_recalctimings(svga);
                     }
                 }
@@ -2490,6 +2515,7 @@ mach_in(uint16_t addr, void *priv)
                     temp = mach->regs[mach->index];
                     break;
             }
+            mach_log("ATI VGA read reg=%02x, val=%02x.\n", mach->index, temp);
             break;
 
         case 0x2ea:
@@ -2637,6 +2663,40 @@ ati_render_32bpp(svga_t *svga)
     }
 }
 
+static void
+mach_set_resolution(mach_t *mach, svga_t *svga)
+{
+    ibm8514_t    *dev  = (ibm8514_t *) svga->dev8514;
+
+    dev->hdisp = (dev->hdisped + 1) << 3;
+    dev->h_total = dev->htotal + 1;
+
+    dev->vdisp = (dev->v_disp + 1) >> 1;
+    if ((dev->vdisp == 478) || (dev->vdisp == 598) || (dev->vdisp == 766) || (dev->vdisp == 1022))
+        dev->vdisp += 2;
+
+    dev->v_total = dev->v_total_reg + 1;
+    if (dev->interlace)
+        dev->v_total >>= 1;
+
+    dev->v_syncstart = dev->v_sync_start + 1;
+    if (dev->interlace)
+        dev->v_syncstart >>= 1;
+
+    mach_log("Shadow set ATI=%x, shadow set 8514/A=%x, resolution h=%d, v=%d.\n", mach->shadow_set & 0x03, dev->accel.advfunc_cntl & 0x04, dev->hdisp, dev->vdisp);
+    if ((mach->accel.clock_sel & 0x01) || dev->bpp || ((mach->accel.ext_ge_config & 0x30) == 0x30)) /*ATI and 15bpp+ mode*/
+        svga_recalctimings(svga);
+    else { /*8514/A mode*/
+        if (mach->resolution_crt == 0x02) {
+            if (!(dev->accel.advfunc_cntl & 0x04)) {
+                dev->hdisp = 640;
+                dev->vdisp = 480;
+                svga_recalctimings(svga);
+            }
+        }
+    }
+}
+
 void
 ati8514_recalctimings(svga_t *svga)
 {
@@ -2648,7 +2708,6 @@ ati8514_recalctimings(svga_t *svga)
         mach_log("8514/A ON.\n");
         dev->pitch                      = dev->ext_pitch;
         dev->rowoffset                  = dev->ext_crt_pitch;
-        dev->h_total                    = dev->htotal + 1;
         dev->rowcount                   = !!(dev->disp_cntl & 0x08);
         dev->accel.ge_offset            = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
         mach->accel.ge_offset           = dev->accel.ge_offset;
@@ -2656,23 +2715,8 @@ ati8514_recalctimings(svga_t *svga)
         mach_log("HDISP=%d, VDISP=%d, shadowset=%x, 8514/A mode=%x, clocksel=%02x.\n",
                  dev->hdisp, dev->vdisp, mach->shadow_set & 0x03, dev->accel.advfunc_cntl & 0x05, mach->accel.clock_sel & 0x01);
 
-        if (mach->accel.clock_sel & 0x01) {
-            dev->h_disp = dev->hdisp;
-            dev->dispend = dev->vdisp;
-        } else {
-            if (dev->accel.advfunc_cntl & 0x04) {
-                if (dev->hdisp == 640) {
-                    dev->h_disp = 1024;
-                    dev->dispend = 768;
-                } else {
-                    dev->h_disp = dev->hdisp;
-                    dev->dispend = dev->vdisp;
-                }
-            } else {
-                dev->h_disp = 640;
-                dev->dispend = 480;
-            }
-        }
+        dev->h_disp = dev->hdisp;
+        dev->dispend = dev->vdisp;
 
         if (dev->accel.advfunc_cntl & 0x04)
             svga->clock8514 = (cpuclock * (double) (1ULL << 32)) / 44900000.0;
@@ -2695,6 +2739,7 @@ ati8514_recalctimings(svga_t *svga)
             }
         }
         dev->accel_bpp = 8;
+        mach->resolution_crt = 0;
         svga->render8514 = ibm8514_render_8bpp;
     }
 }
@@ -2753,9 +2798,9 @@ mach_recalctimings(svga_t *svga)
     mach_log("ON?=%d, override=%d.\n", dev->on, svga->override);
     if (dev->on) {
         mach_log("8514/A ON, extpitch=%d, devma=%x, vgamalatch=%x.\n", dev->ext_pitch, dev->ma, svga->ma_latch);
+        dev->ma_latch                   = (mach->accel.crt_offset_lo | (mach->accel.crt_offset_hi << 16)) << 2;
         dev->pitch                      = dev->ext_pitch;
         dev->rowoffset                  = dev->ext_crt_pitch;
-        dev->h_total                    = dev->htotal + 1;
         dev->rowcount                   = !!(dev->disp_cntl & 0x08);
         dev->accel.ge_offset            = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
         mach->accel.ge_offset           = dev->accel.ge_offset;
@@ -2763,42 +2808,12 @@ mach_recalctimings(svga_t *svga)
         mach_log("HDISP=%d, VDISP=%d, shadowset=%x, 8514/A mode=%x, clocksel=%02x, interlace=%x.\n",
                  dev->hdisp, dev->vdisp, mach->shadow_set & 0x03, dev->accel.advfunc_cntl & 0x04,
                  mach->accel.clock_sel & 0xfe, dev->interlace);
-        if ((dev->local & 0xff) >= 0x02) {
-            if (dev->bpp || ((mach->accel.ext_ge_config & 0x30) == 0x30) || (mach->accel.clock_sel & 0x01)) {
-                dev->h_disp = dev->hdisp;
-                dev->dispend = dev->vdisp;
-            } else {
-                if (dev->interlace) { /*Interlaced displays are only for 800x600 and up.*/
-                    if (dev->accel.advfunc_cntl & 0x04) {
-                        dev->h_disp = dev->hdisp;
-                        dev->dispend = dev->vdisp;
-                    } else {
-                        dev->h_disp = 640;
-                        dev->dispend = 480;
-                    }
-                } else {
-                    if (((mach->shadow_set & 0x03) == 0x00) && ((dev->hdisp2 == 640) || (dev->hdisp2 == 1280)) && (dev->hdisp != 800)) {
-                        dev->h_disp = dev->hdisp2;
-                        dev->dispend = dev->vdisp2;
-                    } else {
-                        dev->h_disp = dev->hdisp;
-                        dev->dispend = dev->vdisp;
-                    }
-                }
-            }
-        } else {
-            if (mach->accel.clock_sel & 0x01) {
-                dev->h_disp = dev->hdisp;
-                dev->dispend = dev->vdisp;
-            } else {
-                if (dev->accel.advfunc_cntl & 0x04) {
-                    dev->h_disp = dev->hdisp;
-                    dev->dispend = dev->vdisp;
-                } else {
-                    dev->h_disp = 640;
-                    dev->dispend = 480;
-                }
-            }
+
+        dev->h_disp = dev->hdisp;
+        dev->dispend = dev->vdisp;
+        if (dev->dispend == 959) { /*FIXME: vertical resolution mess on EEPROM tests on Mach8*/
+            dev->dispend >>= 1;
+            dev->dispend++;
         }
 
         svga->clock8514 = (cpuclock * (double) (1ULL << 32)) / svga->getclock((mach->accel.clock_sel >> 2) & 0x0f, svga->clock_gen);
@@ -2809,21 +2824,29 @@ mach_recalctimings(svga_t *svga)
             dev->dispend >>= 1;
 
         if ((dev->local & 0xff) >= 0x02) {
-            mach_log("HDISP=%d, mask=%02x.\n", dev->h_disp, dev->dac_mask);
+            mach_log("cntl=%d, clksel=%x, hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x, shadow=%x interlace=%d, vgahdisp=%d.\n",
+                     dev->accel.advfunc_cntl & 0x04, mach->accel.clock_sel & 0x01, dev->h_disp, dev->dispend, dev->pitch, dev->rowoffset,
+                     mach->accel.ext_ge_config & 0xcec0, mach->shadow_set & 3, dev->interlace, svga->hdisp);
             if ((mach->accel.ext_ge_config & 0x800) || (!(mach->accel.ext_ge_config & 0x8000) && !(mach->accel.ext_ge_config & 0x800))) {
                 if ((mach->accel.ext_ge_config & 0x30) == 0x20) {
-                    if ((mach->accel.ext_ge_config & 0xc0) == 0x40)
+                    if ((mach->accel.ext_ge_config & 0xc0) == 0x40) {
                         dev->accel_bpp = 16;
-                    else
+                        svga->overscan_color = video_16to32[((mach->overscan_r_col_24 << 16) | (mach->overscan_g_col_24 << 8) | mach->overscan_b_col_24) & 0xffff];
+                    } else {
                         dev->accel_bpp = 15;
+                        svga->overscan_color = video_15to32[((mach->overscan_r_col_24 << 16) | (mach->overscan_g_col_24 << 8) | mach->overscan_b_col_24) & 0xffff];
+                    }
                 } else if ((mach->accel.ext_ge_config & 0x30) == 0x30) {
                     if (mach->accel.ext_ge_config & 0x200)
                         dev->accel_bpp = 32;
                     else
                         dev->accel_bpp = 24;
-                } else if ((mach->accel.ext_ge_config & 0x30) == 0x10)
+
+                    svga->overscan_color = ((mach->overscan_r_col_24 << 16) | (mach->overscan_g_col_24 << 8) | mach->overscan_b_col_24);
+                } else if ((mach->accel.ext_ge_config & 0x30) == 0x10) {
                     dev->accel_bpp = 8;
-                else {
+                    svga->overscan_color = dev->pallook[mach->overscan_col_8];
+                } else {
                     if (dev->vram_512k_8514) {
                         if (dev->h_disp == 640) {
                             dev->ext_pitch = 640;
@@ -2834,12 +2857,14 @@ mach_recalctimings(svga_t *svga)
                         }
                     }
                     dev->accel_bpp = 8;
+                    svga->overscan_color = dev->pallook[mach->overscan_col_8];
                 }
 
-                svga->render8514 = ibm8514_render_blank;
                 mach_log("hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x, bpp=%d, shadow=%x, vgahdisp=%d.\n",
                          dev->h_disp, dev->dispend, dev->pitch, dev->ext_crt_pitch, mach->accel.ext_ge_config & 0xcec0,
                          dev->accel_bpp, mach->shadow_set & 3, svga->hdisp);
+
+                mach->resolution_crt = 0;
                 switch (dev->accel_bpp) {
                     case 8:
                         svga->render8514 = ibm8514_render_8bpp;
@@ -2864,10 +2889,9 @@ mach_recalctimings(svga_t *svga)
                 }
             }
         } else {
-            svga->render8514 = ibm8514_render_blank;
-            mach_log("cntl=%d, hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x, shadow=%x interlace=%d.\n",
-                     dev->accel.advfunc_cntl & 0x04, dev->h_disp, dev->dispend, dev->pitch, dev->rowoffset,
-                     mach->accel.ext_ge_config & 0xcec0, mach->shadow_set & 3, dev->interlace);
+            mach_log("cntl=%d, clksel=%x, hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x, shadow=%x interlace=%d, vgahdisp=%d.\n",
+                     dev->accel.advfunc_cntl & 0x04, mach->accel.clock_sel & 0x01, dev->h_disp, dev->dispend, dev->pitch, dev->rowoffset,
+                     mach->accel.ext_ge_config & 0xcec0, mach->shadow_set & 3, dev->interlace, svga->hdisp);
             if (dev->vram_512k_8514) {
                 if (dev->h_disp == 640) {
                     dev->ext_pitch = 640;
@@ -2878,6 +2902,7 @@ mach_recalctimings(svga_t *svga)
                 }
             }
             dev->accel_bpp = 8;
+            mach->resolution_crt = 0;
             svga->render8514 = ibm8514_render_8bpp;
         }
     } else {
@@ -2934,22 +2959,248 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
     mach_log("[%04X:%08X]: Port FIFO OUT=%04x, val=%04x, len=%d.\n", CS, cpu_state.pc, port, val, len);
 
     switch (port) {
+        case 0x2e8:
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                if (!(mach->shadow_cntl & 0x04))
+                    dev->htotal = val;
+
+                mach_set_resolution(mach, svga);
+            }
+            break;
+
+        case 0xae8:
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                if (!(mach->shadow_cntl & 0x04)) {
+                    WRITE8(port, dev->hsync_start, val);
+                }
+                svga_recalctimings(svga);
+            }
+            break;
+
+        case 0xee8:
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                if (!(mach->shadow_cntl & 0x04)) {
+                    WRITE8(port, dev->hsync_width, val);
+                }
+                svga_recalctimings(svga);
+            }
+            break;
+
+        case 0x1ee8:
+        case 0x1ee9:
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) /*For 8514/A mode, take the shadow sets into account.*/
+                svga_recalctimings(svga);
+            break;
+
+        case 0x6e8:
+            if (len == 2) {
+                mach_log("HDISP and HTOTAL=%04x, len=%d, set=%x, ATI mode bit=%x.\n", val, len, mach->shadow_set & 0x03, mach->accel.clock_sel & 0x01);
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x08)) {
+                        WRITE8(port, dev->hdisped, val);
+                    }
+
+                    if (!(mach->shadow_cntl & 0x04))
+                        dev->htotal = (val >> 8) & 0xff;
+
+                    mach_set_resolution(mach, svga);
+                }
+            } else {
+                mach_log("HDISP and HTOTAL=%02x, len=%d, set=%x, ATI mode bit=%x.\n", val, len, mach->shadow_set & 0x03, mach->accel.clock_sel & 0x01);
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x08)) {
+                        WRITE8(port, dev->hdisped, val);
+                    }
+                    mach_set_resolution(mach, svga);
+                } else if (!(mach->accel.clock_sel & 0x01) && ((mach->shadow_set & 0x03) == 0x00) && dev->on) { /*Still write the parameter even after going to 8514/A mode if needed*/
+                    if (!(mach->shadow_cntl & 0x08)) {
+                        WRITE8(port, dev->hdisped, val);
+                    }
+                    if (mach->resolution_crt == 0x00)
+                        mach->resolution_crt = 0x02;
+
+                    mach_set_resolution(mach, svga);
+                }
+            }
+            mach_log("[%04X:%08X]: ATI 8514/A: (0x%04x): hdisp=0x%02x, shadowcntl=%02x, shadowset=%02x.\n",
+                    CS, cpu_state.pc, port, val, mach->shadow_cntl & 0x08, mach->shadow_set & 0x03);
+            break;
+
+        case 0x6e9:
+            if (len == 1) {
+                mach_log("HDISP and HTOTAL+1=%02x, len=%d, set=%x, ATI mode bit=%x.\n", val, len, mach->shadow_set & 0x03, mach->accel.clock_sel & 0x01);
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x04)) {
+                        dev->htotal = val;
+                    }
+                    mach_set_resolution(mach, svga);
+                }
+            }
+            break;
+
+        case 0x12e8:
+            if (len == 2) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x10)) {
+                        dev->v_total_reg = val;
+                        dev->v_total_reg &= 0x1fff;
+                    }
+                    mach_set_resolution(mach, svga);
+                }
+            } else {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x10)) {
+                        WRITE8(port, dev->v_total_reg, val);
+                        dev->v_total_reg &= 0x1fff;
+                    }
+                    mach_set_resolution(mach, svga);
+                }
+            }
+            mach_log("[%04X:%08X]: ATI 8514/A: (0x%04x): hdisp=0x%02x.\n", CS, cpu_state.pc, port, val);
+            break;
+
+        case 0x12e9:
+            if (len == 1) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                    if (!(mach->shadow_cntl & 0x10)) { /*For 8514/A mode, take the shadow sets into account.*/
+                        WRITE8(port, dev->v_total_reg, val);
+                        dev->v_total_reg &= 0x1fff;
+                    }
+                    mach_set_resolution(mach, svga);
+                }
+                mach_log("[%04X:%08X]: ATI 8514/A: (0x%04x): hdisp=0x%02x.\n", CS, cpu_state.pc, port, val);
+            }
+            break;
+
+        case 0x16e8:
+            if (len == 2) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                    if (!(mach->shadow_cntl & 0x20)) { /*For 8514/A mode, take the shadow sets into account.*/
+                        dev->v_disp = val;
+                        dev->v_disp &= 0x1fff;
+                    }
+                    mach_set_resolution(mach, svga);
+                }
+                mach_log("ATI 8514/A: V_DISP write 16E8=%d, vdisp2=%d.\n", dev->v_disp, dev->v_disp2);
+                mach_log("ATI 8514/A: (0x%04x): vdisp=0x%02x.\n", port, val);
+            } else {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                    if (!(mach->shadow_cntl & 0x20)) { /*For 8514/A mode, take the shadow sets into account.*/
+                        WRITE8(port, dev->v_disp, val);
+                        dev->v_disp &= 0x1fff;
+                    }
+                    mach_set_resolution(mach, svga);
+                }
+            }
+            break;
+        case 0x16e9:
+            if (len == 1) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                    if (!(mach->shadow_cntl & 0x20)) { /*For 8514/A mode, take the shadow sets into account.*/
+                        WRITE8(port, dev->v_disp, val);
+                        dev->v_disp &= 0x1fff;
+                    }
+                    mach_set_resolution(mach, svga);
+                }
+                mach_log("ATI 8514/A: V_DISP write 16E8=%d, vdisp2=%d.\n", dev->v_disp, dev->v_disp2);
+                mach_log("ATI 8514/A: (0x%04x): vdisp=0x%02x.\n", port, val);
+            }
+            break;
+
+        case 0x1ae8:
+            if (len == 2) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                    if (!(mach->shadow_cntl & 0x10)) { /*For 8514/A mode, take the shadow sets into account.*/
+                        dev->v_sync_start = val;
+                        dev->v_sync_start &= 0x1fff;
+                    }
+                    mach_set_resolution(mach, svga);
+                }
+                mach_log("ATI 8514/A: V_SYNCSTART write 1AE8 = %d\n", dev->v_syncstart);
+                mach_log("ATI 8514/A: (0x%04x): vsyncstart=0x%02x.\n", port, val);
+            } else {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                    if (!(mach->shadow_cntl & 0x10)) { /*For 8514/A mode, take the shadow sets into account.*/
+                        WRITE8(port, dev->v_sync_start, val);
+                        dev->v_sync_start &= 0x1fff;
+                    }
+                    mach_set_resolution(mach, svga);
+                }
+            }
+            break;
+        case 0x1ae9:
+            if (len == 1) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                    if (!(mach->shadow_cntl & 0x10)) { /*For 8514/A mode, take the shadow sets into account.*/
+                        WRITE8(port, dev->v_sync_start, val);
+                        dev->v_sync_start &= 0x1fff;
+                    }
+                    mach_set_resolution(mach, svga);
+                }
+                mach_log("ATI 8514/A: V_SYNCSTART write 1AE8 = %d\n", dev->v_syncstart);
+                mach_log("ATI 8514/A: (0x%04x): vsyncstart=0x%02x.\n", port, val);
+            }
+            break;
+
+        case 0x22e8:
+            if ((mach->shadow_cntl & 0x03) == 0x00) {
+                dev->disp_cntl = val;
+                dev->interlace = !!(dev->disp_cntl & 0x10);
+            }
+            mach_log("ATI 8514/A: DISP_CNTL write %04x=%02x, written=%02x, interlace=%d.\n",
+                     port, val & 0x70, dev->disp_cntl & 0x70, dev->interlace);
+            svga_recalctimings(svga);
+            break;
+
+
+        case 0x42e8:
+        case 0x42e9:
+            mach_log("VBLANK stat=%02x, val=%02x.\n", dev->subsys_stat, val);
+            if (len == 2)
+                dev->subsys_cntl = val;
+            else {
+                WRITE8(port, dev->subsys_cntl, val);
+            }
+            dev->subsys_stat &= ~val;
+            if ((dev->subsys_cntl & 0xc000) == 0x8000) {
+                mach->force_busy = 0;
+                dev->force_busy = 0;
+                dev->force_busy2 = 0;
+            }
+            break;
+
+        case 0x46e8:
+        case 0x46e9:
+            mach_log("0x%04x write: VGA subsystem enable add-on=%02x.\n", port, val);
+            break;
+
+        case 0x4ae8:
+            dev->accel.advfunc_cntl = val;
+            dev->on = dev->accel.advfunc_cntl & 0x01;
+            dev->vendor_mode = 0;
+            mach_log("[%04X:%08X]: ATI 8514/A: (0x%04x): ON=%d, shadow crt=%x, hdisp=%d, vdisp=%d.\n",
+                     CS, cpu_state.pc, port, val & 0x01, dev->accel.advfunc_cntl & 0x04, dev->hdisp, dev->vdisp);
+
+            if ((dev->local & 0xff) < 0x02) {
+                dev->ext_crt_pitch = 128;
+                mach_set_resolution(mach, svga);
+            } else {
+                mach_set_resolution(mach, svga);
+                mach32_updatemapping(mach, svga);
+            }
+            mach_log("Vendor IBM mode set %s resolution.\n", (dev->accel.advfunc_cntl & 0x04) ? "2: 1024x768" : "1: 640x480");
+            break;
+
         case 0x82e8:
         case 0x86e8:
         case 0xc2e8:
         case 0xc6e8:
-            dev->ext_fifo_idx++;
-            ibm8514_accel_out_fifo(svga, port, val, len);
-            break;
         case 0xf6ee:
-            dev->ext_fifo_idx++;
-            if (len == 2)
-                dev->accel.cur_y = val & 0x7ff;
+            ibm8514_accel_out_fifo(svga, port, val, len);
             break;
 
         case 0x8ae8:
         case 0xcae8:
-            dev->ext_fifo_idx++;
             ibm8514_accel_out_fifo(svga, port, val, len);
             if (len == 2) {
                 mach_log("SRCY=%d.\n", val & 0x07ff);
@@ -2959,7 +3210,6 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 
         case 0x8ee8:
         case 0xcee8:
-            dev->ext_fifo_idx++;
             ibm8514_accel_out_fifo(svga, port, val, len);
             if (len == 2) {
                 mach_log("SRCX=%d.\n", val & 0x07ff);
@@ -2969,13 +3219,11 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 
         case 0x92e8:
         case 0xd2e8:
-            dev->ext_fifo_idx++;
             ibm8514_accel_out_fifo(svga, port, val, len);
             break;
 
         case 0x96e8:
         case 0xd6e8:
-            dev->ext_fifo_idx++;
             ibm8514_accel_out_fifo(svga, port, val, len);
             if (len == 2)
                 mach->accel.test = val & 0x1fff;
@@ -2983,34 +3231,42 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 
         case 0x9ae8:
         case 0xdae8:
-            dev->ext_fifo_idx++;
             mach->accel.cmd_type = -1;
             ibm8514_accel_out_fifo(svga, port, val, len);
             break;
 
         case 0x9ee8:
         case 0xdee8:
-            dev->ext_fifo_idx++;
             ibm8514_accel_out_fifo(svga, port, val, len);
             break;
 
         case 0xa2e8:
         case 0xe2e8:
-            dev->ext_fifo_idx++;
-            dev->fifo_idx++;
             if (port == 0xe2e8) {
                 if (len == 2) {
                     if (dev->accel.cmd_back) {
-                        dev->accel.bkgd_color = val;
-                        mach_log("CMDBack BKGDCOLOR, sy=%d, height=%d, val=%04x.\n", dev->accel.sy, mach->accel.height, val);
+                        if (mach->accel.cmd_type == 5) {
+                            if (dev->accel.sy >= 0) {
+                                if (mach_pixel_read(mach))
+                                    break;
+
+                                mach_accel_out_pixtrans(svga, mach, dev, val);
+                            } else
+                                dev->accel.bkgd_color = val;
+                        } else
+                            dev->accel.bkgd_color = val;
+
+                        mach_log("%04X: CMDBack BKGDCOLOR, sy=%d, height=%d, val=%04x.\n", port, dev->accel.sy, mach->accel.height, val);
                     } else {
                         if (mach->accel.cmd_type >= 0) {
                             if (mach_pixel_read(mach))
                                 break;
+
                             mach_accel_out_pixtrans(svga, mach, dev, val);
                         } else {
                             if (ibm8514_cpu_dest(svga))
                                 break;
+
                             ibm8514_accel_out_pixtrans(svga, port, val, len);
                         }
                     }
@@ -3018,31 +3274,43 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                     if (mach->accel.cmd_type >= 0) {
                         if (mach_pixel_read(mach))
                             break;
+
                         mach->accel.pix_trans[1] = val;
                     }
                 }
             } else {
                 if (len == 2)
                     dev->accel.bkgd_color = val;
+
+                mach_log("%04X: Background Color=%04x.\n", port, val);
             }
             break;
 
         case 0xa6e8:
         case 0xe6e8:
-            dev->ext_fifo_idx++;
-            dev->fifo_idx++;
             if (port == 0xe6e8) {
                 if (len == 2) {
-                    if (dev->accel.cmd_back)
-                        dev->accel.frgd_color = val;
-                    else {
+                    if (dev->accel.cmd_back) {
+                        if (mach->accel.cmd_type == 5) {
+                            if (dev->accel.sy >= 0) {
+                                if (mach_pixel_read(mach))
+                                    break;
+
+                                mach_accel_out_pixtrans(svga, mach, dev, val);
+                            } else
+                                dev->accel.frgd_color = val;
+                        } else
+                            dev->accel.frgd_color = val;
+                    } else {
                         if (mach->accel.cmd_type >= 0) {
                             if (mach_pixel_read(mach))
                                 break;
+
                             mach_accel_out_pixtrans(svga, mach, dev, val);
                         } else {
                             if (ibm8514_cpu_dest(svga))
                                 break;
+
                             ibm8514_accel_out_pixtrans(svga, port, val, len);
                         }
                     }
@@ -3050,6 +3318,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                     if (mach->accel.cmd_type >= 0) {
                         if (mach_pixel_read(mach))
                             break;
+
                         mach->accel.pix_trans[1] = val;
                     }
                 }
@@ -3061,13 +3330,12 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 
         case 0xe2e9:
         case 0xe6e9:
-            dev->ext_fifo_idx++;
-            dev->fifo_idx++;
             mach_log("Write PORT=%04x, 8514/A=%x, val=%04x, len=%d.\n", port, dev->accel.cmd_back, val, len);
             if (len == 1) {
                 if (mach->accel.cmd_type >= 0) {
                     if (mach_pixel_read(mach))
                         break;
+
                     mach->accel.pix_trans[0] = val;
                     frgd_sel = (mach->accel.dp_config >> 13) & 7;
                     bkgd_sel = (mach->accel.dp_config >> 7) & 3;
@@ -3114,13 +3382,11 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
         case 0xf2e8:
         case 0xf6e8:
         case 0xfae8:
-            dev->ext_fifo_idx++;
             ibm8514_accel_out_fifo(svga, port, val, len);
             break;
 
         case 0xbee8:
         case 0xfee8:
-            dev->ext_fifo_idx++;
             ibm8514_accel_out_fifo(svga, port, val, len);
             if (len == 2) {
                 if ((dev->accel.multifunc_cntl >> 12) == 5) {
@@ -3131,485 +3397,95 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             break;
 
             /*ATI Mach8/32 specific registers*/
-        case 0x82ee:
-            dev->ext_fifo_idx++;
-            mach->accel.patt_data_idx_reg = val & 0x1f;
-            mach->accel.patt_data_idx = mach->accel.patt_data_idx_reg;
-
-            if (mach->accel.patt_data_idx_reg < 0x10)
-                mach->accel.color_pattern_idx = mach->accel.patt_idx;
-            else
-                mach->accel.color_pattern_idx = 0;
-
-            mach_log("Write Port 82ee: Pattern Data Index=%d.\n", val & 0x1f);
-            break;
-
-        case 0x8eee:
-            dev->ext_fifo_idx++;
-            if (len == 2) {
-                if (mach->accel.patt_data_idx_reg < 0x10) {
-                    mach->accel.color_pattern[mach->accel.patt_data_idx] = val & 0xff;
-                    mach->accel.color_pattern[mach->accel.patt_data_idx + 1] = (val >> 8) & 0xff;
-                    mach_log("Write Port 8eee: Color Pattern Word Data[%d]=%04x.\n", mach->accel.patt_data_idx, val);
-                } else {
-                    mach->accel.mono_pattern_normal[mach->accel.patt_data_idx - 0x10] = val & 0xff;
-                    mach->accel.mono_pattern_normal[(mach->accel.patt_data_idx + 1) - 0x10] = (val >> 8) & 0xff;
-                    mach_log("Write Port 8eee: Mono Pattern Word Data[%d]=%04x.\n", mach->accel.patt_data_idx - 0x10, val);
-                }
-                mach->accel.patt_data_idx += 2;
-            }
-            break;
-
-        case 0x96ee:
-            dev->ext_fifo_idx++;
-            if (len == 2) {
-                mach->accel.bres_count = val & 0x7ff;
-                mach_log("BresenhamDraw=%04x.\n", mach->accel.dp_config);
-                dev->data_available = 0;
-                dev->data_available2 = 0;
-                mach->accel.cmd_type = 1;
-                frgd_sel = (mach->accel.dp_config >> 13) & 7;
-                bkgd_sel = (mach->accel.dp_config >> 7) & 3;
-                mono_src = (mach->accel.dp_config >> 5) & 3;
-
-                dev->accel.cmd_back = 1;
-                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
-                    dev->accel.cmd_back = 0;
-
-                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, svga, mach, dev);
-            }
-            break;
-
-        case 0x9aee:
-            dev->ext_fifo_idx++;
-            mach->accel.line_idx = val & 0x07;
-            break;
-
-        case 0xa2ee:
-            dev->ext_fifo_idx++;
-            mach_log("Line OPT=%04x.\n", val);
-            if (len == 2) {
-                mach->accel.linedraw_opt = val;
-                mach->accel.bbottom = dev->accel.clip_bottom;
-                mach->accel.btop = dev->accel.clip_top;
-                mach->accel.bleft = dev->accel.clip_left;
-                mach->accel.bright = dev->accel.clip_right;
-                if (mach->accel.linedraw_opt & 0x100) {
-                    mach->accel.bbottom = 2047;
-                    mach->accel.btop = 0;
-                    mach->accel.bleft = 0;
-                    mach->accel.bright = 2047;
-                }
-            }
-            break;
-
-        case 0xa6ee:
-            dev->ext_fifo_idx++;
-            if (len == 2)
-                mach->accel.dest_x_start = val & 0x7ff;
-            break;
-
-        case 0xaaee:
-            dev->ext_fifo_idx++;
-            if (len == 2)
-                mach->accel.dest_x_end = val & 0x7ff;
-            break;
-
-        case 0xaeee:
-            dev->ext_fifo_idx++;
-            if (len == 2) {
-                mach->accel.dest_y_end = val & 0x7ff;
-                if ((val + 1) == 0x10000) {
-                    mach_log("Dest_Y_end overflow val=%04x, DPCONFIG=%04x\n", val, mach->accel.dp_config);
-                    mach->accel.dest_y_end = 0;
-                }
-                dev->data_available  = 0;
-                dev->data_available2 = 0;
-                mach_log("BitBLT=%04x.\n", mach->accel.dp_config);
-                mach_log(".\n");
-                mach->accel.cmd_type = 2; /*Non-conforming BitBLT from dest_y_end register (0xaeee)*/
-
-                frgd_sel = (mach->accel.dp_config >> 13) & 7;
-                bkgd_sel = (mach->accel.dp_config >> 7) & 3;
-                mono_src = (mach->accel.dp_config >> 5) & 3;
-
-                dev->accel.cmd_back = 1;
-                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
-                    dev->accel.cmd_back = 0;
-
-                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, svga, mach, dev);
-            }
-            break;
-
-        case 0xb2ee:
-            dev->ext_fifo_idx++;
-            if (len == 2)
-                mach->accel.src_x_start = val & 0x7ff;
-            break;
-
-        case 0xb6ee:
-            dev->ext_fifo_idx++;
-            dev->accel.bkgd_mix = val & 0xff;
-            break;
-
-        case 0xbaee:
-            dev->ext_fifo_idx++;
-            dev->accel.frgd_mix = val & 0xff;
-            break;
-
-        case 0xbeee:
-            dev->ext_fifo_idx++;
-            if (len == 2)
-                mach->accel.src_x_end = val & 0x7ff;
-            break;
-
-        case 0xc2ee:
-            dev->ext_fifo_idx++;
-            mach->accel.src_y_dir = val & 1;
-            break;
-
-        case 0xc6ee:
-            dev->ext_fifo_idx++;
-            if (len == 2) {
-                mach->accel.cmd_type = 0;
-                mach_log("TODO: Short Stroke.\n");
-                frgd_sel = (mach->accel.dp_config >> 13) & 7;
-                bkgd_sel = (mach->accel.dp_config >> 7) & 3;
-                mono_src = (mach->accel.dp_config >> 5) & 3;
-
-                dev->accel.cmd_back = 1;
-                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
-                    dev->accel.cmd_back = 0;
-            }
-            break;
-
-        case 0xcaee:
-            dev->ext_fifo_idx++;
-            if (len == 2) {
-                mach->accel.scan_to_x = (val & 0x7ff);
-                if ((val + 1) == 0x10000) {
-                    mach_log("Scan_to_X overflow val = %04x\n", val);
-                    mach->accel.scan_to_x = 0;
-                }
-                dev->data_available  = 0;
-                dev->data_available2 = 0;
-                mach->accel.cmd_type = 5; /*Horizontal Raster Draw from scan_to_x register (0xcaee)*/
-                mach_log("ScanToX=%04x.\n", mach->accel.dp_config);
-                mach_log(".\n");
-
-                frgd_sel = (mach->accel.dp_config >> 13) & 7;
-                bkgd_sel = (mach->accel.dp_config >> 7) & 3;
-                mono_src = (mach->accel.dp_config >> 5) & 3;
-
-                dev->accel.cmd_back = 1;
-                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
-                    dev->accel.cmd_back = 0;
-
-                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, svga, mach, dev);
-            }
-            break;
-
-        case 0xceee:
-            dev->ext_fifo_idx++;
-            mach_log("CEEE write val = %04x.\n", val);
-            if (len == 2) {
-                dev->data_available  = 0;
-                dev->data_available2 = 0;
-                mach->accel.dp_config = val;
-            }
-            break;
-
-        case 0xd2ee:
-            dev->ext_fifo_idx++;
-            mach->accel.patt_len = val & 0x1f;
-            mach_log("Write Port d2ee: Pattern Length=%d, val=%04x.\n", val & 0x1f, val);
-            mach->accel.mono_pattern_enable = !!(val & 0x80);
-            if (len == 2) {
-                mach->accel.block_write_mono_pattern_enable = !!(val & 0x8000);
-                mach->accel.patt_len_reg = val;
-            }
-            break;
-
-        case 0xd6ee:
-            dev->ext_fifo_idx++;
-            mach->accel.patt_idx = val & 0x1f;
-            mach_log("Write Port d6ee: Pattern Index=%d.\n", val & 0x1f);
-            break;
-
-        case 0xdaee:
-            dev->ext_fifo_idx++;
-            if (len == 2) {
-                dev->accel.multifunc[2] = val & 0x7ff;
-                dev->accel.clip_left = dev->accel.multifunc[2];
-                if (val & 0x800)
-                    dev->accel.clip_left |= ~0x7ff;
-            }
-            mach_log("DAEE (extclipl) write val=%d, left=%d.\n", val, dev->accel.clip_left);
-            break;
-
-        case 0xdeee:
-            dev->ext_fifo_idx++;
-            if (len == 2) {
-                dev->accel.multifunc[1] = val & 0x7ff;
-                dev->accel.clip_top = dev->accel.multifunc[1];
-                if (val & 0x800) {
-                    dev->accel.clip_top |= ~0x7ff;
-                }
-            }
-            mach_log("DEEE (extclipt) write val = %d\n", val);
-            break;
-
-        case 0xe2ee:
-            dev->ext_fifo_idx++;
-            if (len == 2) {
-                dev->accel.multifunc[4] = val & 0x7ff;
-                dev->accel.clip_right = dev->accel.multifunc[4];
-                if (val & 0x800)
-                    dev->accel.clip_right |= ~0x7ff;
-            }
-            mach_log("E2EE (extclipr) write val = %d\n", val);
-            break;
-
-        case 0xe6ee:
-            dev->ext_fifo_idx++;
-            if (len == 2) {
-                dev->accel.multifunc[3] = val & 0x7ff;
-                dev->accel.clip_bottom = dev->accel.multifunc[3];
-                if (val & 0x800)
-                    dev->accel.clip_bottom |= ~0x7ff;
-            }
-            mach_log("E6EE (extclipb) write val = %d\n", val);
-            break;
-
-        case 0xeeee:
-            dev->ext_fifo_idx++;
-            if (len == 2)
-                mach->accel.dest_cmp_fn = val;
-            break;
-
-        case 0xf2ee:
-            dev->ext_fifo_idx++;
-            mach_log("F2EE.\n");
-            if (len == 2)
-                mach->accel.dst_clr_cmp_mask = val;
-            break;
-
-        case 0xfeee:
-            dev->ext_fifo_idx++;
-            mach_log("LineDraw=%04x.\n", mach->accel.dp_config);
-            if (len == 2) {
-                mach->accel.line_array[mach->accel.line_idx] = val;
-                dev->accel.cur_x                             = mach->accel.line_array[(mach->accel.line_idx == 4) ? 4 : 0];
-                dev->accel.cur_y                             = mach->accel.line_array[(mach->accel.line_idx == 5) ? 5 : 1];
-                mach->accel.cx_end_line                      = mach->accel.line_array[2];
-                mach->accel.cy_end_line                      = mach->accel.line_array[3];
-                if ((mach->accel.line_idx == 3) || (mach->accel.line_idx == 5)) {
-                    mach->accel.cmd_type = (mach->accel.line_idx == 5) ? 4 : 3;
-                    frgd_sel = (mach->accel.dp_config >> 13) & 7;
-                    bkgd_sel = (mach->accel.dp_config >> 7) & 3;
-                    mono_src = (mach->accel.dp_config >> 5) & 3;
-
-                    dev->accel.cmd_back = 1;
-                    if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
-                        dev->accel.cmd_back = 0;
-
-                    mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, svga, mach, dev);
-                    mach->accel.line_idx = (mach->accel.line_idx == 5) ? 4 : 2;
-                    break;
-                }
-                mach->accel.line_idx++;
-            }
-            break;
-
-        default:
-            break;
-    }
-}
-
-static void
-mach_accel_out_call(uint16_t port, uint8_t val, mach_t *mach, svga_t *svga, ibm8514_t *dev)
-{
-    if (port == 0x42e8 || port == 0x42e9)
-        mach_log("[%04X:%08X]: Port CALL OUT=%04x, val=%02x.\n", CS, cpu_state.pc, port, val);
-
-    switch (port) {
-        case 0x2e8:
-        case 0x6e9:
-        case 0xae8:
-        case 0xee8:
-        case 0x1ee8:
-        case 0x1ee9:
-        case 0x42e8:
-            ibm8514_accel_out(port, val, svga, 2);
-            break;
-        case 0x42e9:
-            ibm8514_accel_out(port, val, svga, 2);
-            if ((val & 0xc0) == 0x80) {
-                dev->ext_fifo_idx = 0;
-                mach->force_busy = 0;
-            }
-            break;
-
-        case 0x6e8:
-            /*In preparation to switch from VGA to 8514/A mode*/
-            if (!(mach->shadow_cntl & 0x08)) {
-                if ((mach->shadow_set & 0x03) || (mach->accel.clock_sel & 0x01)) {
-                    dev->hdisped = val;
-                    dev->hdisp = (val + 1) << 3;
-                } else if (((mach->shadow_set & 0x03) == 0x00) && !(mach->accel.clock_sel & 0x01))
-                    dev->hdisp2 = (val + 1) << 3;
-            }
-            mach_log("[%04X:%08X]: ATI 8514/A: (0x%04x): hdisp=0x%02x, shadowcntl=%02x, shadowset=%02x.\n",
-                     CS, cpu_state.pc, port, val, mach->shadow_cntl & 0x08, mach->shadow_set & 0x03);
-            svga_recalctimings(svga);
-            break;
-
-        case 0x12e8:
-        case 0x12e9:
-            /*In preparation to switch from VGA to 8514/A mode*/
-            if (!(mach->shadow_cntl & 0x10)) {
-                if ((mach->shadow_set & 0x03) || (mach->accel.clock_sel & 0x01) ||
-                    (((mach->shadow_set & 0x03) == 0x00) && !(mach->accel.clock_sel & 0x01))) {
-                    WRITE8(port, dev->v_total_reg, val);
-                    dev->v_total_reg &= 0x1fff;
-                    dev->v_total = dev->v_total_reg + 1;
-                    if (dev->interlace)
-                        dev->v_total >>= 1;
-                }
-            }
-            mach_log("[%04X:%08X]: ATI 8514/A: (0x%04x): hdisp=0x%02x.\n", CS, cpu_state.pc, port, val);
-            svga_recalctimings(svga);
-            break;
-
-        case 0x16e8:
-        case 0x16e9:
-            /*In preparation to switch from VGA to 8514/A mode*/
-            if (!(mach->shadow_cntl & 0x20)) {
-                if ((mach->shadow_set & 0x03) || (mach->accel.clock_sel & 0x01)) {
-                    WRITE8(port, dev->v_disp, val);
-                    dev->v_disp &= 0x1fff;
-                    dev->vdisp = (dev->v_disp + 1) >> 1;
-                    if ((dev->vdisp == 478) || (dev->vdisp == 598) || (dev->vdisp == 766) || (dev->vdisp == 1022))
-                        dev->vdisp += 2;
-                } else if (((mach->shadow_set & 0x03) == 0x00) && !(mach->accel.clock_sel & 0x01)) {
-                    WRITE8(port, dev->v_disp2, val);
-                    dev->v_disp2 &= 0x1fff;
-                    dev->vdisp2 = (dev->v_disp2 + 1) >> 1;
-                    if ((dev->vdisp2 == 478) || (dev->vdisp2 == 598) || (dev->vdisp2 == 766) || (dev->vdisp2 == 1022))
-                        dev->vdisp2 += 2;
-                }
-            }
-            mach_log("ATI 8514/A: V_DISP write 16E8=%d, vdisp2=%d.\n", dev->v_disp, dev->v_disp2);
-            mach_log("ATI 8514/A: (0x%04x): vdisp=0x%02x.\n", port, val);
-            svga_recalctimings(svga);
-            break;
-
-        case 0x1ae8:
-        case 0x1ae9:
-            /*In preparation to switch from VGA to 8514/A mode*/
-            if (!(mach->shadow_cntl & 0x10)) {
-                if ((mach->shadow_set & 0x03) || (mach->accel.clock_sel & 0x01) ||
-                    (((mach->shadow_set & 0x03) == 0x00) && !(mach->accel.clock_sel & 0x01))) {
-                    WRITE8(port, dev->v_sync_start, val);
-                    dev->v_sync_start &= 0x1fff;
-                    dev->v_syncstart = dev->v_sync_start + 1;
-                    if (dev->interlace)
-                        dev->v_syncstart >>= 1;
-                }
-            }
-            mach_log("ATI 8514/A: V_SYNCSTART write 1AE8 = %d\n", dev->v_syncstart);
-            mach_log("ATI 8514/A: (0x%04x): vsyncstart=0x%02x.\n", port, val);
-            svga_recalctimings(svga);
-            break;
-
-        case 0x22e8:
-            if (!(mach->shadow_cntl & 0x03)) {
-                if ((mach->shadow_set & 0x03) || (mach->accel.clock_sel & 0x01) ||
-                    (((mach->shadow_set & 0x03) == 0x00) && !(mach->accel.clock_sel & 0x01))) {
-                    dev->disp_cntl = val;
-                    dev->interlace = !!(dev->disp_cntl & 0x10);
-                }
-            }
-            mach_log("ATI 8514/A: DISP_CNTL write %04x=%02x, written=%02x, interlace=%d.\n",
-                     port, val & 0x70, dev->disp_cntl & 0x70, dev->interlace);
-            svga_recalctimings(svga);
-            break;
-
-        case 0x46e8:
-        case 0x46e9:
-            mach_log("0x%04x write: VGA subsystem enable add-on=%02x.\n", port, val);
-            break;
-
-        case 0x4ae8:
-            dev->accel.advfunc_cntl = val;
-            dev->on = dev->accel.advfunc_cntl & 0x01;
-            dev->vendor_mode = 0;
-            mach_log("[%04X:%08X]: ATI 8514/A: (0x%04x): ON=%d, shadow crt=%x, hdisp=%d, vdisp=%d.\n",
-                     CS, cpu_state.pc, port, val & 0x01, dev->accel.advfunc_cntl & 0x04, dev->hdisp, dev->vdisp);
-
-            if ((dev->local & 0xff) < 0x02) {
-                dev->ext_crt_pitch = 128;
-                svga_recalctimings(svga);
-            } else {
-                svga_recalctimings(svga);
-                mach32_updatemapping(mach, svga);
-            }
-            mach_log("Vendor IBM mode set %s resolution.\n", (dev->accel.advfunc_cntl & 0x04) ? "2: 1024x768" : "1: 640x480");
-            break;
-
-        /*ATI Mach8/32 specific registers*/
         case 0x2ee:
-            mach_log("2EE write val = %02x.\n", val);
-            break;
         case 0x2ef:
-            mach_log("2EF write val = %02x.\n", val);
+            if (len == 2) {
+                mach->overscan_col_8 = val & 0xff;
+                mach->overscan_b_col_24 = (val >> 8) & 0xff;
+            } else {
+                if (port & 1)
+                    mach->overscan_b_col_24 = val;
+                else
+                    mach->overscan_col_8 = val;
+            }
+            svga_recalctimings(svga);
             break;
-
         case 0x6ee:
-            mach_log("6EE write val = %02x.\n", val);
-            break;
         case 0x6ef:
-            mach_log("6EF write val = %02x.\n", val);
+            if (len == 2) {
+                mach->overscan_g_col_24 = val & 0xff;
+                mach->overscan_r_col_24 = (val >> 8) & 0xff;
+            } else {
+                if (port & 1)
+                    mach->overscan_r_col_24 = val;
+                else
+                    mach->overscan_g_col_24 = val;
+            }
+            svga_recalctimings(svga);
             break;
 
         case 0xaee:
         case 0xaef:
-            WRITE8(port, mach->cursor_offset_lo_reg, val);
+            if (len == 2)
+                mach->cursor_offset_lo_reg = val;
+            else {
+                WRITE8(port, mach->cursor_offset_lo_reg, val);
+            }
             mach->cursor_offset_lo = mach->cursor_offset_lo_reg;
             dev->hwcursor.addr = ((mach->cursor_offset_lo | (mach->cursor_offset_hi << 16)) << 2);
             break;
 
         case 0xeee:
         case 0xeef:
-            WRITE8(port, mach->cursor_offset_hi_reg, val);
+            if (len == 2)
+                mach->cursor_offset_hi_reg = val;
+            else {
+                WRITE8(port, mach->cursor_offset_hi_reg, val);
+            }
+            dev->hwcursor.ena = !!(mach->cursor_offset_hi_reg & 0x8000);
             mach->cursor_offset_hi = mach->cursor_offset_hi_reg & 0x0f;
             dev->hwcursor.addr = ((mach->cursor_offset_lo | (mach->cursor_offset_hi << 16)) << 2);
-            dev->hwcursor.ena = !!(mach->cursor_offset_hi_reg & 0x8000);
             mach_log("HWCursorEnabled=%x.\n", dev->hwcursor.ena);
             break;
 
         case 0x12ee:
         case 0x12ef:
-            WRITE8(port, mach->cursor_x, val);
+            if (len == 2)
+                mach->cursor_x = val;
+            else {
+                WRITE8(port, mach->cursor_x, val);
+            }
             dev->hwcursor.x = mach->cursor_x & 0x7ff;
             break;
 
         case 0x16ee:
         case 0x16ef:
-            WRITE8(port, mach->cursor_y, val);
+            if (len == 2)
+                mach->cursor_y = val;
+            else {
+                WRITE8(port, mach->cursor_y, val);
+            }
             dev->hwcursor.y = mach->cursor_y & 0xfff;
             break;
 
         case 0x1aee:
         case 0x1aef:
-            WRITE8(port, mach->cursor_col_b, val);
+            if (len == 2)
+                mach->cursor_col_b = val;
+            else {
+                WRITE8(port, mach->cursor_col_b, val);
+            }
             mach->cursor_col_0 = mach->cursor_col_b & 0xff;
             mach->cursor_col_1 = (mach->cursor_col_b >> 8) & 0xff;
             break;
 
         case 0x1eee:
         case 0x1eef:
-            WRITE8(port, mach->cursor_vh_offset, val);
+            if (len == 2)
+                mach->cursor_vh_offset = val;
+            else {
+                WRITE8(port, mach->cursor_vh_offset, val);
+            }
             dev->hwcursor.xoff = mach->cursor_vh_offset & 0x3f;
             dev->hwcursor.yoff = (mach->cursor_vh_offset >> 8) & 0x3f;
             break;
@@ -3624,7 +3500,11 @@ mach_accel_out_call(uint16_t port, uint8_t val, mach_t *mach, svga_t *svga, ibm8
 
         case 0x26ee:
         case 0x26ef:
-            WRITE8(port, mach->accel.crt_pitch, val);
+            if (len == 2)
+                mach->accel.crt_pitch = val;
+            else {
+                WRITE8(port, mach->accel.crt_pitch, val);
+            }
             dev->ext_crt_pitch = mach->accel.crt_pitch & 0xff;
             if (dev->accel_bpp > 8) {
                 if (dev->accel_bpp == 24)
@@ -3642,54 +3522,98 @@ mach_accel_out_call(uint16_t port, uint8_t val, mach_t *mach, svga_t *svga, ibm8
             if ((dev->local & 0xff) >= 0x01)
                 mach32_updatemapping(mach, svga);
 
-            mach_log("ATI 8514/A: (0x%04x) val=0x%02x, extended 8514/A mode=%02x.\n", port, val, mach->regs[0xb0] & 0x20);
+            mach_log("ATI 8514/A: (0x%04x) CRT Pitch, val=0x%02x, crtpitch=%x, len=%d, extended 8514/A mode=%02x.\n", port, val, dev->ext_crt_pitch, len, mach->regs[0xb0] & 0x20);
+            break;
+
+        case 0x2aee:
+        case 0x2aef:
+            if (len == 2) {
+                mach->accel.crt_offset_lo = val;
+            } else {
+                WRITE8(port, mach->accel.crt_offset_lo, val);
+            }
+            svga_recalctimings(svga);
+            break;
+
+        case 0x2eee:
+        case 0x2eef:
+            mach->accel.crt_offset_hi = val & 0x0f;
+            svga_recalctimings(svga);
             break;
 
         case 0x32ee:
         case 0x32ef:
-            WRITE8(port, mach->local_cntl, val);
+            if (len == 2)
+                mach->local_cntl = val;
+            else {
+                WRITE8(port, mach->local_cntl, val);
+            }
             if ((dev->local & 0xff) >= 0x01)
                 mach32_updatemapping(mach, svga);
             break;
 
         case 0x36ee:
         case 0x36ef:
-            mach_log("ATI 8514/A: (0x%04x) val = %04x.\n", port, val);
-            if ((dev->local & 0xff) >= 0x02) {
-                WRITE8(port, mach->misc, val);
-                mach->misc &= 0xfff0;
+            if (len == 2) {
+                if ((dev->local & 0xff) >= 0x02)
+                    mach->misc = val;
+            } else {
+                if ((dev->local & 0xff) >= 0x02)
+                    WRITE8(port, mach->misc, val);
             }
+            mach->misc &= 0xfff0;
             break;
 
         case 0x3aee:
         case 0x3aef:
-            WRITE8(port, mach->cursor_col_0_rg, val);
+            if (len == 2)
+                mach->cursor_col_0_rg = val;
+            else {
+                WRITE8(port, mach->cursor_col_0_rg, val);
+            }
             mach->ext_cur_col_0_g = mach->cursor_col_0_rg & 0xff;
             mach->ext_cur_col_0_r = (mach->cursor_col_0_rg >> 8) & 0xff;
             break;
 
         case 0x3eee:
         case 0x3eef:
-            WRITE8(port, mach->cursor_col_1_rg, val);
+            if (len == 2)
+                mach->cursor_col_1_rg = val;
+            else {
+                WRITE8(port, mach->cursor_col_1_rg, val);
+            }
             mach->ext_cur_col_1_g = mach->cursor_col_1_rg & 0xff;
             mach->ext_cur_col_1_r = (mach->cursor_col_1_rg >> 8) & 0xff;
             break;
 
         case 0x42ee:
         case 0x42ef:
-            mach_log("ATI 8514/A: (0x%04x) val=%04x.\n", port, val);
-            WRITE8(port, mach->accel.test2, val);
+            if (len == 2)
+                mach->accel.test2 = val;
+            else {
+                WRITE8(port, mach->accel.test2, val);
+            }
+            mach_log("ATI 8514/A: (0x%04x) MEM_BNDRY val=%04x, memory part=%06x, gdcreg6=%02x.\n", port, val, (mach->accel.test2 & 0x0f) << 18, svga->gdcreg[6] & 0x0c);
+            mach32_updatemapping(mach, svga);
             break;
 
         case 0x46ee:
         case 0x46ef:
-            WRITE8(port, mach->shadow_cntl, val);
+            if (len == 2)
+                mach->shadow_cntl = val;
+            else {
+                WRITE8(port, mach->shadow_cntl, val);
+            }
             mach_log("ATI 8514/A: (0x%04x) val=%02x.\n", port, val);
             break;
 
         case 0x4aee:
         case 0x4aef:
-            WRITE8(port, mach->accel.clock_sel, val);
+            if (len == 2)
+                mach->accel.clock_sel = val;
+            else {
+                WRITE8(port, mach->accel.clock_sel, val);
+            }
             dev->on = mach->accel.clock_sel & 0x01;
             dev->vendor_mode = 1;
             mach_log("ATI 8514/A: (0x%04x): ON=%d, val=%04x, hdisp=%d, vdisp=%d.\n",
@@ -3703,31 +3627,50 @@ mach_accel_out_call(uint16_t port, uint8_t val, mach_t *mach, svga_t *svga, ibm8
 
         case 0x52ee:
         case 0x52ef:
-            mach_log("ATI 8514/A: (0x%04x) val=%04x.\n", port, val);
-            WRITE8(port, mach->accel.scratch0, val);
+            mach_log("ATI 8514/A: (0x%04x) ScratchPad0 val=%04x.\n", port, val);
+            if (len == 2)
+                mach->accel.scratch0 = val;
+            else {
+                WRITE8(port, mach->accel.scratch0, val);
+            }
             break;
 
         case 0x56ee:
         case 0x56ef:
-            mach_log("ATI 8514/A: (0x%04x) val=%04x.\n", port, val);
-            WRITE8(port, mach->accel.scratch1, val);
+            mach_log("ATI 8514/A: (0x%04x) ScratchPad1 val=%04x.\n", port, val);
+            if (len == 2)
+                mach->accel.scratch1 = val;
+            else {
+                WRITE8(port, mach->accel.scratch1, val);
+            }
             break;
 
         case 0x5aee:
         case 0x5aef:
-            WRITE8(port, mach->shadow_set, val);
+            if (len == 2)
+                mach->shadow_set = val;
+            else {
+                WRITE8(port, mach->shadow_set, val);
+            }
             mach_log("ATI 8514/A: (0x%04x) val=0x%02x.\n", port, val);
             if ((mach->shadow_set & 0x03) == 0x00)
                 mach_log("Primary CRT register set.\n");
-            else if ((mach->shadow_set & 0x03) == 0x01)
+            else if ((mach->shadow_set & 0x03) == 0x01) {
                 mach_log("CRT Shadow Set 1: 640x480.\n");
-            else if ((mach->shadow_set & 0x03) == 0x02)
+                mach->resolution_crt = 0x01;
+            } else if ((mach->shadow_set & 0x03) == 0x02) {
                 mach_log("CRT Shadow Set 2: 1024x768.\n");
+                mach->resolution_crt = 0x02;
+            }
             break;
 
         case 0x5eee:
         case 0x5eef:
-            WRITE8(port, mach->memory_aperture, val);
+            if (len == 2)
+                mach->memory_aperture = val;
+            else {
+                WRITE8(port, mach->memory_aperture, val);
+            }
             mach_log("Memory Aperture = %04x.\n", mach->memory_aperture);
             if (!mach->pci_bus)
                 mach->linear_base = (mach->memory_aperture & 0xff00) << 12;
@@ -3736,36 +3679,44 @@ mach_accel_out_call(uint16_t port, uint8_t val, mach_t *mach, svga_t *svga, ibm8
                 mach32_updatemapping(mach, svga);
             break;
 
-        case 0x62ee:
-            mach_log("62EE write val = %04x, len = %d.\n", val, len);
-            break;
-
-        case 0x66ee:
-            mach_log("66EE write val = %04x, len = %d.\n", val, len);
-            break;
-
         case 0x6aee:
         case 0x6aef:
-            WRITE8(port, mach->accel.max_waitstates, val);
+            if (len == 2)
+                mach->accel.max_waitstates = val;
+            else {
+                WRITE8(port, mach->accel.max_waitstates, val);
+            }
             break;
 
         case 0x6eee:
         case 0x6eef:
-            WRITE8(port, mach->accel.ge_offset_lo, val);
+            if (len == 2)
+                mach->accel.ge_offset_lo = val;
+            else {
+                WRITE8(port, mach->accel.ge_offset_lo, val);
+            }
             svga_recalctimings(svga);
             mach_log("ATI 8514/A: (0x%04x) val=0x%02x, geoffset=%04x.\n", port, val, dev->accel.ge_offset);
             break;
 
         case 0x72ee:
         case 0x72ef:
-            WRITE8(port, mach->accel.ge_offset_hi, val);
+            if (len == 2)
+                mach->accel.ge_offset_hi = val;
+            else {
+                WRITE8(port, mach->accel.ge_offset_hi, val);
+            }
             svga_recalctimings(svga);
             mach_log("ATI 8514/A: (0x%04x) val=0x%02x, geoffset=%04x.\n", port, val, dev->accel.ge_offset);
             break;
 
         case 0x76ee:
         case 0x76ef:
-            WRITE8(port, mach->accel.ge_pitch, val);
+            if (len == 2)
+                mach->accel.ge_pitch = val;
+            else {
+                WRITE8(port, mach->accel.ge_pitch, val);
+            }
             dev->ext_pitch = ((mach->accel.ge_pitch & 0xff) << 3);
             mach_log("ATI 8514/A: (0x%04x) val=0x%02x, extpitch=%d.\n", port, val, dev->ext_pitch);
             svga_recalctimings(svga);
@@ -3773,7 +3724,11 @@ mach_accel_out_call(uint16_t port, uint8_t val, mach_t *mach, svga_t *svga, ibm8
 
         case 0x7aee:
         case 0x7aef:
-            WRITE8(port, mach->accel.ext_ge_config, val);
+            if (len == 2)
+                mach->accel.ext_ge_config = val;
+            else {
+                WRITE8(port, mach->accel.ext_ge_config, val);
+            }
             if ((dev->local & 0xff) >= 0x02) {
                 if (mach->accel.crt_pitch & 0xff)
                     dev->ext_crt_pitch = mach->accel.crt_pitch & 0xff;
@@ -3802,24 +3757,295 @@ mach_accel_out_call(uint16_t port, uint8_t val, mach_t *mach, svga_t *svga, ibm8
                 mach_log("ATI 8514/A: (0x%04x) val=%02x.\n", port, val);
                 svga_recalctimings(svga);
             } else
-                ati_eeprom_write(&mach->eeprom, !!(mach->accel.ext_ge_config & 0x4000), !!(mach->accel.ext_ge_config & 0x2000), !!(mach->accel.ext_ge_config & 0x1000));
+                ati_eeprom_write(&mach->eeprom, !!(mach->accel.ext_ge_config & 0x04), !!(mach->accel.ext_ge_config & 0x02), !!(mach->accel.ext_ge_config & 0x01));
+            break;
+
+        case 0x7eee:
+        case 0x7eef:
+            if (len == 2)
+                mach->accel.eeprom_control = val;
+            else {
+                WRITE8(port, mach->accel.eeprom_control, val);
+            }
+            mach_log("%04X write val=%04x, actual=%04x, len=%d.\n", port, mach->accel.eeprom_control, val, len);
+            break;
+
+        case 0x82ee:
+            mach->accel.patt_data_idx_reg = val & 0x1f;
+            mach->accel.patt_data_idx = mach->accel.patt_data_idx_reg;
+
+            if (mach->accel.patt_data_idx_reg < 0x10)
+                mach->accel.color_pattern_idx = mach->accel.patt_idx;
+            else
+                mach->accel.color_pattern_idx = 0;
+
+            mach_log("Write Port 82ee: Pattern Data Index=%d.\n", val & 0x1f);
+            break;
+
+        case 0x8eee:
+            if (len == 2) {
+                if (mach->accel.patt_data_idx_reg < 0x10) {
+                    mach->accel.color_pattern[mach->accel.patt_data_idx] = val & 0xff;
+                    mach->accel.color_pattern[mach->accel.patt_data_idx + 1] = (val >> 8) & 0xff;
+                    mach_log("Write Port 8eee: Color Pattern Word Data[%d]=%04x.\n", mach->accel.patt_data_idx, val);
+                } else {
+                    mach->accel.mono_pattern_normal[mach->accel.patt_data_idx - 0x10] = val & 0xff;
+                    mach->accel.mono_pattern_normal[(mach->accel.patt_data_idx + 1) - 0x10] = (val >> 8) & 0xff;
+                    mach_log("Write Port 8eee: Mono Pattern Word Data[%d]=%04x.\n", mach->accel.patt_data_idx - 0x10, val);
+                }
+                mach->accel.patt_data_idx += 2;
+            }
+            break;
+
+        case 0x92ee:
+            mach_log("Write port 92ee, malatch=%08x.\n", svga->ma_latch);
+            break;
+
+        case 0x96ee:
+            if (len == 2) {
+                mach->accel.bres_count = val & 0x7ff;
+                mach_log("BresenhamDraw=%04x.\n", mach->accel.dp_config);
+                dev->data_available = 0;
+                dev->data_available2 = 0;
+                mach->accel.cmd_type = 1;
+                frgd_sel = (mach->accel.dp_config >> 13) & 7;
+                bkgd_sel = (mach->accel.dp_config >> 7) & 3;
+                mono_src = (mach->accel.dp_config >> 5) & 3;
+
+                dev->accel.cmd_back = 1;
+                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
+                    dev->accel.cmd_back = 0;
+
+                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, svga, mach, dev);
+            }
+            break;
+
+        case 0x9aee:
+            mach->accel.line_idx = val & 0x07;
+            break;
+
+        case 0xa2ee:
+            mach_log("Line OPT=%04x.\n", val);
+            if (len == 2) {
+                mach->accel.linedraw_opt = val;
+                mach->accel.bbottom = dev->accel.clip_bottom;
+                mach->accel.btop = dev->accel.clip_top;
+                mach->accel.bleft = dev->accel.clip_left;
+                mach->accel.bright = dev->accel.clip_right;
+                if (mach->accel.linedraw_opt & 0x100) {
+                    mach->accel.bbottom = 2047;
+                    mach->accel.btop = 0;
+                    mach->accel.bleft = 0;
+                    mach->accel.bright = 2047;
+                }
+            }
+            break;
+
+        case 0xa6ee:
+            if (len == 2)
+                mach->accel.dest_x_start = val & 0x7ff;
+            break;
+
+        case 0xaaee:
+            if (len == 2)
+                mach->accel.dest_x_end = val & 0x7ff;
+            break;
+
+        case 0xaeee:
+            if (len == 2) {
+                mach->accel.dest_y_end = val & 0x7ff;
+                if ((val + 1) == 0x10000) {
+                    mach_log("Dest_Y_end overflow val=%04x, DPCONFIG=%04x\n", val, mach->accel.dp_config);
+                    mach->accel.dest_y_end = 0;
+                }
+                dev->data_available  = 0;
+                dev->data_available2 = 0;
+                mach_log("BitBLT=%04x.\n", mach->accel.dp_config);
+                mach_log(".\n");
+                mach->accel.cmd_type = 2; /*Non-conforming BitBLT from dest_y_end register (0xaeee)*/
+
+                frgd_sel = (mach->accel.dp_config >> 13) & 7;
+                bkgd_sel = (mach->accel.dp_config >> 7) & 3;
+                mono_src = (mach->accel.dp_config >> 5) & 3;
+
+                dev->accel.cmd_back = 1;
+                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
+                    dev->accel.cmd_back = 0;
+
+                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, svga, mach, dev);
+            }
+            break;
+
+        case 0xb2ee:
+            if (len == 2)
+                mach->accel.src_x_start = val & 0x7ff;
+            break;
+
+        case 0xb6ee:
+            dev->accel.bkgd_mix = val & 0xff;
+            break;
+
+        case 0xbaee:
+            dev->accel.frgd_mix = val & 0xff;
+            break;
+
+        case 0xbeee:
+            if (len == 2)
+                mach->accel.src_x_end = val & 0x7ff;
+            break;
+
+        case 0xc2ee:
+            mach->accel.src_y_dir = val & 1;
+            break;
+
+        case 0xc6ee:
+            if (len == 2) {
+                mach->accel.cmd_type = 0;
+                mach_log("TODO: Short Stroke.\n");
+                frgd_sel = (mach->accel.dp_config >> 13) & 7;
+                bkgd_sel = (mach->accel.dp_config >> 7) & 3;
+                mono_src = (mach->accel.dp_config >> 5) & 3;
+
+                dev->accel.cmd_back = 1;
+                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
+                    dev->accel.cmd_back = 0;
+            }
+            break;
+
+        case 0xcaee:
+            if (len == 2) {
+                mach->accel.scan_to_x = (val & 0x7ff);
+                if ((val + 1) == 0x10000) {
+                    mach_log("Scan_to_X overflow val = %04x\n", val);
+                    mach->accel.scan_to_x = 0;
+                }
+                dev->data_available  = 0;
+                dev->data_available2 = 0;
+                mach->accel.cmd_type = 5; /*Horizontal Raster Draw from scan_to_x register (0xcaee)*/
+                mach_log(".\n");
+
+                frgd_sel = (mach->accel.dp_config >> 13) & 7;
+                bkgd_sel = (mach->accel.dp_config >> 7) & 3;
+                mono_src = (mach->accel.dp_config >> 5) & 3;
+
+                dev->accel.cmd_back = 1;
+                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
+                    dev->accel.cmd_back = 0;
+
+                mach_log("ScanToX=%04x, mono_src=%d, bkgd_sel=%d, frgd_sel=%d, pixread=%x.\n", mach->accel.dp_config, mono_src, bkgd_sel, frgd_sel, mach_pixel_read(mach));
+                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, svga, mach, dev);
+            }
+            break;
+
+        case 0xceee:
+            mach_log("Data Path Configuration (%04x) write val=%04x.\n", port, val);
+            if (len == 2) {
+                dev->data_available  = 0;
+                dev->data_available2 = 0;
+                mach->accel.dp_config = val;
+            }
+            break;
+
+        case 0xd2ee:
+            mach->accel.patt_len = val & 0x1f;
+            mach_log("Write Port d2ee: Pattern Length=%d, val=%04x.\n", val & 0x1f, val);
+            mach->accel.mono_pattern_enable = !!(val & 0x80);
+            if (len == 2) {
+                mach->accel.block_write_mono_pattern_enable = !!(val & 0x8000);
+                mach->accel.patt_len_reg = val;
+            }
+            break;
+
+        case 0xd6ee:
+            mach->accel.patt_idx = val & 0x1f;
+            mach_log("Write Port d6ee: Pattern Index=%d.\n", val & 0x1f);
+            break;
+
+        case 0xdaee:
+            if (len == 2) {
+                dev->accel.multifunc[2] = val & 0x7ff;
+                dev->accel.clip_left = dev->accel.multifunc[2];
+                if (val & 0x800)
+                    dev->accel.clip_left |= ~0x7ff;
+            }
+            mach_log("DAEE (extclipl) write val=%d, left=%d.\n", val, dev->accel.clip_left);
+            break;
+
+        case 0xdeee:
+            if (len == 2) {
+                dev->accel.multifunc[1] = val & 0x7ff;
+                dev->accel.clip_top = dev->accel.multifunc[1];
+                if (val & 0x800) {
+                    dev->accel.clip_top |= ~0x7ff;
+                }
+            }
+            mach_log("DEEE (extclipt) write val = %d\n", val);
+            break;
+
+        case 0xe2ee:
+            if (len == 2) {
+                dev->accel.multifunc[4] = val & 0x7ff;
+                dev->accel.clip_right = dev->accel.multifunc[4];
+                if (val & 0x800)
+                    dev->accel.clip_right |= ~0x7ff;
+            }
+            mach_log("E2EE (extclipr) write val = %d\n", val);
+            break;
+
+        case 0xe6ee:
+            if (len == 2) {
+                dev->accel.multifunc[3] = val & 0x7ff;
+                dev->accel.clip_bottom = dev->accel.multifunc[3];
+                if (val & 0x800)
+                    dev->accel.clip_bottom |= ~0x7ff;
+            }
+            mach_log("E6EE (extclipb) write val = %d\n", val);
+            break;
+
+        case 0xeeee:
+            if (len == 2)
+                mach->accel.dest_cmp_fn = val;
+            break;
+
+        case 0xf2ee:
+            mach_log("F2EE.\n");
+            if (len == 2)
+                mach->accel.dst_clr_cmp_mask = val;
+            break;
+
+        case 0xfeee:
+            if (len == 2) {
+                mach->accel.line_array[mach->accel.line_idx] = val;
+                mach_log("mach->accel.line_array[%02X] = %04X\n", mach->accel.line_idx, val);
+                dev->accel.cur_x                             = mach->accel.line_array[(mach->accel.line_idx == 4) ? 4 : 0];
+                dev->accel.cur_y                             = mach->accel.line_array[(mach->accel.line_idx == 5) ? 5 : 1];
+                mach->accel.cx_end_line                      = mach->accel.line_array[2];
+                mach->accel.cy_end_line                      = mach->accel.line_array[3];
+                if ((mach->accel.line_idx == 3) || (mach->accel.line_idx == 5)) {
+                    mach->accel.cmd_type = (mach->accel.line_idx == 5) ? 4 : 3;
+                    frgd_sel = (mach->accel.dp_config >> 13) & 7;
+                    bkgd_sel = (mach->accel.dp_config >> 7) & 3;
+                    mono_src = (mach->accel.dp_config >> 5) & 3;
+
+                    dev->accel.cmd_back = 1;
+                    if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
+                        dev->accel.cmd_back = 0;
+
+                    mach_log("LineDraw type=%x, dpconfig=%04x.\n", mach->accel.cmd_type, mach->accel.dp_config);
+                    mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, svga, mach, dev);
+                    mach->accel.line_idx = (mach->accel.line_idx == 5) ? 4 : 2;
+                    break;
+                }
+                mach->accel.line_idx++;
+            }
             break;
 
         default:
+            mach_log("Unknown or reserved write to %04x, val=%04x, len=%d, latch=%08x.\n", port, val, len, svga->ma_latch);
             break;
     }
 }
 
-static void
-mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
-{
-    svga_t    *svga = &mach->svga;
-
-    mach_log("[%04X:%08X]: Port NORMAL OUT=%04x, val=%04x.\n", CS, cpu_state.pc, port, val);
-
-    mach_accel_out_call(port, val, mach, svga, (ibm8514_t *) svga->dev8514);
-}
-
 static uint16_t
 mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, int len)
 {
@@ -3832,7 +4058,19 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
 
     switch (port) {
         case 0x82e8:
+            if ((mach->accel.cmd_type == 3) || (mach->accel.cmd_type == 4))
+                temp = mach->accel.cy_end_line;
+            else
+                temp = ibm8514_accel_in_fifo(svga, port, len);
+            break;
+
         case 0x86e8:
+            if ((mach->accel.cmd_type == 3) || (mach->accel.cmd_type == 4))
+                temp = mach->accel.cx_end_line;
+            else
+                temp = ibm8514_accel_in_fifo(svga, port, len);
+            break;
+
         case 0x92e8:
         case 0x96e8:
         case 0xc2e8:
@@ -3842,18 +4080,24 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
 
         case 0x9ae8:
         case 0xdae8:
-            if ((dev->fifo_idx >= 1) && (dev->fifo_idx <= 8)) {
-                temp |= (1 << (dev->fifo_idx - 1));
-                dev->fifo_idx = 0;
-            }
-
             if (len == 2) {
-                if (dev->force_busy)
-                    temp |= 0x200; /*Hardware busy*/
+                if (dev->fifo_idx <= 8) {
+                    for (int i = 1; i <= dev->fifo_idx; i++)
+                        temp |= (1 << (7 - (i - 1)));
+                } else
+                    temp = 0x00ff;
+
+                if (dev->fifo_idx > 0)
+                    dev->fifo_idx--;
+
+                if (dev->force_busy)
+                    temp |= 0x0200; /*Hardware busy*/
+
+                if (dev->accel.cmd_back)
+                    dev->force_busy = 0;
 
-                dev->force_busy = 0;
                 if (dev->data_available) {
-                    temp |= 0x100; /*Read Data available*/
+                    temp |= 0x0100; /*Read Data available*/
                     if (mach->accel.cmd_type >= 0) {
                         switch (mach->accel.cmd_type) {
                             case 2:
@@ -3891,10 +4135,13 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
         case 0x9ae9:
         case 0xdae9:
             if (len == 1) {
+                dev->fifo_idx = 0;
+
                 if (dev->force_busy2)
                     temp |= 0x02; /*Hardware busy*/
 
                 dev->force_busy2 = 0;
+
                 if (dev->data_available2) {
                     temp |= 0x01; /*Read Data available*/
                     if (mach->accel.cmd_type >= 0) {
@@ -3913,8 +4160,19 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
                                 break;
                         }
                     } else {
-                        if (dev->accel.sy < 0)
-                            dev->data_available2 = 0;
+                        switch (dev->accel.cmd >> 13) {
+                            case 2:
+                            case 3:
+                            case 4:
+                            case 6:
+                                if (dev->accel.sy < 0)
+                                    dev->data_available = 0;
+                                break;
+                            default:
+                                if (!dev->accel.sy)
+                                    dev->data_available = 0;
+                                break;
+                        }
                     }
                 }
             }
@@ -3930,7 +4188,7 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
                         READ_PIXTRANS_BYTE_IO(dev->accel.dx, 1)
                         temp = mach->accel.pix_trans[1];
                     } else {
-                        if (mach->accel.cmd_type == 3) {
+                        if ((mach->accel.cmd_type == 3) || (mach->accel.cmd_type == 4)) {
                             READ_PIXTRANS_WORD(dev->accel.cx, 0)
                         } else {
                             READ_PIXTRANS_WORD(dev->accel.dx, 0)
@@ -3943,7 +4201,7 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
                     cmd = (dev->accel.cmd >> 13);
                     if (len == 2) {
                         READ_PIXTRANS_WORD(dev->accel.cx, 0)
-                        if (dev->subsys_stat & 0x01) {
+                        if (dev->subsys_stat & INT_VSY) {
                             dev->force_busy = 1;
                             dev->data_available = 1;
                         }
@@ -4017,10 +4275,10 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0x8eee:
-            if (len == 1)
-                temp = mach->accel.ext_ge_config & 0xff;
-            else
+            if (len == 2)
                 temp = mach->accel.ext_ge_config;
+            else
+                temp = mach->accel.ext_ge_config & 0xff;
 
             mach_log("ExtGE Read = %04x, len=%d.\n", temp, len);
             break;
@@ -4030,10 +4288,10 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0x92ee:
-            if (len == 1)
-                temp = mach->accel.eeprom_control & 0xff;
-            else
+            if (len == 2)
                 temp = mach->accel.eeprom_control;
+            else
+                temp = mach->accel.eeprom_control & 0xff;
 
             mach_log("EEPROM cntl read=%04x, len=%d.\n", temp, len);
             break;
@@ -4045,10 +4303,10 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0x96ee:
-            if (len == 1)
-                temp = mach->accel.test & 0xff;
-            else
+            if (len == 2)
                 temp = mach->accel.test;
+            else
+                temp = mach->accel.test & 0xff;
             break;
         case 0x96ef:
             if (len == 1)
@@ -4057,18 +4315,22 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
 
         case 0x9aee:
             if (len == 2) {
-                if ((dev->ext_fifo_idx >= 1) && (dev->ext_fifo_idx <= 16)) {
-                    temp |= (1 << (dev->ext_fifo_idx - 1));
-                    dev->ext_fifo_idx = 0;
-                }
+                if (dev->fifo_idx <= 16) {
+                    for (int i = 1; i <= dev->fifo_idx; i++)
+                        temp |= (1 << (15 - (i - 1)));
+                } else
+                    temp = 0xffff;
+
+                if (dev->fifo_idx > 0)
+                    dev->fifo_idx--;
             }
             break;
 
         case 0xa2ee:
-            if (len == 1)
-                temp = mach->accel.linedraw_opt & 0xff;
-            else
+            if (len == 2)
                 temp = mach->accel.linedraw_opt;
+            else
+                temp = mach->accel.linedraw_opt & 0xff;
             break;
         case 0xa2ef:
             if (len == 1)
@@ -4076,11 +4338,11 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0xb2ee:
-            if (len == 1)
-                temp = dev->hdisped;
-            else {
+            if (len == 2) {
                 temp = dev->hdisped & 0xff;
                 temp |= (dev->htotal << 8);
+            } else {
+                temp = dev->hdisped;
             }
             mach_log("B2EE read=%02x.\n", temp & 0xff);
             break;
@@ -4098,12 +4360,10 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0xc2ee:
-            if (len == 1)
-                temp = dev->v_total_reg & 0xff;
-            else {
+            if (len == 2)
                 temp = dev->v_total_reg;
-                mach_log("VTOTAL read=%d.\n", temp);
-            }
+            else
+                temp = dev->v_total_reg & 0xff;
             break;
         case 0xc2ef:
             if (len == 1)
@@ -4111,12 +4371,10 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0xc6ee:
-            if (len == 1)
-                temp = dev->v_disp & 0xff;
-            else {
+            if (len == 2)
                 temp = dev->v_disp;
-                mach_log("VDISP read=%d.\n", temp);
-            }
+            else
+                temp = dev->v_disp & 0xff;
             break;
         case 0xc6ef:
             if (len == 1)
@@ -4124,10 +4382,10 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0xcaee:
-            if (len == 1)
-                temp = dev->v_sync_start & 0xff;
-            else
+            if (len == 2)
                 temp = dev->v_sync_start;
+            else
+                temp = dev->v_sync_start & 0xff;
             break;
         case 0xcaef:
             if (len == 1)
@@ -4136,10 +4394,10 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
 
         case 0xceee:
             mach_log("CEEE read=%d.\n", len);
-            if (len == 1)
-                temp = dev->vc & 0xff;
-            else
+            if (len == 2)
                 temp = dev->vc & 0x7ff;
+            else
+                temp = dev->vc & 0xff;
             break;
         case 0xceef:
             mach_log("CEEF read=%d.\n", len);
@@ -4167,8 +4425,10 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             if (len == 2) {
                 if ((dev->local & 0xff) >= 0x02)
                     temp = mach->accel.src_y;
-            } else
-                temp = mach->accel.src_y & 0xff;
+            } else {
+                if ((dev->local & 0xff) >= 0x02)
+                    temp = mach->accel.src_y & 0xff;
+            }
             break;
         case 0xdeef:
             if (len == 1) {
@@ -4218,6 +4478,7 @@ static uint8_t
 mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
 {
     uint8_t temp = 0;
+    uint8_t fifo_test_tag[16] = { 0x7c, 0x64, 0x60, 0x5c, 0x58, 0x54, 0x50, 0x68, 0x38, 0x24, 0x10, 0x0c, 0x08, 0x04, 0x00, 0x4c};
     int16_t clip_t = dev->accel.clip_top;
     int16_t clip_l = dev->accel.clip_left;
     int16_t clip_b = dev->accel.clip_bottom;
@@ -4240,63 +4501,64 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
 
         case 0x42e8:
         case 0x42e9:
-            if ((dev->subsys_cntl & 0x01) && !(dev->subsys_stat & 0x01) && (dev->vc == dev->dispend))
-                temp |= 0x01;
+            if (!(port & 1)) {
+                if ((dev->subsys_cntl & INT_VSY) && !(dev->subsys_stat & INT_VSY) && (dev->vc == dev->dispend))
+                    temp |= INT_VSY;
 
-            if (mach->accel.cmd_type == -1) {
-                if (cmd == 6) {
-                    if ((dev->subsys_cntl & 0x02) &&
-                        !(dev->subsys_stat & 0x02) &&
-                        (dev->accel.dx >= clip_l) &&
-                        (dev->accel.dx <= clip_r_ibm) &&
-                        (dev->accel.dy >= clip_t) &&
-                        (dev->accel.dy <= clip_b_ibm))
-                        temp |= 0x02;
-                } else {
-                    if ((dev->subsys_cntl & 0x02) &&
-                        !(dev->subsys_stat & 0x02) &&
-                        (dev->accel.cx >= clip_l) &&
-                        (dev->accel.cx <= clip_r_ibm) &&
-                        (dev->accel.cy >= clip_t) &&
-                        (dev->accel.cy <= clip_b_ibm))
-                        temp |= 0x02;
-                }
-            } else {
-                switch (mach->accel.cmd_type) {
-                    case 1:
-                    case 2:
-                    case 5:
-                        if ((dev->subsys_cntl & 0x02) &&
-                            !(dev->subsys_stat & 0x02) &&
-                            (dev->accel.dx >= clip_l) &&
-                            (dev->accel.dx <= clip_r) &&
-                            (dev->accel.dy >= clip_t) &&
-                            (dev->accel.dy <= clip_b))
-                            temp |= 0x02;
-                        break;
-                    case 3:
-                    case 4:
-                        if ((dev->subsys_cntl & 0x02) &&
-                            !(dev->subsys_stat & 0x02) &&
+                if (mach->accel.cmd_type == -1) {
+                    if (cmd == 6) {
+                        if ((dev->subsys_cntl & INT_GE_BSY) &&
+                            !(dev->subsys_stat & INT_GE_BSY) &&
+                            (dev->accel.dx_ibm >= clip_l) &&
+                            (dev->accel.dx_ibm <= clip_r_ibm) &&
+                            (dev->accel.dy_ibm >= clip_t) &&
+                            (dev->accel.dy_ibm <= clip_b_ibm))
+                            temp |= INT_GE_BSY;
+                    } else {
+                        if ((dev->subsys_cntl & INT_GE_BSY) &&
+                            !(dev->subsys_stat & INT_GE_BSY) &&
                             (dev->accel.cx >= clip_l) &&
-                            (dev->accel.cx <= clip_r) &&
+                            (dev->accel.cx <= clip_r_ibm) &&
                             (dev->accel.cy >= clip_t) &&
-                            (dev->accel.cy <= clip_b))
-                            temp |= 0x02;
-                        break;
-                    default:
-                        break;
+                            (dev->accel.cy <= clip_b_ibm))
+                            temp |= INT_GE_BSY;
+                    }
+                } else {
+                    switch (mach->accel.cmd_type) {
+                        case 1:
+                        case 2:
+                        case 5:
+                            if ((dev->subsys_cntl & INT_GE_BSY) &&
+                                !(dev->subsys_stat & INT_GE_BSY) &&
+                                (dev->accel.dx >= clip_l) &&
+                                (dev->accel.dx <= clip_r) &&
+                                (dev->accel.dy >= clip_t) &&
+                                (dev->accel.dy <= clip_b))
+                                temp |= INT_GE_BSY;
+                            break;
+                        case 3:
+                        case 4:
+                            if ((dev->subsys_cntl & INT_GE_BSY) &&
+                                !(dev->subsys_stat & INT_GE_BSY) &&
+                                (dev->accel.cx >= clip_l) &&
+                                (dev->accel.cx <= clip_r) &&
+                                (dev->accel.cy >= clip_t) &&
+                                (dev->accel.cy <= clip_b))
+                                temp |= INT_GE_BSY;
+                            break;
+                        default:
+                            break;
+                    }
                 }
-            }
 
-            if ((!dev->fifo_idx || !dev->ext_fifo_idx)) {
-                if ((!dev->force_busy && !dev->force_busy2) || !mach->force_busy)
-                    temp |= 0x08;
-            }
-            if (port & 1) {
-                temp = dev->vram_512k_8514 ? 0x00 : 0x80;
-                temp |= (dev->subsys_cntl >> 8);
-            } else {
+                if (dev->accel.cmd_back) {
+                    dev->force_busy = 0;
+                    dev->force_busy2 = 0;
+                    mach->force_busy = 0;
+                    dev->data_available = 0;
+                    dev->data_available2 = 0;
+                    temp |= INT_FIFO_EMP;
+                }
                 temp |= (dev->subsys_stat | (dev->vram_512k_8514 ? 0x00 : 0x80));
                 if (mach->accel.ext_ge_config & 0x08)
                     temp |= ((mach->accel.ext_ge_config & 0x07) << 4);
@@ -4318,8 +4580,16 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
             break;
 
         case 0x1aee:
+            if (dev->fifo_idx > 0)
+                dev->fifo_idx--;
+            if (mach->fifo_test_idx > 0)
+                mach->fifo_test_idx--;
+            fallthrough;
         case 0x1aef:
-            temp = 0x00;
+            mach_log("FIFO Test IDX=%d, Data=%04x.\n", mach->fifo_test_idx, mach->fifo_test_data[mach->fifo_test_idx]);
+            READ8(port, mach->fifo_test_data[mach->fifo_test_idx]);
+            if (!mach->fifo_test_idx && ((mach->accel.dp_config == 0xaaaa) || (mach->accel.dp_config == 0x5555)))
+                mach->accel.dp_config = 0x2211;
             break;
 
         case 0x22ee:
@@ -4336,7 +4606,6 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
         case 0x36ef:
             if ((dev->local & 0xff) >= 0x02) {
                 READ8(port, mach->misc);
-
                 if (!(port & 1)) {
                     temp &= ~0x0c;
                     switch (dev->vram_amount) {
@@ -4357,6 +4626,14 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
             }
             break;
 
+        case 0x3aee:
+        case 0x3aef:
+            if (port & 1)
+                temp = 0x01;
+            else
+                temp = fifo_test_tag[dev->fifo_idx];
+            break;
+
         case 0x42ee:
         case 0x42ef:
             READ8(port, mach->accel.test2);
@@ -4380,7 +4657,13 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
                     temp = (((dev->bios_rom.mapping.base >> 7) - 0x1000) >> 4);
                     if (port & 1)
                         temp |= 0x01;
+                } else {
+                    if (mach->accel.scratch0 == 0x1234)
+                        temp = 0x0000;
                 }
+            } else {
+                if (mach->accel.scratch0 == 0x1234)
+                    temp = 0x0000;
             }
             break;
 
@@ -4440,30 +4723,30 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
         default:
             break;
     }
-    if (port == 0x2ee8 || port == 0x2ee9 || port == 0x42e8 || port == 0x42e9)
-        mach_log("[%04X:%08X]: Port NORMAL IN=%04x, temp=%04x.\n", CS, cpu_state.pc, port, temp);
+    mach_log("[%04X:%08X]: Port NORMAL IN=%04x, temp=%04x.\n", CS, cpu_state.pc, port, temp);
 
     return temp;
 }
 
-static void
-ati8514_accel_out(uint16_t port, uint8_t val, svga_t *svga)
-{
-    mach_log("[%04X:%08X]: Port NORMAL OUT=%04x, val=%04x.\n", CS, cpu_state.pc, port, val);
-
-    mach_accel_out_call(port, val, (mach_t *)svga->ext8514, svga, (ibm8514_t *) svga->dev8514);
-}
-
 static void
 ati8514_accel_outb(uint16_t port, uint8_t val, void *priv)
 {
     svga_t *svga = (svga_t *)priv;
     mach_t *mach = (mach_t *)svga->ext8514;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port & 0x8000)
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, val, 1);
-    else
-        ati8514_accel_out(port, val, svga);
+    if (port & 0x8000) { /*Command FIFO*/
+        if (dev->accel.cmd_back) {
+            mach->fifo_test_data[dev->fifo_idx] = val;
+            dev->fifo_idx++;
+            if (dev->fifo_idx > 16)
+                dev->fifo_idx = 16;
+
+            mach->fifo_test_idx = dev->fifo_idx;
+        }
+    }
+    dev->accel_out_fifo(svga, port, val, 1);
+    mach_log("%04X:%08X: OUTB port=%04x, val=%02x, fifo idx=%d.\n", CS, cpu_state.pc, port, val, dev->fifo_idx);
 }
 
 static void
@@ -4471,13 +4754,23 @@ ati8514_accel_outw(uint16_t port, uint16_t val, void *priv)
 {
     svga_t *svga = (svga_t *)priv;
     mach_t *mach = (mach_t *)svga->ext8514;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port & 0x8000)
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, val, 2);
-    else {
-        ati8514_accel_out(port, val, svga);
-        ati8514_accel_out(port + 1, (val >> 8), svga);
+    if (port == 0xf6ee)
+        port = 0x82e8;
+
+    if (port & 0x8000) { /*Command FIFO*/
+        if (dev->accel.cmd_back) {
+            mach->fifo_test_data[dev->fifo_idx] = val;
+            dev->fifo_idx++;
+            if (dev->fifo_idx > 16)
+                dev->fifo_idx = 16;
+
+            mach->fifo_test_idx = dev->fifo_idx;
+        }
     }
+    dev->accel_out_fifo(svga, port, val, 2);
+    mach_log("%04X:%08X: OUTW port=%04x, val=%04x, fifo idx=%d.\n", CS, cpu_state.pc, port, val, dev->fifo_idx);
 }
 
 static void
@@ -4485,16 +4778,23 @@ ati8514_accel_outl(uint16_t port, uint32_t val, void *priv)
 {
     svga_t *svga = (svga_t *)priv;
     mach_t *mach = (mach_t *)svga->ext8514;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port & 0x8000) {
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, val & 0xffff, 2);
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port + 2, val >> 16, 2);
-    } else {
-        ati8514_accel_out(port, val, svga);
-        ati8514_accel_out(port + 1, (val >> 8), svga);
-        ati8514_accel_out(port + 2, (val >> 16), svga);
-        ati8514_accel_out(port + 3, (val >> 24), svga);
+    if (port == 0xf6ee)
+        port = 0x82e8;
+
+    if (port & 0x8000) { /*Command FIFO*/
+        if (dev->accel.cmd_back) {
+            mach->fifo_test_data[dev->fifo_idx] = val;
+            dev->fifo_idx++;
+            if (dev->fifo_idx > 16)
+                dev->fifo_idx = 16;
+
+            mach->fifo_test_idx = dev->fifo_idx;
+        }
     }
+    dev->accel_out_fifo(svga, port, val, 2);
+    mach_log("OUTL port=%04x, val=%08x, fifo idx=%d.\n", port, val, dev->fifo_idx);
 }
 
 static void
@@ -4502,11 +4802,20 @@ mach_accel_outb(uint16_t port, uint8_t val, void *priv)
 {
     mach_t *mach = (mach_t *) priv;
     svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port & 0x8000)
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, val, 1);
-    else
-        mach_accel_out(port, val, mach);
+    if (port & 0x8000) { /*Command FIFO*/
+        if (dev->accel.cmd_back) {
+            mach->fifo_test_data[dev->fifo_idx] = val;
+            dev->fifo_idx++;
+            if (dev->fifo_idx > 16)
+                dev->fifo_idx = 16;
+
+            mach->fifo_test_idx = dev->fifo_idx;
+        }
+    }
+    dev->accel_out_fifo(mach, port, val, 1);
+    mach_log("%04X:%08X: OUTB port=%04x, val=%02x, fifo idx=%d.\n", CS, cpu_state.pc, port, val, dev->fifo_idx);
 }
 
 static void
@@ -4514,13 +4823,23 @@ mach_accel_outw(uint16_t port, uint16_t val, void *priv)
 {
     mach_t *mach = (mach_t *) priv;
     svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port & 0x8000)
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, val, 2);
-    else {
-        mach_accel_out(port, val, mach);
-        mach_accel_out(port + 1, (val >> 8), mach);
+    if (port == 0xf6ee)
+        port = 0x82e8;
+
+    if (port & 0x8000) { /*Command FIFO*/
+        if (dev->accel.cmd_back) {
+            mach->fifo_test_data[dev->fifo_idx] = val;
+            dev->fifo_idx++;
+            if (dev->fifo_idx > 16)
+                dev->fifo_idx = 16;
+
+            mach->fifo_test_idx = dev->fifo_idx;
+        }
     }
+    dev->accel_out_fifo(mach, port, val, 2);
+    mach_log("%04X:%08X: OUTW port=%04x, val=%04x, fifo idx=%d.\n", CS, cpu_state.pc, port, val, dev->fifo_idx);
 }
 
 static void
@@ -4528,16 +4847,23 @@ mach_accel_outl(uint16_t port, uint32_t val, void *priv)
 {
     mach_t *mach = (mach_t *) priv;
     svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port & 0x8000) {
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, val & 0xffff, 2);
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port + 2, val >> 16, 2);
-    } else {
-        mach_accel_out(port, val, mach);
-        mach_accel_out(port + 1, (val >> 8), mach);
-        mach_accel_out(port + 2, (val >> 16), mach);
-        mach_accel_out(port + 3, (val >> 24), mach);
+    if (port == 0xf6ee)
+        port = 0x82e8;
+
+    if (port & 0x8000) { /*Command FIFO*/
+        if (dev->accel.cmd_back) {
+            mach->fifo_test_data[dev->fifo_idx] = val;
+            dev->fifo_idx++;
+            if (dev->fifo_idx > 16)
+                dev->fifo_idx = 16;
+
+            mach->fifo_test_idx = dev->fifo_idx;
+        }
     }
+    dev->accel_out_fifo(mach, port, val, 2);
+    mach_log("OUTL port=%04x, val=%08x, fifo idx=%d.\n", port, val, dev->fifo_idx);
 }
 
 static uint8_t
@@ -4558,6 +4884,7 @@ ati8514_accel_inb(uint16_t port, void *priv)
     else
         temp = ati8514_accel_in(port, svga);
 
+    mach_log("%04X:%08X: INB port=%04x, temp=%02x.\n", CS, cpu_state.pc, port, temp);
     return temp;
 }
 
@@ -4574,6 +4901,8 @@ ati8514_accel_inw(uint16_t port, void *priv)
         temp = ati8514_accel_in(port, svga);
         temp |= (ati8514_accel_in(port + 1, svga) << 8);
     }
+
+    mach_log("%04X:%08X: INW port=%04x, temp=%04x.\n", CS, cpu_state.pc, port, temp);
     return temp;
 }
 
@@ -4584,14 +4913,11 @@ ati8514_accel_inl(uint16_t port, void *priv)
     mach_t *mach = (mach_t *)svga->ext8514;
     uint32_t temp;
 
-    if (port & 0x8000) {
+    if (port & 0x8000)
         temp = mach_accel_in_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, 2);
-        temp = (mach_accel_in_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port + 2, 2) << 16);
-    } else {
+    else {
         temp = ati8514_accel_in(port, svga);
         temp |= (ati8514_accel_in(port + 1, svga) << 8);
-        temp |= (ati8514_accel_in(port + 2, svga) << 16);
-        temp |= (ati8514_accel_in(port + 3, svga) << 24);
     }
     return temp;
 }
@@ -4615,6 +4941,7 @@ mach_accel_inb(uint16_t port, void *priv)
     else
         temp = mach_accel_in(port, mach);
 
+    mach_log("%04X:%08X: INB port=%04x, temp=%02x.\n", CS, cpu_state.pc, port, temp);
     return temp;
 }
 
@@ -4631,6 +4958,8 @@ mach_accel_inw(uint16_t port, void *priv)
         temp = mach_accel_in(port, mach);
         temp |= (mach_accel_in(port + 1, mach) << 8);
     }
+
+    mach_log("%04X:%08X: INW port=%04x, temp=%04x.\n", CS, cpu_state.pc, port, temp);
     return temp;
 }
 
@@ -4641,14 +4970,11 @@ mach_accel_inl(uint16_t port, void *priv)
     svga_t *svga = &mach->svga;
     uint32_t temp;
 
-    if (port & 0x8000) {
+    if (port & 0x8000)
         temp = mach_accel_in_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, 2);
-        temp = (mach_accel_in_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port + 2, 2) << 16);
-    } else {
+    else {
         temp = mach_accel_in(port, mach);
         temp |= (mach_accel_in(port + 1, mach) << 8);
-        temp |= (mach_accel_in(port + 2, mach) << 16);
-        temp |= (mach_accel_in(port + 3, mach) << 24);
     }
     return temp;
 }
@@ -4817,6 +5143,11 @@ mach32_write(uint32_t addr, uint8_t val, void *priv)
     xga_write_test(addr, val, svga);
     addr = (addr & svga->banked_mask) + svga->write_bank;
 
+    if (mach->accel.test2 & 0x10) {
+        if (addr < ((mach->accel.test2 & 0x0f) << 18))
+            return;
+    }
+
     if ((((dev->local & 0xff) >= 0x02) && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
         addr <<= 1;
         switch (addr & 0x06) {
@@ -4838,6 +5169,8 @@ mach32_write(uint32_t addr, uint8_t val, void *priv)
         }
     } else
         mach32_write_common(addr, val, 0, mach, svga);
+
+    mach_log("Writeb banked=%08x.\n", addr);
 }
 
 static void
@@ -4850,6 +5183,11 @@ mach32_writew(uint32_t addr, uint16_t val, void *priv)
     xga_write_test(addr, val, svga);
     addr = (addr & svga->banked_mask) + svga->write_bank;
 
+    if (mach->accel.test2 & 0x10) {
+        if (addr < ((mach->accel.test2 & 0x0f) << 18))
+            return;
+    }
+
     if ((((dev->local & 0xff) >= 0x02) && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
         addr <<= 1;
         if (addr & 0x04) {
@@ -4867,6 +5205,7 @@ mach32_writew(uint32_t addr, uint16_t val, void *priv)
         mach32_write_common(addr, val & 0xff, 0, mach, svga);
         mach32_write_common(addr + 1, val >> 8, 0, mach, svga);
     }
+    mach_log("Writew banked=%08x.\n", addr);
 }
 
 static void
@@ -4879,6 +5218,11 @@ mach32_writel(uint32_t addr, uint32_t val, void *priv)
     xga_write_test(addr, val, svga);
     addr = (addr & svga->banked_mask) + svga->write_bank;
 
+    if (mach->accel.test2 & 0x10) {
+        if (addr < ((mach->accel.test2 & 0x0f) << 18))
+            return;
+    }
+
     if ((((dev->local & 0xff) >= 0x02) && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
         addr <<= 1;
         mach32_write_common(addr, val & 0x0f, 0, mach, svga);
@@ -4895,6 +5239,223 @@ mach32_writel(uint32_t addr, uint32_t val, void *priv)
         mach32_write_common(addr + 2, val >> 16, 0, mach, svga);
         mach32_write_common(addr + 3, val >> 24, 0, mach, svga);
     }
+
+    mach_log("Writel banked=%08x.\n", addr);
+}
+
+static __inline void
+mach32_svga_write(uint32_t addr, uint8_t val, void *priv)
+{
+    svga_t *svga       = (svga_t *) priv;
+    mach_t *mach       = (mach_t *) svga->priv;
+    int     writemask2 = svga->writemask;
+    int     reset_wm   = 0;
+    latch_t vall;
+    uint8_t wm         = svga->writemask;
+    uint8_t count;
+    uint8_t i;
+
+    cycles -= svga->monitor->mon_video_timing_write_b;
+
+    xga_write_test(addr, val, svga);
+    addr = svga_decode_addr(svga, addr, 1);
+    if (addr == 0xffffffff) {
+        mach_log("WriteCommon Over.\n");
+        return;
+    }
+
+    if (mach->accel.test2 & 0x10) {
+        if (addr >= ((mach->accel.test2 & 0x0f) << 18))
+            return;
+    }
+
+    if (!(svga->gdcreg[6] & 1))
+        svga->fullchange = 2;
+
+    if (((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only) && (svga->writemode < 4)) {
+        writemask2 = 1 << (addr & 3);
+        addr &= ~3;
+    } else if (svga->chain4 && (svga->writemode < 4)) {
+        writemask2 = 1 << (addr & 3);
+        addr = ((addr & 0xfffc) << 2) | ((addr & 0x30000) >> 14) | (addr & ~0x3ffff);
+    } else if (svga->chain2_write) {
+        writemask2 &= ~0xa;
+        if (addr & 1)
+            writemask2 <<= 1;
+        addr &= ~1;
+        addr <<= 2;
+    } else
+        addr <<= 2;
+
+    addr &= svga->decode_mask;
+
+    if (addr >= svga->vram_max) {
+        mach_log("WriteBankedOver=%08x, val=%02x.\n", addr & svga->vram_mask, val);
+        return;
+    }
+
+    addr &= svga->vram_mask;
+    svga->changedvram[addr >> 12] = svga->monitor->mon_changeframecount;
+
+    count = 4;
+
+   switch (svga->writemode) {
+        case 0:
+            val = ((val >> (svga->gdcreg[3] & 7)) | (val << (8 - (svga->gdcreg[3] & 7))));
+            if ((svga->gdcreg[8] == 0xff) && !(svga->gdcreg[3] & 0x18) && (!svga->gdcreg[1] || svga->set_reset_disabled)) {
+                for (i = 0; i < count; i++) {
+                    if (writemask2 & (1 << i))
+                        svga->vram[addr | i] = val;
+                }
+                return;
+            } else {
+                for (i = 0; i < count; i++) {
+                    if (svga->gdcreg[1] & (1 << i))
+                        vall.b[i] = !!(svga->gdcreg[0] & (1 << i)) * 0xff;
+                    else
+                        vall.b[i] = val;
+                }
+            }
+            break;
+        case 1:
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    svga->vram[addr | i] = svga->latch.b[i];
+            }
+            return;
+        case 2:
+            for (i = 0; i < count; i++)
+                vall.b[i] = !!(val & (1 << i)) * 0xff;
+
+            if (!(svga->gdcreg[3] & 0x18) && (!svga->gdcreg[1] || svga->set_reset_disabled)) {
+                for (i = 0; i < count; i++) {
+                    if (writemask2 & (1 << i))
+                        svga->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | (svga->latch.b[i] & ~svga->gdcreg[8]);
+                }
+                return;
+            }
+            break;
+        case 3:
+            val = ((val >> (svga->gdcreg[3] & 7)) | (val << (8 - (svga->gdcreg[3] & 7))));
+            wm  = svga->gdcreg[8];
+            svga->gdcreg[8] &= val;
+
+            for (i = 0; i < count; i++)
+                vall.b[i] = !!(svga->gdcreg[0] & (1 << i)) * 0xff;
+
+            reset_wm = 1;
+            break;
+        default:
+            return;
+    }
+
+    switch (svga->gdcreg[3] & 0x18) {
+        case 0x00: /* Set */
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    svga->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | (svga->latch.b[i] & ~svga->gdcreg[8]);
+            }
+            break;
+        case 0x08: /* AND */
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    svga->vram[addr | i] = (vall.b[i] | ~svga->gdcreg[8]) & svga->latch.b[i];
+            }
+            break;
+        case 0x10: /* OR */
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    svga->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | svga->latch.b[i];
+            }
+            break;
+        case 0x18: /* XOR */
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    svga->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) ^ svga->latch.b[i];
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    if (reset_wm)
+        svga->gdcreg[8] = wm;
+}
+
+static __inline void
+mach32_svga_writew(uint32_t addr, uint16_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    mach_t *mach = (mach_t *) svga->priv;
+
+    if (!svga->fast) {
+        mach32_svga_write(addr, val, priv);
+        mach32_svga_write(addr + 1, val >> 8, priv);
+        return;
+    }
+
+    cycles -= svga->monitor->mon_video_timing_write_w;
+
+    xga_write_test(addr, val & 0xff, svga);
+    xga_write_test(addr + 1, val >> 8, svga);
+    addr = svga_decode_addr(svga, addr, 1);
+
+    if (addr == 0xffffffff)
+        return;
+
+    if (mach->accel.test2 & 0x10) {
+        if (addr >= ((mach->accel.test2 & 0x0f) << 18))
+            return;
+    }
+
+    addr &= svga->decode_mask;
+    if (addr >= svga->vram_max)
+        return;
+    addr &= svga->vram_mask;
+
+    svga->changedvram[addr >> 12]   = svga->monitor->mon_changeframecount;
+    *(uint16_t *) &svga->vram[addr] = val;
+}
+
+static __inline void
+mach32_svga_writel(uint32_t addr, uint32_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    mach_t *mach = (mach_t *) svga->priv;
+
+    if (!svga->fast) {
+        mach32_svga_write(addr, val, priv);
+        mach32_svga_write(addr + 1, val >> 8, priv);
+        mach32_svga_write(addr + 2, val >> 16, priv);
+        mach32_svga_write(addr + 3, val >> 24, priv);
+        return;
+    }
+
+    cycles -= svga->monitor->mon_video_timing_write_l;
+
+    xga_write_test(addr, val & 0xff, svga);
+    xga_write_test(addr + 1, (val >> 8) & 0xff, svga);
+    xga_write_test(addr + 2, (val >> 16) & 0xff, svga);
+    xga_write_test(addr + 3, (val >> 24) & 0xff, svga);
+    addr = svga_decode_addr(svga, addr, 1);
+
+    if (addr == 0xffffffff)
+        return;
+
+    if (mach->accel.test2 & 0x10) {
+        if (addr >= ((mach->accel.test2 & 0x0f) << 18))
+            return;
+    }
+
+    addr &= svga->decode_mask;
+    if (addr >= svga->vram_max)
+        return;
+
+    addr &= svga->vram_mask;
+
+    svga->changedvram[addr >> 12]   = svga->monitor->mon_changeframecount;
+    *(uint32_t *) &svga->vram[addr] = val;
 }
 
 static __inline void
@@ -5100,6 +5661,7 @@ mach32_read(uint32_t addr, void *priv)
     } else
         ret = mach32_read_common(addr, 0, mach, svga);
 
+    mach_log("Readb banked=%08x.\n", addr);
     return ret;
 }
 
@@ -5131,6 +5693,7 @@ mach32_readw(uint32_t addr, void *priv)
         ret = mach32_read_common(addr, 0, mach, svga);
         ret |= (mach32_read_common(addr + 1, 0, mach, svga) << 8);
     }
+    mach_log("Readw banked=%08x.\n", addr);
     return ret;
 }
 
@@ -5161,6 +5724,7 @@ mach32_readl(uint32_t addr, void *priv)
         ret |= (mach32_read_common(addr + 2, 0, mach, svga) << 16);
         ret |= (mach32_read_common(addr + 3, 0, mach, svga) << 24);
     }
+    mach_log("Readl banked=%08x.\n", addr);
     return ret;
 }
 
@@ -5224,19 +5788,22 @@ mach32_ap_writeb(uint32_t addr, uint8_t val, void *priv)
     svga_t          *svga  = &mach->svga;
     const ibm8514_t *dev   = (ibm8514_t *) svga->dev8514;
     uint8_t port_dword     = addr & 0xfc;
+    uint16_t actual_port   = 0x02e8 + (addr & 1) + (port_dword << 8);
+    uint16_t actual_port_ext = 0x02ee + (addr & 1) + (port_dword << 8);
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
         (((addr - mach->linear_base) >= ((mach->ap_size << 20) - 0x200)) && ((addr - mach->linear_base) < (mach->ap_size << 20)))) {
         if (addr & 0x100) {
-            mach_log("Port WORDB Write=%04x.\n", 0x02ee + (port_dword << 8));
-            mach_accel_outb(0x02ee + (addr & 1) + (port_dword << 8), val, mach);
+            mach_log("Port WORDB Write=%04x.\n", actual_port_ext);
+            mach_accel_outb(actual_port_ext, val, mach);
         } else {
-            mach_log("Port WORDB Write=%04x.\n", 0x02e8 + (port_dword << 8));
-            mach_accel_outb(0x02e8 + (addr & 1) + (port_dword << 8), val, mach);
+            mach_log("Port WORDB Write=%04x.\n", actual_port);
+            mach_accel_outb(actual_port, val, mach);
         }
     } else {
         mach_log("Linear WORDB Write=%08x, val=%02x, ON=%x, dpconfig=%04x, apsize=%08x.\n",
                  addr & dev->vram_mask, val, dev->on, mach->accel.dp_config, mach->ap_size << 20);
+
         if (dev->on)
             mach32_write_common(addr, val, 1, mach, svga);
         else
@@ -5251,19 +5818,21 @@ mach32_ap_writew(uint32_t addr, uint16_t val, void *priv)
     svga_t          *svga  = &mach->svga;
     const ibm8514_t *dev   = (ibm8514_t *) svga->dev8514;
     uint8_t port_dword     = addr & 0xfc;
+    uint16_t actual_port   = 0x02e8 + (port_dword << 8);
+    uint16_t actual_port_ext = 0x02ee + (port_dword << 8);
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
         (((addr - mach->linear_base) >= ((mach->ap_size << 20) - 0x200)) && ((addr - mach->linear_base) < (mach->ap_size << 20)))) {
         if (addr & 0x100) {
-            mach_log("Port WORDW Write=%04x.\n", 0x02ee + (port_dword << 8));
-            mach_accel_outw(0x02ee + (port_dword << 8), val, mach);
+            mach_log("Port WORDW Write=%04x, localcntl=%02x, pcicntl=%02x, actual addr=%08x, val=%04x.\n", actual_port_ext, mach->local_cntl & 0x20, mach->pci_cntl_reg & 0x80, addr, val);
+            mach_accel_outw(actual_port_ext, val, mach);
         } else {
-            mach_log("Port WORDW Write=%04x.\n", 0x02e8 + (port_dword << 8));
-            mach_accel_outw(0x02e8 + (port_dword << 8), val, mach);
+            mach_log("Port WORDW Write=%04x, localcntl=%02x, pcicntl=%02x, actual addr=%08x.\n", actual_port, mach->local_cntl & 0x20, mach->pci_cntl_reg & 0x80, addr);
+            mach_accel_outw(actual_port, val, mach);
         }
     } else {
-        mach_log("Linear WORDW Write=%08x, val=%04x, ON=%x, dpconfig=%04x, apsize=%08x.\n",
-                 addr - mach->linear_base, val, dev->on, mach->accel.dp_config, mach->ap_size << 20);
+        mach_log("Linear WORDW Write=%08x, val=%04x, ON=%x, dpconfig=%04x, apsize=%08x, base=%08x, 8514/A port=%04x, ATI port=%04x, switch=%03x.\n",
+                 addr - mach->linear_base, val, dev->on, mach->accel.dp_config, mach->ap_size << 20, mach->linear_base, actual_port, actual_port_ext, addr & 0x100);
         if (dev->on)
             mach32_writew_linear(addr, val, mach);
         else
@@ -5278,6 +5847,8 @@ mach32_ap_writel(uint32_t addr, uint32_t val, void *priv)
     svga_t          *svga  = &mach->svga;
     const ibm8514_t *dev   = (ibm8514_t *) svga->dev8514;
     uint8_t port_dword     = addr & 0xfc;
+    uint16_t actual_port   = 0x02e8 + (port_dword << 8);
+    uint16_t actual_port_ext = 0x02ee + (port_dword << 8);
 
     mach_log("Linear WORDL Write=%08x, val=%08x, ON=%x, dpconfig=%04x, apsize=%08x.\n",
         addr - mach->linear_base, val, dev->on, mach->accel.dp_config, mach->ap_size << 20);
@@ -5285,13 +5856,11 @@ mach32_ap_writel(uint32_t addr, uint32_t val, void *priv)
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
         (((addr - mach->linear_base) >= ((mach->ap_size << 20) - 0x200)) && ((addr - mach->linear_base) < (mach->ap_size << 20)))) {
         if (addr & 0x100) {
-            mach_log("Port WORDL Write=%04x.\n", 0x02ee + (port_dword << 8));
-            mach_accel_outw(0x02ee + (port_dword << 8), val & 0xffff, mach);
-            mach_accel_outw(0x02ee + (port_dword << 8) + 4, val >> 16, mach);
+            mach_log("Port WORDL Write=%04x, localcntl=%02x, pcicntl=%02x.\n", actual_port_ext, mach->local_cntl & 0x20, mach->pci_cntl_reg & 0x80);
+            mach_accel_outl(actual_port_ext, val, mach);
         } else {
-            mach_log("Port WORDL Write=%04x.\n", 0x02e8 + (port_dword << 8));
-            mach_accel_outw(0x02e8 + (port_dword << 8), val & 0xffff, mach);
-            mach_accel_outw(0x02e8 + (port_dword << 8) + 4, val >> 16, mach);
+            mach_log("Port WORDL Write=%04x, localcntl=%02x, pcicntl=%02x.\n", actual_port, mach->local_cntl & 0x20, mach->pci_cntl_reg & 0x80);
+            mach_accel_outl(actual_port, val, mach);
         }
     } else {
         if (dev->on)
@@ -5309,13 +5878,15 @@ mach32_ap_readb(uint32_t addr, void *priv)
     const ibm8514_t *dev   = (ibm8514_t *) svga->dev8514;
     uint8_t temp;
     uint8_t port_dword     = addr & 0xfc;
+    uint16_t actual_port   = 0x02e8 + (addr & 1) + (port_dword << 8);
+    uint16_t actual_port_ext = 0x02ee + (addr & 1) + (port_dword << 8);
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
         (((addr - mach->linear_base) >= ((mach->ap_size << 20) - 0x200)) && ((addr - mach->linear_base) < (mach->ap_size << 20)))) {
         if (addr & 0x100)
-            temp = mach_accel_inb(0x02ee + (addr & 1) + (port_dword << 8), mach);
+            temp = mach_accel_inb(actual_port_ext, mach);
         else
-            temp = mach_accel_inb(0x02e8 + (addr & 1) + (port_dword << 8), mach);
+            temp = mach_accel_inb(actual_port, mach);
     } else {
         if (dev->on)
             temp = mach32_read_common(addr, 1, mach, svga);
@@ -5335,14 +5906,19 @@ mach32_ap_readw(uint32_t addr, void *priv)
     svga_t          *svga  = &mach->svga;
     const ibm8514_t *dev   = (ibm8514_t *) svga->dev8514;
     uint16_t temp;
-    uint8_t port_dword     = (addr - mach->linear_base) & 0xfc;
+    uint8_t port_dword     = addr & 0xfc;
+    uint16_t actual_port   = 0x02e8 + (port_dword << 8);
+    uint16_t actual_port_ext = 0x02ee + (port_dword << 8);
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
         (((addr - mach->linear_base) >= ((mach->ap_size << 20) - 0x200)) && ((addr - mach->linear_base) < (mach->ap_size << 20)))) {
-        if (addr & 0x100)
-            temp = mach_accel_inw(0x02ee + (port_dword << 8), mach);
-        else
-            temp = mach_accel_inw(0x02e8 + (port_dword << 8), mach);
+        if (addr & 0x100) {
+            temp = mach_accel_inw(actual_port_ext, mach);
+            mach_log("Port WORDW Read=%04x.\n", actual_port_ext);
+        } else {
+            temp = mach_accel_inw(actual_port, mach);
+            mach_log("Port WORDW Read=%04x.\n", actual_port);
+        }
     } else {
         if (dev->on)
             temp = mach32_readw_linear(addr, mach);
@@ -5363,15 +5939,17 @@ mach32_ap_readl(uint32_t addr, void *priv)
     const ibm8514_t *dev   = (ibm8514_t *) svga->dev8514;
     uint32_t temp;
     uint8_t port_dword     = addr & 0xfc;
+    uint16_t actual_port   = 0x02e8 + (port_dword << 8);
+    uint16_t actual_port_ext = 0x02ee + (port_dword << 8);
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
         (((addr - mach->linear_base) >= ((mach->ap_size << 20) - 0x200)) && ((addr - mach->linear_base) < (mach->ap_size << 20)))) {
         if (addr & 0x100) {
-            temp = mach_accel_inw(0x02ee + (port_dword << 8), mach);
-            temp |= (mach_accel_inw(0x02ee + (port_dword << 8) + 4, mach) << 8);
+            temp = mach_accel_inl(actual_port_ext, mach);
+            mach_log("Port WORDL Read=%04x.\n", actual_port_ext);
         } else {
-            temp = mach_accel_inw(0x02e8 + (port_dword << 8), mach);
-            temp |= (mach_accel_inw(0x02e8 + (port_dword << 8) + 4, mach) << 8);
+            temp = mach_accel_inl(actual_port, mach);
+            mach_log("Port WORDL Read=%04x.\n", actual_port);
         }
     } else {
         if (dev->on)
@@ -5405,14 +5983,17 @@ mach32_updatemapping(mach_t *mach, svga_t *svga)
             case 0x0: /*128k at A0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x20000);
                 svga->banked_mask = 0xffff;
+                mem_mapping_set_addr(&mach->banked_mapping, 0xa0000, 0x20000);
                 break;
             case 0x4: /*64k at A0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
                 svga->banked_mask = 0xffff;
+                mem_mapping_set_addr(&mach->banked_mapping, 0xa0000, 0x10000);
                 break;
             case 0x8: /*32k at B0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
                 svga->banked_mask = 0x7fff;
+                mem_mapping_set_addr(&mach->banked_mapping, 0xb0000, 0x08000);
                 break;
             case 0xC: /*32k at B8000*/
                 mem_mapping_set_addr(&svga->mapping, 0xb8000, 0x08000);
@@ -5426,6 +6007,7 @@ mach32_updatemapping(mach_t *mach, svga_t *svga)
                         }
                     }
                 }
+                mem_mapping_set_addr(&mach->banked_mapping, 0xb8000, 0x08000);
                 break;
 
             default:
@@ -5433,7 +6015,7 @@ mach32_updatemapping(mach_t *mach, svga_t *svga)
         }
     }
 
-    mach_log("Linear base = %08x, aperture = %04x, localcntl = %02x svgagdc = %x.\n",
+    mach_log("Linear base=%08x, aperture=%04x, localcntl=%02x, svgagdc=%x.\n",
              mach->linear_base, mach->memory_aperture, mach->local_cntl, svga->gdcreg[6] & 0x0c);
     if (mach->linear_base) {
         if (((mach->memory_aperture & 3) == 1) && !mach->pci_bus) {
@@ -5452,24 +6034,20 @@ mach32_updatemapping(mach_t *mach, svga_t *svga)
         mach_log("Linear Disabled APSIZE=4.\n");
         mem_mapping_disable(&mach->mmio_linear_mapping);
     }
+
     if ((dev->local & 0xff) >= 0x02) {
         if (dev->on && dev->vendor_mode) {
             mach_log("Mach32 banked mapping.\n");
-            mem_mapping_set_handler(&svga->mapping, mach32_read, mach32_readw, mach32_readl, mach32_write, mach32_writew, mach32_writel);
-            mem_mapping_set_p(&svga->mapping, mach);
+            mem_mapping_disable(&svga->mapping);
+            mem_mapping_enable(&mach->banked_mapping);
         } else {
-            if (!dev->on) {
-                memset(dev->vram, 0, dev->vram_size);
-                memset(dev->changedvram, 0, (dev->vram_size >> 12) + 1);
-            }
             mach_log("IBM compatible banked mapping.\n");
-            mem_mapping_set_handler(&svga->mapping, svga_read, svga_readw, svga_readl, svga_write, svga_writew, svga_writel);
-            mem_mapping_set_p(&svga->mapping, svga);
+            mem_mapping_enable(&svga->mapping);
+            mem_mapping_disable(&mach->banked_mapping);
         }
     } else {
-        mach_log("IBM compatible banked mapping.\n");
-        mem_mapping_set_handler(&svga->mapping, svga_read, svga_readw, svga_readl, svga_write, svga_writew, svga_writel);
-        mem_mapping_set_p(&svga->mapping, svga);
+        mem_mapping_enable(&svga->mapping);
+        mem_mapping_disable(&mach->banked_mapping);
     }
 }
 
@@ -5869,6 +6447,7 @@ mach_io_set(mach_t *mach)
     io_sethandler(0x7eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0x82ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0x86ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_sethandler(0x8aee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0x8eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0x92ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0x96ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
@@ -5891,6 +6470,7 @@ mach_io_set(mach_t *mach)
     io_sethandler(0xdeee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0xe2ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0xe6ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_sethandler(0xeaee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0xeeee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0xf2ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0xf6ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
@@ -6122,6 +6702,95 @@ mach32_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
     }
 }
 
+static void
+mach_vblank_start(mach_t *mach, svga_t *svga)
+{
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    dev->subsys_stat |= INT_VSY;
+}
+
+static void
+mach_combo_vblank_start(void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    mach_t *mach = (mach_t *) svga->priv;
+
+    mach_vblank_start(mach, svga);
+}
+
+static void
+ati8514_vblank_start(void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    mach_t *mach = (mach_t *) svga->ext8514;
+
+    mach_vblank_start(mach, svga);
+}
+
+static void
+mach_combo_accel_out_fifo(void *priv, uint16_t port, uint16_t val, int len)
+{
+    mach_t *mach = (mach_t *) priv;
+    svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    mach_log("Accel OUT Combo=%04x, val=%04x, len=%d.\n", port, val, len);
+    mach_accel_out_fifo(mach, svga, dev, port, val, len);
+}
+
+static void
+ati8514_accel_out_fifo(void *priv, uint16_t port, uint16_t val, int len)
+{
+    svga_t *svga = (svga_t *) priv;
+    mach_t *mach = (mach_t *) svga->ext8514;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    mach_accel_out_fifo(mach, svga, dev, port, val, len);
+}
+
+static void
+mach_disable_handlers(mach_t *mach)
+{
+    io_removehandler(0x01ce, 2,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
+    io_removehandler(0x02ea, 4,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
+    io_removehandler(0x03c0, 32, mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
+    mach_io_remove(mach);
+
+    mem_mapping_disable(&mach->mmio_linear_mapping);
+    mem_mapping_disable(&mach->banked_mapping);
+    mem_mapping_disable(&mach->svga.mapping);
+    if (mach->pci_bus && mach->has_bios)
+        mem_mapping_disable(&mach->bios_rom.mapping);
+
+    /* Save all the mappings and the timers because they are part of linked lists. */
+    reset_state->mmio_linear_mapping = mach->mmio_linear_mapping;
+    reset_state->banked_mapping      = mach->banked_mapping;
+    reset_state->svga.mapping        = mach->svga.mapping;
+    reset_state->bios_rom.mapping    = mach->bios_rom.mapping;
+
+    reset_state->svga.timer          = mach->svga.timer;
+}
+
+static void
+mach_reset(void *priv)
+{
+    mach_t *mach = (mach_t *) priv;
+    svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    if (reset_state != NULL) {
+        mach_disable_handlers(mach);
+        mach->force_busy      = 0;
+        dev->force_busy       = 0;
+        dev->force_busy2      = 0;
+        if (mach->pci_bus)
+            reset_state->pci_slot = mach->pci_slot;
+
+        *mach = *reset_state;
+    }
+}
+
 static void *
 mach8_init(const device_t *info)
 {
@@ -6130,6 +6799,7 @@ mach8_init(const device_t *info)
     ibm8514_t *dev;
 
     mach             = calloc(1, sizeof(mach_t));
+    reset_state      = calloc(1, sizeof(mach_t));
 
     svga             = &mach->svga;
     dev              = (ibm8514_t *) calloc(1, sizeof(ibm8514_t));
@@ -6145,6 +6815,7 @@ mach8_init(const device_t *info)
     mach->ramdac_type = mach->pci_bus ? device_get_config_int("ramdac") : 1;
     dev->vram_amount = device_get_config_int("memory");
     dev->vram_512k_8514 = dev->vram_amount == 512;
+    dev->accel.cmd_back = 1;
 
     if ((dev->local & 0xff) >= 0x02) {
         if (mach->pci_bus) {
@@ -6227,8 +6898,12 @@ mach8_init(const device_t *info)
             mach->config1 |= 0x0400;
             svga->clock_gen = device_add(&ati18811_1_device);
         }
+        mem_mapping_add(&mach->banked_mapping, 0, 0, mach32_read, mach32_readw, mach32_readl, mach32_write, mach32_writew, mach32_writel, NULL, MEM_MAPPING_EXTERNAL, mach);
         mem_mapping_add(&mach->mmio_linear_mapping, 0, 0, mach32_ap_readb, mach32_ap_readw, mach32_ap_readl, mach32_ap_writeb, mach32_ap_writew, mach32_ap_writel, NULL, MEM_MAPPING_EXTERNAL, mach);
+        mem_mapping_disable(&mach->banked_mapping);
         mem_mapping_disable(&mach->mmio_linear_mapping);
+
+        mem_mapping_set_handler(&svga->mapping, svga_read, svga_readw, svga_readl, mach32_svga_write, mach32_svga_writew, mach32_svga_writel);
     } else {
         svga_init(info, svga, mach, (512 << 10), /*default: 512kB VGA for 28800-6 + 1MB for Mach8*/
                       mach_recalctimings,
@@ -6240,7 +6915,7 @@ mach8_init(const device_t *info)
         dev->changedvram = calloc((dev->vram_size >> 12) + 1, 1);
         dev->vram_mask   = dev->vram_size - 1;
         video_inform(VIDEO_FLAG_TYPE_8514, &timing_gfxultra_isa);
-        mach->config1 = 0x01 | 0x02 | 0x08 | 0x80;
+        mach->config1 = 0x01 | 0x08 | 0x80;
         if (dev->vram_amount >= 1024)
             mach->config1 |= 0x20;
 
@@ -6296,6 +6971,11 @@ mach8_init(const device_t *info)
     } else
         ati_eeprom_load_mach8_vga(&mach->eeprom, "mach8.nvr");
 
+    dev->accel_out_fifo       = mach_combo_accel_out_fifo;
+    dev->vblank_start         = mach_combo_vblank_start;
+
+    *reset_state = *mach;
+
     return mach;
 }
 
@@ -6315,9 +6995,11 @@ ati8514_init(svga_t *svga, void *ext8514, void *dev8514)
 
     io_sethandler(0x02ea, 4, ati8514_in, NULL, NULL, ati8514_out, NULL, NULL, svga);
     ati8514_io_set(svga);
+    mach->accel.cmd_type = -2;
     mach->mca_bus = !!(dev->type & DEVICE_MCA);
+    dev->accel.cmd_back = 1;
 
-    mach->config1 = 0x02 | 0x08 | 0x80;
+    mach->config1 = 0x08 | 0x80;
 
     if (mach->mca_bus)
         mach->config1 |= 0x04;
@@ -6326,6 +7008,9 @@ ati8514_init(svga_t *svga, void *ext8514, void *dev8514)
         mach->config1 |= 0x20;
 
     mach->config2 = 0x01 | 0x02;
+
+    dev->accel_out_fifo       = ati8514_accel_out_fifo;
+    dev->vblank_start         = ati8514_vblank_start;
 }
 
 static int
@@ -6373,6 +7058,10 @@ mach_close(void *priv)
     }
 
     svga_close(svga);
+
+    free(reset_state);
+    reset_state = NULL;
+
     free(mach);
 }
 
@@ -6479,7 +7168,7 @@ const device_t mach8_vga_isa_device = {
     .local         = 1,
     .init          = mach8_init,
     .close         = mach_close,
-    .reset         = NULL,
+    .reset         = mach_reset,
     .available     = mach8_vga_available,
     .speed_changed = mach_speed_changed,
     .force_redraw  = mach_force_redraw,
@@ -6493,7 +7182,7 @@ const device_t mach32_isa_device = {
     .local         = 2,
     .init          = mach8_init,
     .close         = mach_close,
-    .reset         = NULL,
+    .reset         = mach_reset,
     .available     = mach32_isa_available,
     .speed_changed = mach_speed_changed,
     .force_redraw  = mach_force_redraw,
@@ -6507,7 +7196,7 @@ const device_t mach32_vlb_device = {
     .local         = 2,
     .init          = mach8_init,
     .close         = mach_close,
-    .reset         = NULL,
+    .reset         = mach_reset,
     .available     = mach32_vlb_available,
     .speed_changed = mach_speed_changed,
     .force_redraw  = mach_force_redraw,
@@ -6521,7 +7210,7 @@ const device_t mach32_mca_device = {
     .local         = 2,
     .init          = mach8_init,
     .close         = mach_close,
-    .reset         = NULL,
+    .reset         = mach_reset,
     .available     = mach32_mca_available,
     .speed_changed = mach_speed_changed,
     .force_redraw  = mach_force_redraw,
@@ -6535,7 +7224,7 @@ const device_t mach32_pci_device = {
     .local         = 2,
     .init          = mach8_init,
     .close         = mach_close,
-    .reset         = NULL,
+    .reset         = mach_reset,
     .available     = mach32_pci_available,
     .speed_changed = mach_speed_changed,
     .force_redraw  = mach_force_redraw,
@@ -6549,7 +7238,7 @@ const device_t mach32_onboard_pci_device = {
     .local         = 2 | 0x100,
     .init          = mach8_init,
     .close         = mach_close,
-    .reset         = NULL,
+    .reset         = mach_reset,
     .available     = NULL,
     .speed_changed = mach_speed_changed,
     .force_redraw  = mach_force_redraw,

From 1c98437e664918c05e66e4d664ae061fc0374bb0 Mon Sep 17 00:00:00 2001
From: TC1995 <mariogplayer90@gmail.com>
Date: Sat, 29 Mar 2025 14:49:13 +0100
Subject: [PATCH 24/59] More display changes.

SVGA related:
If CRTC1/HDISP is odd (if bit 0 is set), then make it even accordingly, else leave it as is. Should fix some display skews.

S3 related:
Remove old code references (can still be accessed through history if one needs it).

8514/A compatible related:
Proper use of the htotal and hdisp timings.
---
 src/video/vid_s3.c   | 177 +------------------------------------------
 src/video/vid_svga.c |  10 ++-
 2 files changed, 8 insertions(+), 179 deletions(-)

diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c
index 769cd0001..ef21b18df 100644
--- a/src/video/vid_s3.c
+++ b/src/video/vid_s3.c
@@ -3519,34 +3519,6 @@ s3_recalctimings(svga_t *svga)
         }
     }
 
-#ifdef OLD_CODE_REFERENCE
-    if (s3->card_type == S3_MIROCRYSTAL10SD_805 || s3->card_type == S3_MIROCRYSTAL20SD_864 || s3->card_type == S3_MIROCRYSTAL20SV_964 || s3->card_type == S3_SPEA_MIRAGE_86C801 || s3->card_type == S3_SPEA_MIRAGE_86C805 || s3->card_type == S3_MIROCRYSTAL8S_805 || s3->card_type == S3_NUMBER9_9FX_531 || s3->card_type == S3_SPEA_MERCURY_LITE_PCI) {
-        if (!(svga->crtc[0x5e] & 0x04))
-            svga->vblankstart = svga->dispend;
-        if (svga->bpp != 32) {
-            if (svga->crtc[0x31] & 2)
-                s3->width = 2048;
-            else {
-                if (s3->card_type == S3_MIROCRYSTAL10SD_805) {
-                    if (svga->hdisp == 1280 && s3->width == 1024) {
-                        s3->width = 1280;
-                    }
-                }
-            }
-        } else {
-            if (s3->card_type == S3_NUMBER9_9FX_531) {
-                if ((svga->hdisp == 1600) && (s3->width == 1600))
-                    s3->width = 800;
-            }
-        }
-    } else if (s3->chip == S3_86C928) {
-        if (svga->bpp == 15) {
-            if (s3->width == 800)
-                s3->width = 1024;
-        }
-    }
-#endif
-
     if ((svga->crtc[0x3a] & 0x10) && !svga->lowres) {
         s3_log("BPP=%d, pitch=%d, width=%02x, double?=%x, 16bit?=%d, highres?=%d, "
                "attr=%02x, hdisp=%d.\n", svga->bpp, s3->width, svga->crtc[0x50],
@@ -3665,29 +3637,6 @@ s3_recalctimings(svga_t *svga)
                     default:
                         break;
                 }
-#ifdef OLD_CODE_REFERENCE
-                if (s3->chip != S3_VISION868) {
-                    if (s3->chip == S3_86C928) {
-                        if (s3->width == 2048 || s3->width == 1280 || s3->width == 1600) {
-                            if ((s3->width != 1600) && (svga->dispend == 1024) && (svga->hdisp != 1280))
-                                svga->hdisp <<= 2;
-                            else
-                                svga->hdisp <<= 1;
-                        }
-                    } else if ((s3->chip != S3_86C801) && (s3->chip != S3_86C805) && (s3->chip != S3_TRIO32) && (s3->chip != S3_TRIO64) && (s3->chip != S3_VISION964) && (s3->chip != S3_VISION968)) {
-                        if (s3->width == 1280 || s3->width == 1600)
-                            svga->hdisp <<= 1;
-                    } else if ((s3->card_type == S3_ELSAWIN2KPROX_964) || (s3->card_type == S3_ELSAWIN2KPROX)) {
-                        if (s3->width == 1280 || s3->width == 1600)
-                            svga->hdisp <<= 1;
-                    } else if (s3->card_type == S3_SPEA_MERCURY_P64V) {
-                        if (s3->width == 1280 || s3->width == 1600)
-                            svga->hdisp <<= 1;
-                        }
-                    } else if (s3->card_type == S3_NUMBER9_9FX_771)
-                        svga->hdisp <<= 1;
-                }
-#endif
                 break;
             case 15:
                 svga->render = svga_render_15bpp_highres;
@@ -3856,29 +3805,6 @@ s3_recalctimings(svga_t *svga)
                     default:
                         break;
                 }
-#ifdef OLD_CODE_REFERENCE
-                if ((s3->chip != S3_VISION964) && (s3->card_type != S3_SPEA_MIRAGE_86C801) && (s3->card_type != S3_SPEA_MIRAGE_86C805)) {
-                    if (s3->chip == S3_86C928)
-                        svga->hdisp <<= 1;
-                    else if (s3->chip != S3_VISION968)
-                        svga->hdisp >>= 1;
-                }
-                if ((s3->chip != S3_VISION868) && (s3->chip != S3_TRIO32) && (s3->chip != S3_TRIO64) && (s3->chip != S3_VISION964)) {
-                    if (s3->width == 1280 || s3->width == 1600)
-                        svga->hdisp <<= 1;
-                    else if (s3->card_type == S3_NUMBER9_9FX_771)
-                        svga->hdisp <<= 1;
-                }
-                if (s3->card_type == S3_MIROVIDEO40SV_ERGO_968 || s3->card_type == S3_PHOENIX_VISION968 || s3->card_type == S3_SPEA_MERCURY_P64V) {
-                    if (svga->hdisp == (1408 * 2))
-                        svga->hdisp >>= 1;
-                    else
-                        svga->hdisp = s3->width;
-                }
-
-                if (s3->card_type == S3_SPEA_MIRAGE_86C801 || s3->card_type == S3_SPEA_MIRAGE_86C805 || s3->card_type == S3_SPEA_MERCURY_LITE_PCI)
-                    svga->hdisp = s3->width;
-#endif
                 break;
             case 16:
                 svga->render = svga_render_16bpp_highres;
@@ -4044,35 +3970,6 @@ s3_recalctimings(svga_t *svga)
                     default:
                         break;
                 }
-
-#ifdef OLD_CODE_REFERENCE
-                if ((s3->card_type == S3_ELSAWIN2KPROX_964) || (s3->card_type == S3_ELSAWIN2KPROX)) {
-                    if (s3->width == 1280 || s3->width == 1600)
-                        svga->hdisp <<= 1;
-                }
-                if ((s3->chip != S3_VISION964) && (s3->card_type != S3_SPEA_MIRAGE_86C801) && (s3->card_type != S3_SPEA_MIRAGE_86C805)) {
-                    if (s3->chip == S3_86C928)
-                        svga->hdisp <<= 1;
-                    else if (s3->chip != S3_VISION968)
-                        svga->hdisp >>= 1;
-                } else if ((s3->card_type == S3_SPEA_MIRAGE_86C801) || (s3->card_type == S3_SPEA_MIRAGE_86C805))
-                    svga->hdisp >>= 1;
-                if ((s3->chip != S3_VISION868) && (s3->chip != S3_TRIO32) && (s3->chip != S3_TRIO64) && (s3->chip != S3_VISION964)) {
-                    if (s3->width == 1280 || s3->width == 1600)
-                        svga->hdisp <<= 1;
-                    else if (s3->card_type == S3_NUMBER9_9FX_771)
-                        svga->hdisp <<= 1;
-                }
-                if (s3->card_type == S3_MIROVIDEO40SV_ERGO_968 || s3->card_type == S3_PHOENIX_VISION968 || s3->card_type == S3_SPEA_MERCURY_P64V) {
-                    if (svga->hdisp == (1408 << 1))
-                        svga->hdisp >>= 1;
-                    else
-                        svga->hdisp = s3->width;
-                }
-
-                if (s3->card_type == S3_SPEA_MIRAGE_86C801 || s3->card_type == S3_SPEA_MIRAGE_86C805 || s3->card_type == S3_SPEA_MERCURY_LITE_PCI)
-                    svga->hdisp = s3->width;
-#endif
                 break;
             case 24:
                 svga->render = svga_render_24bpp_highres;
@@ -4150,34 +4047,6 @@ s3_recalctimings(svga_t *svga)
                     default:
                         break;
                 }
-#ifdef OLD_CODE_REFERENCE
-                if (s3->chip != S3_VISION968) {
-                    if (s3->chip != S3_86C928 && s3->chip != S3_86C801 && s3->chip != S3_86C805)
-                        svga->hdisp /= 3;
-                    else
-                        svga->hdisp = (svga->hdisp * 2) / 3;
-
-                    if (s3->card_type == S3_SPEA_MERCURY_LITE_PCI) {
-                        if (s3->width == 2048) {
-                            switch (svga->dispend) {
-                                case 480:
-                                    svga->hdisp = 640;
-                                    break;
-
-                                default:
-                                    break;
-                            }
-                        }
-                    } else if (s3->chip == S3_86C924) {
-                        if (svga->dispend == 480)
-                            svga->hdisp = 640;
-                    }
-                } else {
-                    if ((s3->card_type == S3_MIROVIDEO40SV_ERGO_968) ||
-                        (s3->card_type == S3_PHOENIX_VISION968) || (s3->card_type == S3_SPEA_MERCURY_P64V))
-                        svga->hdisp = s3->width;
-                }
-#endif
                 break;
             case 32:
                 svga->render = svga_render_32bpp_highres;
@@ -4262,48 +4131,6 @@ s3_recalctimings(svga_t *svga)
                     default:
                         break;
                 }
-#ifdef OLD_CODE_REFERENCE
-                if ((s3->chip < S3_TRIO32) && (s3->chip != S3_VISION964) && (s3->chip != S3_VISION968) && (s3->chip != S3_86C928)) {
-                    if (s3->chip == S3_VISION868)
-                        svga->hdisp >>= 1;
-                    else
-                        svga->hdisp >>= 2;
-                }
-                if (s3->width == 1280 || s3->width == 1600 || (s3->card_type == S3_SPEA_MERCURY_P64V || s3->card_type == S3_NUMBER9_9FX_771))
-                    svga->hdisp <<= 1;
-                if (s3->card_type == S3_NUMBER9_9FX_771) {
-                    if (svga->hdisp == 832)
-                        svga->hdisp -= 32;
-                }
-                if (s3->card_type == S3_MIROVIDEO40SV_ERGO_968 || s3->card_type == S3_MIROCRYSTAL20SV_964 || s3->card_type == S3_MIROCRYSTAL20SD_864 || s3->card_type == S3_PHOENIX_VISION968 || s3->card_type == S3_SPEA_MERCURY_P64V) {
-                    svga->hdisp = s3->width;
-                    if (s3->card_type == S3_MIROCRYSTAL20SD_864 || s3->card_type == S3_MIROCRYSTAL20SV_964) {
-                        if (s3->width == 800 || s3->width == 1024 || s3->width == 1600) {
-                            switch (svga->dispend) {
-                                case 400:
-                                case 480:
-                                    svga->hdisp = 640;
-                                    break;
-
-                                case 576:
-                                    if (s3->width == 1600)
-                                        s3->width = 800;
-                                    svga->hdisp = 768;
-                                    break;
-
-                                case 600:
-                                    if (s3->width == 1600)
-                                        s3->width = 800;
-                                    svga->hdisp = 800;
-                                    break;
-
-                                default:
-                                    break;
-                            }
-                        }
-                    }
-                }
-#endif
                 break;
 
             default:
@@ -4362,7 +4189,7 @@ s3_trio64v_recalctimings(svga_t *svga)
         svga->htotal |= 0x100;
     if (svga->crtc[0x5d] & 0x02) {
         svga->hdisp_time |= 0x100;
-        svga->hdisp |= 0x100 * svga->dots_per_clock;
+        svga->hdisp |= (0x100 * svga->dots_per_clock);
     }
     if (svga->crtc[0x5e] & 0x01)
         svga->vtotal |= 0x400;
@@ -4681,6 +4508,7 @@ s3_trio64_getclock(int clock, void *priv)
         return 25175000.0;
     if (clock == 1)
         return 28322000.0;
+
     m  = svga->seqregs[0x13] + 2;
     n1 = (svga->seqregs[0x12] & 0x1f) + 2;
     n2 = ((svga->seqregs[0x12] >> 5) & 0x07);
@@ -9523,7 +9351,6 @@ s3_disable_handlers(s3_t *s3)
     reset_state->bios_rom.mapping = s3->bios_rom.mapping;
 
     reset_state->svga.timer       = s3->svga.timer;
-    reset_state->svga.timer8514   = s3->svga.timer8514;
 
     memset(s3->svga.vram, 0x00, s3->svga.vram_max + 8);
     memset(s3->svga.changedvram, 0x00, (s3->svga.vram_max >> 12) + 1);
diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index c7a65120f..a44838d68 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -739,7 +739,8 @@ svga_recalctimings(svga_t *svga)
     svga->vblankstart++;
 
     svga->hdisp = svga->crtc[1];
-    svga->hdisp++;
+    if (svga->crtc[1] & 1)
+        svga->hdisp++;
 
     svga->htotal = svga->crtc[0];
     /* +5 has been verified by Sergi to be correct - +6 must have been an off by one error. */
@@ -944,7 +945,7 @@ svga_recalctimings(svga_t *svga)
         if (dev->on) {
             uint32_t dot8514 = dev->h_blankstart;
             uint32_t adj_dot8514 = dev->h_blankstart;
-            uint32_t eff_mask8514 = 0x0000003f;
+            uint32_t eff_mask8514 = 0x0000001f;
             dev->hblank_sub = 0;
 
             while (adj_dot8514 < (dev->h_total << 1)) {
@@ -1029,8 +1030,9 @@ svga_recalctimings(svga_t *svga)
 
     if (ibm8514_active && (svga->dev8514 != NULL)) {
         if (dev->on) {
-            disptime8514 = dev->h_total ? dev->h_total : TIMER_USEC;
-            _dispontime8514 = dev->hdisped;
+            disptime8514 = dev->h_total;
+            _dispontime8514 = (dev->hdisped + 1) * 8;
+            svga_log("HDISPED 8514=%d, htotal=%02x.\n", (dev->hdisped + 1) << 3, dev->h_total);
         }
     }
 

From 8cc6f215362436aa72be5b1002ab830058a0602f Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 29 Mar 2025 18:32:41 +0100
Subject: [PATCH 25/59] PB450: Fix the default BIOS selection, fixes
 segmentation fault.

---
 src/machine/m_at_386dx_486.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index 19c4b535e..639233e10 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -691,12 +691,12 @@ static const device_config_t pb450_config[] = {
         .name = "bios",
         .description = "BIOS Version",
         .type = CONFIG_BIOS,
-        .default_string = "pci10a",
+        .default_string = "pb450a",
         .default_int = 0,
         .file_filter = "",
         .spinner = { 0 },
         .bios = {
-            { .name = "PCI 1.0A", .internal_name = "pb450" /*"pci10a"*/, .bios_type = BIOS_NORMAL, 
+            { .name = "PCI 1.0A", .internal_name = "pb450a" /*"pci10a"*/, .bios_type = BIOS_NORMAL, 
               .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pb450/OPTI802.bin", "" } },
             { .name = "PNP 1.1A", .internal_name = "pnp11a", .bios_type = BIOS_NORMAL,
               .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pb450/PNP11A.bin", "" } },
@@ -732,7 +732,7 @@ machine_at_pb450_init(const machine_t *model)
         return ret;
 
     device_context(model->device);
-    fn = device_get_bios_file(model->device, device_get_config_bios("bios"), 0);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
     ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
     device_context_restore();
     

From 99c81fe03d640f06d16682e67ad84110bcfa9406 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 29 Mar 2025 18:36:33 +0100
Subject: [PATCH 26/59] IBM PC/XT/AT and PB450: Remove "Device" from machine
 device_t names.

---
 src/machine/m_at.c           |  4 ++--
 src/machine/m_at_386dx_486.c |  2 +-
 src/machine/m_xt.c           | 12 ++++++------
 src/machine/m_xt_laserxt.c   | 11 +++++++----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/machine/m_at.c b/src/machine/m_at.c
index 3f5e88011..8a561630c 100644
--- a/src/machine/m_at.c
+++ b/src/machine/m_at.c
@@ -187,7 +187,7 @@ static const device_config_t ibmat_config[] = {
 };
 
 const device_t ibmat_device = {
-    .name          = " IBM AT Devices",
+    .name          = "IBM AT",
     .internal_name = "ibmat_device",
     .flags         = 0,
     .local         = 0,
@@ -294,7 +294,7 @@ static const device_config_t ibmxt286_config[] = {
 };
 
 const device_t ibmxt286_device = {
-    .name          = "IBM XT Model 286 Devices",
+    .name          = "IBM XT Model 286",
     .internal_name = "ibmxt286_device",
     .flags         = 0,
     .local         = 0,
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index 639233e10..0ee353f53 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -708,7 +708,7 @@ static const device_config_t pb450_config[] = {
 };
 
 const device_t pb450_device = {
-    .name          = "Packard Bell PB450 Devices",
+    .name          = "Packard Bell PB450",
     .internal_name = "pb450_device",
     .flags         = 0,
     .local         = 0,
diff --git a/src/machine/m_xt.c b/src/machine/m_xt.c
index 78d2daa13..13f9c52ca 100644
--- a/src/machine/m_xt.c
+++ b/src/machine/m_xt.c
@@ -108,7 +108,7 @@ static const device_config_t ibmpc_config[] = {
 };
 
 const device_t ibmpc_device = {
-    .name          = "IBM PC (1981) Device",
+    .name          = "IBM PC (1981)",
     .internal_name = "ibmpc_device",
     .flags         = 0,
     .local         = 0,
@@ -218,7 +218,7 @@ static const device_config_t ibmpc82_config[] = {
 };
 
 const device_t ibmpc82_device = {
-    .name          = "IBM PC (1982) Devices",
+    .name          = "IBM PC (1982)",
     .internal_name = "ibmpc82_device",
     .flags         = 0,
     .local         = 0,
@@ -331,7 +331,7 @@ static const device_config_t ibmxt_config[] = {
 };
 
 const device_t ibmxt_device = {
-    .name          = "IBM XT (1982) Device",
+    .name          = "IBM XT (1982)",
     .internal_name = "ibmxt_device",
     .flags         = 0,
     .local         = 0,
@@ -451,7 +451,7 @@ static const device_config_t ibmxt86_config[] = {
 };
 
 const device_t ibmxt86_device = {
-    .name          = "IBM XT (1986) Device",
+    .name          = "IBM XT (1986)",
     .internal_name = "ibmxt86_device",
     .flags         = 0,
     .local         = 0,
@@ -624,7 +624,7 @@ static const device_config_t jukopc_config[] = {
 };
 
 const device_t jukopc_device = {
-    .name          = "Juko ST Devices",
+    .name          = "Juko ST",
     .internal_name = "jukopc_device",
     .flags         = 0,
     .local         = 0,
@@ -949,7 +949,7 @@ static const device_config_t vendex_config[] = {
 };
 
 const device_t vendex_device = {
-    .name          = "Vendex 888T Devices",
+    .name          = "Vendex 888T",
     .internal_name = "vendex_device",
     .flags         = 0,
     .local         = 0,
diff --git a/src/machine/m_xt_laserxt.c b/src/machine/m_xt_laserxt.c
index 877d26ff5..595cce1ca 100644
--- a/src/machine/m_xt_laserxt.c
+++ b/src/machine/m_xt_laserxt.c
@@ -154,6 +154,8 @@ machine_xt_laserxt_common_init(const machine_t *model,int is_lxt3)
     standalone_gameport_type = &gameport_device;
 
     laserxt_init(is_lxt3);
+
+    device_add(&keyboard_xt_lxt3_device);
 }
 
 int
@@ -167,8 +169,6 @@ machine_xt_laserxt_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    device_add(&keyboard_xt_device);
-
     machine_xt_laserxt_common_init(model, 0);
 
     return ret;
@@ -179,14 +179,17 @@ machine_xt_lxt3_init(const machine_t *model)
 {
     int ret;
 
+#if 0
     ret = bios_load_linear("roms/machines/lxt3/27c64d.bin",
                            0x000fe000, 8192, 0);
+#else
+    ret = bios_load_linear("roms/machines/lxt3/vtech-laser-xt3-bios-v1-26-27c64-637cfbe96dfa1809192278.bin",
+                           0x000fe000, 8192, 0);
+#endif
 
     if (bios_only || !ret)
         return ret;
 
-    device_add(&keyboard_xt_lxt3_device);
-
     machine_xt_laserxt_common_init(model, 1);
 
     return ret;

From c1ecafaeb55e597e068ad61a8a563d5162e81019 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 29 Mar 2025 18:38:20 +0100
Subject: [PATCH 27/59] IBM PS/1 Model 2011: No need to explicitly refer to the
 zeroth element of the config array.

---
 src/machine/m_ps1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/machine/m_ps1.c b/src/machine/m_ps1.c
index 41821a4a8..07128f157 100644
--- a/src/machine/m_ps1.c
+++ b/src/machine/m_ps1.c
@@ -290,7 +290,7 @@ const device_t ps1_2011_device = {
     .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
-    .config        = &ps1_2011_config[0]
+    .config        = &ps1_2011_config
 };
 
 static void

From e48c6c8e8bd631471b45052c69270249e5193baa Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 29 Mar 2025 18:40:27 +0100
Subject: [PATCH 28/59] Laser XT3: No longer use the other BIOS that has not
 yet been committed.

---
 src/machine/m_xt_laserxt.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/machine/m_xt_laserxt.c b/src/machine/m_xt_laserxt.c
index 595cce1ca..c0405f99a 100644
--- a/src/machine/m_xt_laserxt.c
+++ b/src/machine/m_xt_laserxt.c
@@ -179,13 +179,8 @@ machine_xt_lxt3_init(const machine_t *model)
 {
     int ret;
 
-#if 0
     ret = bios_load_linear("roms/machines/lxt3/27c64d.bin",
                            0x000fe000, 8192, 0);
-#else
-    ret = bios_load_linear("roms/machines/lxt3/vtech-laser-xt3-bios-v1-26-27c64-637cfbe96dfa1809192278.bin",
-                           0x000fe000, 8192, 0);
-#endif
 
     if (bios_only || !ret)
         return ret;

From 8b646ccc49a5d6b4f0e7ce9ccf7042d7d89c14f2 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 29 Mar 2025 18:47:21 +0100
Subject: [PATCH 29/59] Fix a compile-breaking mistake in machine/m_ps1.c.

---
 src/machine/m_ps1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/machine/m_ps1.c b/src/machine/m_ps1.c
index 07128f157..c22463de4 100644
--- a/src/machine/m_ps1.c
+++ b/src/machine/m_ps1.c
@@ -290,7 +290,7 @@ const device_t ps1_2011_device = {
     .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
-    .config        = &ps1_2011_config
+    .config        = ps1_2011_config
 };
 
 static void

From b6b840b67ec8f680d69d0672e49b8a0e6fd851df Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 29 Mar 2025 19:54:48 +0100
Subject: [PATCH 30/59] Recognize 8514/a-type cards as (S)VGA for the purposes
 of force 4:3 calculations, fixes blurry picture and wrong resolution.

---
 src/86box.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/86box.c b/src/86box.c
index 2b6e1ba9f..ad1cfc519 100644
--- a/src/86box.c
+++ b/src/86box.c
@@ -1624,6 +1624,8 @@ set_screen_size_monitor(int x, int y, int monitor_index)
 {
     int    temp_overscan_x = monitors[monitor_index].mon_overscan_x;
     int    temp_overscan_y = monitors[monitor_index].mon_overscan_y;
+    int    is_svga         = (video_get_type_monitor(monitor_index) == VIDEO_FLAG_TYPE_SPECIAL) ||
+                             (video_get_type_monitor(monitor_index) == VIDEO_FLAG_TYPE_8514);
     double dx;
     double dy;
     double dtx;
@@ -1657,19 +1659,19 @@ set_screen_size_monitor(int x, int y, int monitor_index)
         dty = (double) temp_overscan_y;
 
         /* Account for possible overscan. */
-        if (video_get_type_monitor(monitor_index) != VIDEO_FLAG_TYPE_SPECIAL && (temp_overscan_y == 16)) {
+        if (!is_svga && (temp_overscan_y == 16)) {
             /* CGA */
             dy = (((dx - dtx) / 4.0) * 3.0) + dty;
-        } else if (video_get_type_monitor(monitor_index) != VIDEO_FLAG_TYPE_SPECIAL && (temp_overscan_y < 16)) {
+        } else if (!is_svga && (temp_overscan_y < 16)) {
             /* MDA/Hercules */
-            dy = (x / 4.0) * 3.0;
+            dy = (dx / 4.0) * 3.0;
         } else {
             if (enable_overscan) {
                 /* EGA/(S)VGA with overscan */
                 dy = (((dx - dtx) / 4.0) * 3.0) + dty;
             } else {
                 /* EGA/(S)VGA without overscan */
-                dy = (x / 4.0) * 3.0;
+                dy = (dx / 4.0) * 3.0;
             }
         }
         monitors[monitor_index].mon_unscaled_size_y = (int) dy;

From 5a4a939e02cca97d9f35d3cf4581a89ed87bc3ac Mon Sep 17 00:00:00 2001
From: TC1995 <mariogplayer90@gmail.com>
Date: Sat, 29 Mar 2025 20:27:20 +0100
Subject: [PATCH 31/59] More fixes to the 8514/A compatible side.

1. Use proper identification to what chips use what.
2. Apply some mode switch fixes to the ATI 8514/A Ultra and make 1024x768 87Hz interlaced the default mode if htotal is 0 and on ati8514_init.
3. Add the undocumented ports to the ATI 8514/A Ultra add-on as well.
---
 src/include/86box/vid_8514a.h |   5 ++
 src/video/vid_8514a.c         |   5 +-
 src/video/vid_ati_mach8.c     | 160 ++++++++++++++++++++--------------
 src/video/vid_svga.c          |   6 +-
 4 files changed, 103 insertions(+), 73 deletions(-)

diff --git a/src/include/86box/vid_8514a.h b/src/include/86box/vid_8514a.h
index 153bface4..a467311ca 100644
--- a/src/include/86box/vid_8514a.h
+++ b/src/include/86box/vid_8514a.h
@@ -250,4 +250,9 @@ typedef struct ibm8514_t {
 
 } ibm8514_t;
 
+#define IBM_8514A (((dev->local & 0xff) == 0x00) && (dev->extensions == 0x00))
+#define ATI_8514A_ULTRA (((dev->local & 0xff) == 0x00) && (dev->extensions == 0x01))
+#define ATI_GRAPHICS_ULTRA ((dev->local & 0xff) == 0x01)
+#define ATI_MACH32 ((dev->local & 0xff) == 0x02)
+
 #endif /*VIDEO_8514A_H*/
diff --git a/src/video/vid_8514a.c b/src/video/vid_8514a.c
index efb05a307..df4cd7d9a 100644
--- a/src/video/vid_8514a.c
+++ b/src/video/vid_8514a.c
@@ -3846,10 +3846,7 @@ ibm8514_recalctimings(svga_t *svga)
             else
                 svga->clock8514 = (cpuclock * (double) (1ULL << 32)) / 25175000.0;
 
-            if (dev->dispend == 766)
-                dev->dispend += 2;
-
-            if (dev->dispend == 478)
+            if ((dev->dispend == 478) || (dev->dispend == 766))
                 dev->dispend += 2;
 
             if (dev->interlace)
diff --git a/src/video/vid_ati_mach8.c b/src/video/vid_ati_mach8.c
index 9f1bb99d6..ba32dc129 100644
--- a/src/video/vid_ati_mach8.c
+++ b/src/video/vid_ati_mach8.c
@@ -2250,7 +2250,7 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
     if (((addr & 0xFFF0) == 0x3D0 || (addr & 0xFFF0) == 0x3B0) && !(svga->miscout & 1))
         addr ^= 0x60;
 
-    if (((dev->disp_cntl & 0x60) == 0x20) && ((dev->local & 0xff) >= 0x02)) {
+    if (((dev->disp_cntl & 0x60) == 0x20) && ATI_MACH32) {
         if ((addr >= 0x3c6) && (addr <= 0x3c9)) {
             mach_log("VGA DAC write regs=%03x, on=%d, display control=%02x, on1=%x, clocksel=%02x.\n",
                      addr, dev->on, dev->disp_cntl & 0x60, dev->accel.advfunc_cntl & 0x01, mach->accel.clock_sel & 0x01);
@@ -2281,7 +2281,7 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
                     }
                     break;
                 case 0xad:
-                    if ((dev->local & 0xff) >= 0x02) {
+                    if (ATI_MACH32) {
                         if ((old ^ val) & 0x0c) {
                             mach_log("ATI AD bits 2-3.\n");
                             svga_recalctimings(svga);
@@ -2301,14 +2301,14 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
                     if (mach->regs[0xbe] & 0x08) { /* Read/write bank mode */
                         mach->bank_r = (((mach->regs[0xb2] & 1) << 3) | ((mach->regs[0xb2] & 0xe0) >> 5));
                         mach->bank_w = ((mach->regs[0xb2] & 0x1e) >> 1);
-                        if ((dev->local & 0xff) >= 0x02) {
+                        if (ATI_MACH32) {
                             mach->bank_r |= ((mach->regs[0xae] & 0x0c) << 2);
                             mach->bank_w |= ((mach->regs[0xae] & 3) << 4);
                         }
                         mach_log("Separate B2Bank = %02x, AEbank = %02x.\n", mach->regs[0xb2], mach->regs[0xae]);
                     } else { /* Single bank mode */
                         mach->bank_w = ((mach->regs[0xb2] & 0x1e) >> 1);
-                        if ((dev->local & 0xff) >= 0x02)
+                        if (ATI_MACH32)
                             mach->bank_w |= ((mach->regs[0xae] & 3) << 4);
 
                         mach->bank_r = mach->bank_w;
@@ -2338,7 +2338,7 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
                     }
                     break;
                 case 0xb8:
-                    if ((dev->local & 0xff) >= 0x02) {
+                    if (ATI_MACH32) {
                         if ((old ^ val) & 0x40) {
                             mach_log("ATI B8 bit 6.\n");
                             svga_recalctimings(svga);
@@ -2367,7 +2367,7 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
             rs2 = !!(mach->accel.ext_ge_config & 0x1000);
             rs3 = !!(mach->accel.ext_ge_config & 0x2000);
             mach_log("8514/A RS2=%d, RS3=%d, addr=%03x.\n", rs2, rs3, addr);
-            if ((dev->local & 0xff) >= 0x02) {
+            if (ATI_MACH32) {
                 if (mach->regs[0xb0] & 0x20) { /*ATI extended 8514/A mode.*/
                     mach_log("Extended 8514/A mode.\n");
                     dev->vendor_mode = 1;
@@ -2394,7 +2394,7 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
             rs2 = !!(mach->regs[0xa0] & 0x20);
             rs3 = !!(mach->regs[0xa0] & 0x40);
             mach_log("VGA RS2=%d, RS3=%d, addr=%03x.\n", rs2, rs3, addr);
-            if ((dev->local & 0xff) >= 0x02) {
+            if (ATI_MACH32) {
                 if (svga->attrregs[0x10] & 0x40) {
                     mach_log("VGA mode.\n");
                     dev->vendor_mode = 0;
@@ -2495,7 +2495,7 @@ mach_in(uint16_t addr, void *priv)
                 case 0xb0:
                     temp = mach->regs[0xb0] | 0x80;
                     temp &= ~0x18;
-                    if ((dev->local & 0xff) >= 0x02) { /*Mach32 VGA 1MB memory*/
+                    if (ATI_MACH32) { /*Mach32 VGA 1MB memory*/
                         temp |= 0x08;
                     } else { /*ATI 28800 VGA 512kB memory*/
                         temp |= 0x10;
@@ -2524,7 +2524,7 @@ mach_in(uint16_t addr, void *priv)
         case 0x2ed:
             rs2 = !!(mach->accel.ext_ge_config & 0x1000);
             rs3 = !!(mach->accel.ext_ge_config & 0x2000);
-            if ((dev->local & 0xff) >= 0x02) {
+            if (ATI_MACH32) {
                 if (dev->on)
                     temp = svga_in(addr, svga);
                 else {
@@ -2669,6 +2669,9 @@ mach_set_resolution(mach_t *mach, svga_t *svga)
     ibm8514_t    *dev  = (ibm8514_t *) svga->dev8514;
 
     dev->hdisp = (dev->hdisped + 1) << 3;
+    if (!dev->htotal) /*Default to 1024x768 87hz 8514/A htotal timings if it goes to 0.*/
+        dev->htotal = 0x9d;
+
     dev->h_total = dev->htotal + 1;
 
     dev->vdisp = (dev->v_disp + 1) >> 1;
@@ -2693,6 +2696,16 @@ mach_set_resolution(mach_t *mach, svga_t *svga)
                 dev->vdisp = 480;
                 svga_recalctimings(svga);
             }
+        } else {
+            if (ATI_8514A_ULTRA) {
+                if (dev->accel.advfunc_cntl & 0x04) {
+                    if (dev->hdisp == 640) {
+                        dev->hdisp = 1024;
+                        dev->vdisp = 768;
+                        svga_recalctimings(svga);
+                    }
+                }
+            }
         }
     }
 }
@@ -2712,7 +2725,7 @@ ati8514_recalctimings(svga_t *svga)
         dev->accel.ge_offset            = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
         mach->accel.ge_offset           = dev->accel.ge_offset;
 
-        mach_log("HDISP=%d, VDISP=%d, shadowset=%x, 8514/A mode=%x, clocksel=%02x.\n",
+        pclog("HDISP=%d, VDISP=%d, shadowset=%x, 8514/A mode=%x, clocksel=%02x.\n",
                  dev->hdisp, dev->vdisp, mach->shadow_set & 0x03, dev->accel.advfunc_cntl & 0x05, mach->accel.clock_sel & 0x01);
 
         dev->h_disp = dev->hdisp;
@@ -2756,7 +2769,7 @@ mach_recalctimings(svga_t *svga)
 
     clock_sel = ((svga->miscout >> 2) & 3) | ((mach->regs[0xbe] & 0x10) >> 1) | ((mach->regs[0xb9] & 2) << 1);
 
-    if ((dev->local & 0xff) >= 0x02) {
+    if (ATI_MACH32) {
         if (mach->regs[0xad] & 0x04)
             svga->ma_latch |= 0x40000;
 
@@ -2785,7 +2798,7 @@ mach_recalctimings(svga_t *svga)
     } else
         svga->packed_4bpp = 0;
 
-    if ((dev->local & 0xff) < 0x02) {
+    if (!ATI_MACH32) {
         if ((mach->regs[0xb6] & 0x18) == 0x08) {
             svga->hdisp <<= 1;
             svga->htotal <<= 1;
@@ -2823,7 +2836,7 @@ mach_recalctimings(svga_t *svga)
         if (dev->interlace)
             dev->dispend >>= 1;
 
-        if ((dev->local & 0xff) >= 0x02) {
+        if (ATI_MACH32) {
             mach_log("cntl=%d, clksel=%x, hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x, shadow=%x interlace=%d, vgahdisp=%d.\n",
                      dev->accel.advfunc_cntl & 0x04, mach->accel.clock_sel & 0x01, dev->h_disp, dev->dispend, dev->pitch, dev->rowoffset,
                      mach->accel.ext_ge_config & 0xcec0, mach->shadow_set & 3, dev->interlace, svga->hdisp);
@@ -2913,7 +2926,7 @@ mach_recalctimings(svga_t *svga)
                 if ((svga->gdcreg[5] & 0x40) || (svga->attrregs[0x10] & 0x40) || (mach->regs[0xb0] & 0x20)) {
                     svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock(clock_sel, svga->clock_gen);
                     mach_log("VGA clock=%02x.\n", mach->regs[0xa7] & 0x80);
-                    if ((dev->local & 0xff) >= 0x02) {
+                    if (ATI_MACH32) {
                         if (mach->regs[0xb8] & 0x40)
                             svga->clock *= 2;
                     } else {
@@ -2960,7 +2973,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 
     switch (port) {
         case 0x2e8:
-            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
                 if (!(mach->shadow_cntl & 0x04))
                     dev->htotal = val;
 
@@ -2969,7 +2982,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             break;
 
         case 0xae8:
-            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
                 if (!(mach->shadow_cntl & 0x04)) {
                     WRITE8(port, dev->hsync_start, val);
                 }
@@ -2978,7 +2991,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             break;
 
         case 0xee8:
-            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
                 if (!(mach->shadow_cntl & 0x04)) {
                     WRITE8(port, dev->hsync_width, val);
                 }
@@ -2995,14 +3008,17 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
         case 0x6e8:
             if (len == 2) {
                 mach_log("HDISP and HTOTAL=%04x, len=%d, set=%x, ATI mode bit=%x.\n", val, len, mach->shadow_set & 0x03, mach->accel.clock_sel & 0x01);
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
-                    if (!(mach->shadow_cntl & 0x08)) {
-                        WRITE8(port, dev->hdisped, val);
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                        if (!(mach->shadow_cntl & 0x08)) {
+                            WRITE8(port, dev->hdisped, val);
+                        }
                     }
 
-                    if (!(mach->shadow_cntl & 0x04))
-                        dev->htotal = (val >> 8) & 0xff;
-
+                    if (ATI_8514A_ULTRA) {
+                        if (!(mach->shadow_cntl & 0x04))
+                            dev->htotal = (val >> 8) & 0xff;
+                    }
                     mach_set_resolution(mach, svga);
                 }
             } else {
@@ -3029,7 +3045,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
         case 0x6e9:
             if (len == 1) {
                 mach_log("HDISP and HTOTAL+1=%02x, len=%d, set=%x, ATI mode bit=%x.\n", val, len, mach->shadow_set & 0x03, mach->accel.clock_sel & 0x01);
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
                     if (!(mach->shadow_cntl & 0x04)) {
                         dev->htotal = val;
                     }
@@ -3040,7 +3056,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 
         case 0x12e8:
             if (len == 2) {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
                     if (!(mach->shadow_cntl & 0x10)) {
                         dev->v_total_reg = val;
                         dev->v_total_reg &= 0x1fff;
@@ -3048,7 +3064,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                     mach_set_resolution(mach, svga);
                 }
             } else {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
                     if (!(mach->shadow_cntl & 0x10)) {
                         WRITE8(port, dev->v_total_reg, val);
                         dev->v_total_reg &= 0x1fff;
@@ -3061,7 +3077,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 
         case 0x12e9:
             if (len == 1) {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) {
                     if (!(mach->shadow_cntl & 0x10)) { /*For 8514/A mode, take the shadow sets into account.*/
                         WRITE8(port, dev->v_total_reg, val);
                         dev->v_total_reg &= 0x1fff;
@@ -3109,7 +3125,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 
         case 0x1ae8:
             if (len == 2) {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) {
                     if (!(mach->shadow_cntl & 0x10)) { /*For 8514/A mode, take the shadow sets into account.*/
                         dev->v_sync_start = val;
                         dev->v_sync_start &= 0x1fff;
@@ -3119,7 +3135,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                 mach_log("ATI 8514/A: V_SYNCSTART write 1AE8 = %d\n", dev->v_syncstart);
                 mach_log("ATI 8514/A: (0x%04x): vsyncstart=0x%02x.\n", port, val);
             } else {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) {
                     if (!(mach->shadow_cntl & 0x10)) { /*For 8514/A mode, take the shadow sets into account.*/
                         WRITE8(port, dev->v_sync_start, val);
                         dev->v_sync_start &= 0x1fff;
@@ -3130,7 +3146,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             break;
         case 0x1ae9:
             if (len == 1) {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) {
                     if (!(mach->shadow_cntl & 0x10)) { /*For 8514/A mode, take the shadow sets into account.*/
                         WRITE8(port, dev->v_sync_start, val);
                         dev->v_sync_start &= 0x1fff;
@@ -3181,12 +3197,12 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             mach_log("[%04X:%08X]: ATI 8514/A: (0x%04x): ON=%d, shadow crt=%x, hdisp=%d, vdisp=%d.\n",
                      CS, cpu_state.pc, port, val & 0x01, dev->accel.advfunc_cntl & 0x04, dev->hdisp, dev->vdisp);
 
-            if ((dev->local & 0xff) < 0x02) {
-                dev->ext_crt_pitch = 128;
-                mach_set_resolution(mach, svga);
-            } else {
+            if (ATI_MACH32) {
                 mach_set_resolution(mach, svga);
                 mach32_updatemapping(mach, svga);
+            } else {
+                dev->ext_crt_pitch = 128;
+                mach_set_resolution(mach, svga);
             }
             mach_log("Vendor IBM mode set %s resolution.\n", (dev->accel.advfunc_cntl & 0x04) ? "2: 1024x768" : "1: 640x480");
             break;
@@ -3390,7 +3406,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             ibm8514_accel_out_fifo(svga, port, val, len);
             if (len == 2) {
                 if ((dev->accel.multifunc_cntl >> 12) == 5) {
-                    if ((dev->local & 0xff) < 0x02)
+                    if (!ATI_MACH32)
                         dev->ext_crt_pitch = 128;
                 }
             }
@@ -3514,12 +3530,12 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                 else
                     dev->ext_crt_pitch <<= 1;
             }
-            if ((dev->local & 0xff) >= 0x02) {
+            if (ATI_MACH32) {
                 dev->on |= 0x01;
                 dev->vendor_mode = 1;
             }
             svga_recalctimings(svga);
-            if ((dev->local & 0xff) >= 0x01)
+            if (ATI_GRAPHICS_ULTRA || ATI_MACH32)
                 mach32_updatemapping(mach, svga);
 
             mach_log("ATI 8514/A: (0x%04x) CRT Pitch, val=0x%02x, crtpitch=%x, len=%d, extended 8514/A mode=%02x.\n", port, val, dev->ext_crt_pitch, len, mach->regs[0xb0] & 0x20);
@@ -3548,17 +3564,17 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             else {
                 WRITE8(port, mach->local_cntl, val);
             }
-            if ((dev->local & 0xff) >= 0x01)
+            if (ATI_GRAPHICS_ULTRA || ATI_MACH32)
                 mach32_updatemapping(mach, svga);
             break;
 
         case 0x36ee:
         case 0x36ef:
             if (len == 2) {
-                if ((dev->local & 0xff) >= 0x02)
+                if (ATI_MACH32)
                     mach->misc = val;
             } else {
-                if ((dev->local & 0xff) >= 0x02)
+                if (ATI_MACH32)
                     WRITE8(port, mach->misc, val);
             }
             mach->misc &= 0xfff0;
@@ -3621,7 +3637,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             mach_log("Vendor ATI mode set %s resolution.\n",
                      (dev->accel.advfunc_cntl & 0x04) ? "2: 1024x768" : "1: 640x480");
             svga_recalctimings(svga);
-            if ((dev->local & 0xff) >= 0x01)
+            if (ATI_GRAPHICS_ULTRA || ATI_MACH32)
                 mach32_updatemapping(mach, svga);
             break;
 
@@ -3675,7 +3691,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             if (!mach->pci_bus)
                 mach->linear_base = (mach->memory_aperture & 0xff00) << 12;
 
-            if ((dev->local & 0xff) >= 0x01)
+            if (ATI_GRAPHICS_ULTRA || ATI_MACH32)
                 mach32_updatemapping(mach, svga);
             break;
 
@@ -3729,7 +3745,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             else {
                 WRITE8(port, mach->accel.ext_ge_config, val);
             }
-            if ((dev->local & 0xff) >= 0x02) {
+            if (ATI_MACH32) {
                 if (mach->accel.crt_pitch & 0xff)
                     dev->ext_crt_pitch = mach->accel.crt_pitch & 0xff;
 
@@ -4407,46 +4423,46 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
 
         case 0xdaee:
             if (len == 2) {
-                if ((dev->local & 0xff) >= 0x02)
+                if (ATI_MACH32)
                     temp = mach->accel.src_x;
             } else {
-                if ((dev->local & 0xff) >= 0x02)
+                if (ATI_MACH32)
                     temp = mach->accel.src_x & 0xff;
             }
             break;
         case 0xdaef:
             if (len == 1) {
-                if ((dev->local & 0xff) >= 0x02)
+                if (ATI_MACH32)
                     temp = mach->accel.src_x >> 8;
             }
             break;
 
         case 0xdeee:
             if (len == 2) {
-                if ((dev->local & 0xff) >= 0x02)
+                if (ATI_MACH32)
                     temp = mach->accel.src_y;
             } else {
-                if ((dev->local & 0xff) >= 0x02)
+                if (ATI_MACH32)
                     temp = mach->accel.src_y & 0xff;
             }
             break;
         case 0xdeef:
             if (len == 1) {
-                if ((dev->local & 0xff) >= 0x02)
+                if (ATI_MACH32)
                     temp = mach->accel.src_y >> 8;
             }
             break;
 
         case 0xfaee:
             if (len == 2) {
-                if ((dev->local & 0xff) >= 0x02) {
+                if (ATI_MACH32) {
                     if (mach->pci_bus)
                         temp = 0x0017;
                     else
                         temp = 0x22f7;
                 }
             } else {
-                if ((dev->local & 0xff) >= 0x02) {
+                if (ATI_MACH32) {
                     if (mach->pci_bus)
                         temp = 0x17;
                     else
@@ -4456,7 +4472,7 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
         case 0xfaef:
             if (len == 1) {
-                if ((dev->local & 0xff) >= 0x02) {
+                if (ATI_MACH32) {
                     if (mach->pci_bus)
                         temp = 0x00;
                     else
@@ -4604,7 +4620,7 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
 
         case 0x36ee:
         case 0x36ef:
-            if ((dev->local & 0xff) >= 0x02) {
+            if (ATI_MACH32) {
                 READ8(port, mach->misc);
                 if (!(port & 1)) {
                     temp &= ~0x0c;
@@ -5148,7 +5164,7 @@ mach32_write(uint32_t addr, uint8_t val, void *priv)
             return;
     }
 
-    if ((((dev->local & 0xff) >= 0x02) && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+    if ((ATI_MACH32 && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
         addr <<= 1;
         switch (addr & 0x06) {
             case 0x00:
@@ -5188,7 +5204,7 @@ mach32_writew(uint32_t addr, uint16_t val, void *priv)
             return;
     }
 
-    if ((((dev->local & 0xff) >= 0x02) && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+    if ((ATI_MACH32 && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
         addr <<= 1;
         if (addr & 0x04) {
             mach32_write_common(addr - 2, val & 0x0f, 0, mach, svga);
@@ -5223,7 +5239,7 @@ mach32_writel(uint32_t addr, uint32_t val, void *priv)
             return;
     }
 
-    if ((((dev->local & 0xff) >= 0x02) && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+    if ((ATI_MACH32 && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
         addr <<= 1;
         mach32_write_common(addr, val & 0x0f, 0, mach, svga);
         mach32_write_common(addr + 1, (val >> 4) & 0x0f, 0, mach, svga);
@@ -5639,7 +5655,7 @@ mach32_read(uint32_t addr, void *priv)
     (void) xga_read_test(addr, svga);
     addr = (addr & svga->banked_mask) + svga->read_bank;
 
-    if ((((dev->local & 0xff) >= 0x02) && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+    if ((ATI_MACH32 && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
         addr <<= 1;
         switch (addr & 0x06) {
             case 0x00:
@@ -5676,7 +5692,7 @@ mach32_readw(uint32_t addr, void *priv)
     (void) xga_read_test(addr, svga);
     addr = (addr & svga->banked_mask) + svga->read_bank;
 
-    if ((((dev->local & 0xff) >= 0x02) && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+    if ((ATI_MACH32 && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
         addr <<= 1;
         if (addr & 0x04) {
             ret = mach32_read_common(addr - 2, 0, mach, svga) & 0x0f;
@@ -5708,7 +5724,7 @@ mach32_readl(uint32_t addr, void *priv)
     (void) xga_read_test(addr, svga);
     addr = (addr & svga->banked_mask) + svga->read_bank;
 
-    if ((((dev->local & 0xff) >= 0x02) && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+    if ((ATI_MACH32 && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
         addr <<= 1;
         ret = mach32_read_common(addr, 0, mach, svga) & 0x0f;
         ret |= (mach32_read_common(addr + 1, 0, mach, svga) << 4);
@@ -5998,7 +6014,7 @@ mach32_updatemapping(mach_t *mach, svga_t *svga)
             case 0xC: /*32k at B8000*/
                 mem_mapping_set_addr(&svga->mapping, 0xb8000, 0x08000);
                 svga->banked_mask = 0x7fff;
-                if (((dev->local & 0xff) >= 0x02) && !(dev->accel.advfunc_cntl & 0x01) && !(mach->accel.clock_sel & 0x01)) {
+                if (ATI_MACH32 && !(dev->accel.advfunc_cntl & 0x01) && !(mach->accel.clock_sel & 0x01)) {
                     if ((svga->gdcreg[6] & 0x01) || (svga->attrregs[0x10] & 0x01)) {
                         if (svga->attrregs[0x10] & 0x40) {
                             dev->vendor_mode = 0;
@@ -6035,7 +6051,7 @@ mach32_updatemapping(mach_t *mach, svga_t *svga)
         mem_mapping_disable(&mach->mmio_linear_mapping);
     }
 
-    if ((dev->local & 0xff) >= 0x02) {
+    if (ATI_MACH32) {
         if (dev->on && dev->vendor_mode) {
             mach_log("Mach32 banked mapping.\n");
             mem_mapping_disable(&svga->mapping);
@@ -6216,6 +6232,7 @@ ati8514_io_set(svga_t *svga)
     io_sethandler(0x7eee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0x82ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0x86ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
+    io_sethandler(0x8aee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0x8eee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0x92ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0x96ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
@@ -6238,6 +6255,7 @@ ati8514_io_set(svga_t *svga)
     io_sethandler(0xdeee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0xe2ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0xe6ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
+    io_sethandler(0xeaee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0xeeee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0xf2ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0xf6ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
@@ -6331,6 +6349,7 @@ mach_io_remove(mach_t *mach)
     io_removehandler(0x7eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_removehandler(0x82ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_removehandler(0x86ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x8aee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_removehandler(0x8eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_removehandler(0x92ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_removehandler(0x96ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
@@ -6353,6 +6372,7 @@ mach_io_remove(mach_t *mach)
     io_removehandler(0xdeee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_removehandler(0xe2ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_removehandler(0xe6ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xeaee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_removehandler(0xeeee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_removehandler(0xf2ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_removehandler(0xf6ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
@@ -6817,7 +6837,7 @@ mach8_init(const device_t *info)
     dev->vram_512k_8514 = dev->vram_amount == 512;
     dev->accel.cmd_back = 1;
 
-    if ((dev->local & 0xff) >= 0x02) {
+    if (ATI_MACH32) {
         if (mach->pci_bus) {
             if (mach->has_bios) {
                 rom_init(&mach->bios_rom,
@@ -6852,7 +6872,7 @@ mach8_init(const device_t *info)
                  0xc0000, 0x8000, 0x7fff,
                  0, MEM_MAPPING_EXTERNAL);
 
-    if ((dev->local & 0xff) >= 0x02) {
+    if (ATI_MACH32) {
         svga_init(info, svga, mach, dev->vram_amount << 10, /*default: 2MB for Mach32*/
                       mach_recalctimings,
                       mach_in, mach_out,
@@ -6940,7 +6960,7 @@ mach8_init(const device_t *info)
     mach_io_set(mach);
     mach->accel.cmd_type = -2;
 
-    if ((dev->local & 0xff) >= 0x02) {
+    if (ATI_MACH32) {
         svga->decode_mask     = (4 << 20) - 1;
         mach->cursor_col_1    = 0xff;
         mach->ext_cur_col_1_r = 0xff;
@@ -6985,13 +7005,21 @@ ati8514_init(svga_t *svga, void *ext8514, void *dev8514)
     mach_t *mach = (mach_t *) ext8514;
     ibm8514_t *dev = (ibm8514_t *) dev8514;
 
+    /*Init as 1024x768 87hz interlaced first, per 8514/A.*/
     dev->on = 0;
     dev->ext_pitch = 1024;
     dev->ext_crt_pitch = 0x80;
     dev->accel_bpp = 8;
     dev->rowoffset = 0x80;
-    dev->hdisp = 1024;
-    dev->vdisp = 768;
+    dev->hdisped = 0x7f;
+    dev->v_disp = 0x05ff;
+    dev->htotal = 0x9d;
+    dev->v_total_reg = 0x0668;
+    dev->v_sync_start = 0x0600;
+    dev->disp_cntl = 0x33;
+    mach->accel.clock_sel = 0x1c;
+    mach->shadow_set = 0x02;
+    mach->resolution_crt = 0x02;
 
     io_sethandler(0x02ea, 4, ati8514_in, NULL, NULL, ati8514_out, NULL, NULL, svga);
     ati8514_io_set(svga);
diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index a44838d68..8d1535dda 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -904,7 +904,7 @@ svga_recalctimings(svga_t *svga)
         svga->recalctimings_ex(svga);
 
     if (ibm8514_active && (svga->dev8514 != NULL)) {
-        if ((dev->local & 0xff) == 0x00)
+        if (IBM_8514A || ATI_8514A_ULTRA)
             ibm8514_recalctimings(svga);
     }
 
@@ -1031,8 +1031,8 @@ svga_recalctimings(svga_t *svga)
     if (ibm8514_active && (svga->dev8514 != NULL)) {
         if (dev->on) {
             disptime8514 = dev->h_total;
-            _dispontime8514 = (dev->hdisped + 1) * 8;
-            svga_log("HDISPED 8514=%d, htotal=%02x.\n", (dev->hdisped + 1) << 3, dev->h_total);
+            _dispontime8514 = dev->h_disp;
+            svga_log("HTOTAL=%d, HDISP=%d.\n", dev->h_total, dev->h_disp);
         }
     }
 

From ef588c118a1123161a8ee3ba7790c58686627487 Mon Sep 17 00:00:00 2001
From: TC1995 <mariogplayer90@gmail.com>
Date: Sat, 29 Mar 2025 20:36:00 +0100
Subject: [PATCH 32/59] Fixed log excess.

---
 src/video/vid_8514a.c     | 4 ++--
 src/video/vid_ati_mach8.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/video/vid_8514a.c b/src/video/vid_8514a.c
index df4cd7d9a..393b90b57 100644
--- a/src/video/vid_8514a.c
+++ b/src/video/vid_8514a.c
@@ -357,13 +357,13 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
 
         case 0xae8:
             WRITE8(port, dev->hsync_start, val);
-            pclog("IBM 8514/A compatible: (0x%04x): val=0x%02x, hsync_start=%d.\n", port, val, (val + 1) << 3);
+            ibm8514_log("IBM 8514/A compatible: (0x%04x): val=0x%02x, hsync_start=%d.\n", port, val, (val + 1) << 3);
             svga_recalctimings(svga);
             break;
 
         case 0xee8:
             WRITE8(port, dev->hsync_width, val);
-            pclog("IBM 8514/A compatible: (0x%04x): val=0x%02x, hsync_width=%d, hsyncpol=%02x.\n", port, val & 0x1f, ((val & 0x1f) + 1) << 3, val & 0x20);
+            ibm8514_log("IBM 8514/A compatible: (0x%04x): val=0x%02x, hsync_width=%d, hsyncpol=%02x.\n", port, val & 0x1f, ((val & 0x1f) + 1) << 3, val & 0x20);
             svga_recalctimings(svga);
             break;
 
diff --git a/src/video/vid_ati_mach8.c b/src/video/vid_ati_mach8.c
index ba32dc129..c21730497 100644
--- a/src/video/vid_ati_mach8.c
+++ b/src/video/vid_ati_mach8.c
@@ -2725,7 +2725,7 @@ ati8514_recalctimings(svga_t *svga)
         dev->accel.ge_offset            = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
         mach->accel.ge_offset           = dev->accel.ge_offset;
 
-        pclog("HDISP=%d, VDISP=%d, shadowset=%x, 8514/A mode=%x, clocksel=%02x.\n",
+        mach_log("HDISP=%d, VDISP=%d, shadowset=%x, 8514/A mode=%x, clocksel=%02x.\n",
                  dev->hdisp, dev->vdisp, mach->shadow_set & 0x03, dev->accel.advfunc_cntl & 0x05, mach->accel.clock_sel & 0x01);
 
         dev->h_disp = dev->hdisp;

From eeab2fe4090a75999bfdedb6ded9f4c82371ffbc Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 29 Mar 2025 20:56:06 +0100
Subject: [PATCH 33/59] NE2000 Compatibles: Store the UI correctly.

---
 src/network/net_ne2000.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/net_ne2000.c b/src/network/net_ne2000.c
index 71e5c2ca7..e45b55b22 100644
--- a/src/network/net_ne2000.c
+++ b/src/network/net_ne2000.c
@@ -1071,7 +1071,7 @@ nic_init(const device_t *info)
             mac_oui          = (((int) dev->maclocal[0]) << 16);
             mac_oui         |= (((int) dev->maclocal[1]) << 8);
             mac_oui         |= ((int) dev->maclocal[2]);
-            device_set_config_mac("mac", mac);
+            device_set_config_mac("mac_oui", mac_oui);
         } else {
             dev->maclocal[0] = (mac_oui >> 16) & 0xff;
             dev->maclocal[1] = (mac_oui >> 8) & 0xff;

From 90464f7914d9d2ea0e99541f2729f2787e9d6c51 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sun, 30 Mar 2025 03:12:55 +0200
Subject: [PATCH 34/59] OKI IF386AX: Default NVR to 0x00's instead of 0xFF's,
 in order to default it to CRT instead of LCD.

---
 src/device/serial.c          |  3 +--
 src/machine/m_at_286_386sx.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/device/serial.c b/src/device/serial.c
index 8483f7fe3..deb97225a 100644
--- a/src/device/serial.c
+++ b/src/device/serial.c
@@ -999,8 +999,7 @@ void
 serial_standalone_init(void)
 {
     while (next_inst < SERIAL_MAX)
-        device_add_inst(!strcmp(machine_get_internal_name(), "if386sx") ? &ns16450_device :
-                        &ns8250_device, next_inst + 1);
+        device_add_inst(&ns8250_device, next_inst + 1);
 };
 
 const device_t ns8250_device = {
diff --git a/src/machine/m_at_286_386sx.c b/src/machine/m_at_286_386sx.c
index 033233955..b084bfbbd 100644
--- a/src/machine/m_at_286_386sx.c
+++ b/src/machine/m_at_286_386sx.c
@@ -653,7 +653,9 @@ machine_at_if386sx_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
+    device_add(&amstrad_megapc_nvr_device); /* NVR that is initialized to all 0x00's. */
+
     device_add(&keyboard_at_phoenix_device);
 
     device_add(&neat_sx_device);
@@ -663,6 +665,12 @@ machine_at_if386sx_init(const machine_t *model)
     if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_at_device);
 
+    /*
+       One serial port - on the real hardware IF386AX, it is on the VL 16C451,
+       alognside the bidirectional parallel port.
+     */
+    device_add_inst(&ns16450_device, 1);
+
     return ret;
 }
 

From 19e01b8ddfb318f892c6f49859d63d19e9d74e2b Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sun, 30 Mar 2025 03:40:08 +0200
Subject: [PATCH 35/59] UI: Optimize several Settings pages to reduce the
 amount of iterations and repeated calls to functions where multiple there are
 multiple instances of the same device type, should further speed up te
 opening of the Settings dialog.

---
 src/qt/qt_settingsnetwork.cpp            | 78 +++++++++++++-----------
 src/qt/qt_settingsotherperipherals.cpp   | 56 ++++++++++-------
 src/qt/qt_settingsports.cpp              | 59 +++++++++++-------
 src/qt/qt_settingssound.cpp              | 63 ++++++++++---------
 src/qt/qt_settingsstoragecontrollers.cpp | 55 ++++++++++-------
 5 files changed, 184 insertions(+), 127 deletions(-)

diff --git a/src/qt/qt_settingsnetwork.cpp b/src/qt/qt_settingsnetwork.cpp
index a0acd7a3f..9a53411d5 100644
--- a/src/qt/qt_settingsnetwork.cpp
+++ b/src/qt/qt_settingsnetwork.cpp
@@ -137,54 +137,63 @@ SettingsNetwork::onCurrentMachineChanged(int machineId)
 {
     this->machineId = machineId;
 
-    int c           = 0;
-    int selectedRow = 0;
+    int                 c                           = 0;
+    int                 selectedRow                 = 0;
 
-    for (int i = 0; i < NET_CARD_MAX; ++i) {
-        auto *cbox       = findChild<QComboBox *>(QString("comboBoxNIC%1").arg(i + 1));
-        auto *model      = cbox->model();
-        auto  removeRows = model->rowCount();
-        c                = 0;
-        selectedRow      = 0;
+    // Network Card
+    QComboBox *         cbox_[NET_CARD_MAX]         = { 0 };
+    QAbstractItemModel *models[NET_CARD_MAX]        = { 0 };
+    int                 removeRows_[NET_CARD_MAX]   = { 0 };
+    int                 selectedRows[NET_CARD_MAX]  = { 0 };
+    int                 m_has_net                   = machine_has_flags(machineId, MACHINE_NIC);
 
-        while (true) {
-            /* Skip "internal" if machine doesn't have it or this is not the primary card. */
-            if ((c == 1) && ((i > 0) || (machine_has_flags(machineId, MACHINE_NIC) == 0))) {
-                c++;
-                continue;
-            }
+    for (uint8_t i = 0; i < NET_CARD_MAX; ++i) {
+        cbox_[i]       = findChild<QComboBox *>(QString("comboBoxNIC%1").arg(i + 1));
+        models[i]      = cbox_[i]->model();
+        removeRows_[i] = models[i]->rowCount();
+    }
 
-            auto name = DeviceConfig::DeviceName(network_card_getdevice(c), network_card_get_internal_name(c), 1);
-            if (name.isEmpty()) {
-                break;
-            }
+    c = 0;
+    while (true) {
+        const QString name = DeviceConfig::DeviceName(network_card_getdevice(c),
+                                                      network_card_get_internal_name(c), 1);
 
-            if (network_card_available(c) && device_is_valid(network_card_getdevice(c), machineId)) {
-                int row = Models::AddEntry(model, name, c);
-                if (c == net_cards_conf[i].device_num) {
-                    selectedRow = row - removeRows;
+        if (name.isEmpty())
+            break;
+
+        if (network_card_available(c)) {
+            if (device_is_valid(network_card_getdevice(c), machineId)) {
+                for (uint8_t i = 0; i < NET_CARD_MAX; ++i) {
+                    if ((c != 1) || ((i == 0) && m_has_net)) {
+                        int row = Models::AddEntry(models[i], name, c);
+
+                        if (c == net_cards_conf[i].device_num)
+                            selectedRows[i] = row - removeRows_[i];
+                    }
                 }
             }
-            c++;
         }
 
-        model->removeRows(0, removeRows);
-        cbox->setEnabled(model->rowCount() > 0);
-        cbox->setCurrentIndex(-1);
-        cbox->setCurrentIndex(selectedRow);
+       c++;
+    }
 
-        cbox       = findChild<QComboBox *>(QString("comboBoxNet%1").arg(i + 1));
-        model      = cbox->model();
-        removeRows = model->rowCount();
+    for (uint8_t i = 0; i < NET_CARD_MAX; ++i) {
+        models[i]->removeRows(0, removeRows_[i]);
+        cbox_[i]->setEnabled(models[i]->rowCount() > 1);
+        cbox_[i]->setCurrentIndex(-1);
+        cbox_[i]->setCurrentIndex(selectedRows[i]);
+
+        auto cbox       = findChild<QComboBox *>(QString("comboBoxNet%1").arg(i + 1));
+        auto model      = cbox->model();
+        auto removeRows = model->rowCount();
         Models::AddEntry(model, tr("Null Driver"), NET_TYPE_NONE);
         Models::AddEntry(model, "SLiRP", NET_TYPE_SLIRP);
 
-        if (network_ndev > 1) {
+        if (network_ndev > 1)
             Models::AddEntry(model, "PCap", NET_TYPE_PCAP);
-        }
-        if (network_devmap.has_vde) {
+
+        if (network_devmap.has_vde)
             Models::AddEntry(model, "VDE", NET_TYPE_VDE);
-        }
         
         model->removeRows(0, removeRows);
         cbox->setCurrentIndex(cbox->findData(net_cards_conf[i].net_type));
@@ -205,6 +214,7 @@ SettingsNetwork::onCurrentMachineChanged(int machineId)
             model->removeRows(0, removeRows);
             cbox->setCurrentIndex(selectedRow);
         }  
+
         if (net_cards_conf[i].net_type == NET_TYPE_VDE) {
             QString currentVdeSocket = net_cards_conf[i].host_dev_name;
             auto editline = findChild<QLineEdit *>(QString("socketVDENIC%1").arg(i+1));
diff --git a/src/qt/qt_settingsotherperipherals.cpp b/src/qt/qt_settingsotherperipherals.cpp
index a7db551ad..b780dc1a6 100644
--- a/src/qt/qt_settingsotherperipherals.cpp
+++ b/src/qt/qt_settingsotherperipherals.cpp
@@ -83,31 +83,45 @@ SettingsOtherPeripherals::onCurrentMachineChanged(int machineId)
     ui->comboBoxRTC->setCurrentIndex(selectedRow);
     ui->pushButtonConfigureRTC->setEnabled((isartc_type != 0) && isartc_has_config(isartc_type) && machineHasIsa);
 
-    for (int c = 0; c < ISAMEM_MAX; c++) {
-        auto *cbox  = findChild<QComboBox *>(QString("comboBoxCard%1").arg(c + 1));
-        model       = cbox->model();
-        d           = 0;
-        selectedRow = 0;
-        while (true) {
-            QString name = DeviceConfig::DeviceName(isamem_get_device(d), isamem_get_internal_name(d), 0);
-            if (name.isEmpty()) {
-                break;
-            }
+    // ISA Memory Expansion Card
+    QComboBox *         cbox[ISAMEM_MAX]         = { 0 };
+    QAbstractItemModel *models[ISAMEM_MAX]       = { 0 };
+    int                 removeRows_[ISAMEM_MAX]  = { 0 };
+    int                 selectedRows[ISAMEM_MAX] = { 0 };
 
-            if (!device_is_valid(isamem_get_device(d), machineId)) {
-                break;
-            }
+    for (uint8_t c = 0; c < ISAMEM_MAX; ++c) {
+        cbox[c]        = findChild<QComboBox *>(QString("comboBoxCard%1").arg(c + 1));
+        models[c]      = cbox[c]->model();
+        removeRows_[c] = models[c]->rowCount();
+    }
 
-            int row = Models::AddEntry(model, name, d);
-            if (d == isamem_type[c]) {
-                selectedRow = row;
+    d = 0;
+    while (true) {
+        const QString name = DeviceConfig::DeviceName(isamem_get_device(d),
+                                                      isamem_get_internal_name(d), 0);
+
+        if (name.isEmpty())
+            break;
+
+        if (device_is_valid(isamem_get_device(d), machineId)) {
+            for (uint8_t c = 0; c < ISAMEM_MAX; ++c) {
+                int row = Models::AddEntry(models[c], name, d);
+
+                if (d == isamem_type[c])
+                    selectedRows[c] = row - removeRows_[c];
             }
-            ++d;
         }
-        cbox->setCurrentIndex(-1);
-        cbox->setCurrentIndex(selectedRow);
-        cbox->setEnabled(machineHasIsa);
-        findChild<QPushButton *>(QString("pushButtonConfigureCard%1").arg(c + 1))->setEnabled((isamem_type[c] != 0) && isamem_has_config(isamem_type[c]) && machineHasIsa);
+
+       d++;
+    }
+
+    for (uint8_t c = 0; c < ISAMEM_MAX; ++c) {
+        models[c]->removeRows(0, removeRows_[c]);
+        cbox[c]->setEnabled(models[c]->rowCount() > 1);
+        cbox[c]->setCurrentIndex(-1);
+        cbox[c]->setCurrentIndex(selectedRows[c]);
+        findChild<QPushButton *>(QString("pushButtonConfigureCard%1").arg(c + 1))->setEnabled((isamem_type[c] != 0) &&
+                                isamem_has_config(isamem_type[c]) && machineHasIsa);
     }
 }
 
diff --git a/src/qt/qt_settingsports.cpp b/src/qt/qt_settingsports.cpp
index cb1ab794a..f68106dc9 100644
--- a/src/qt/qt_settingsports.cpp
+++ b/src/qt/qt_settingsports.cpp
@@ -73,34 +73,49 @@ SettingsPorts::onCurrentMachineChanged(int machineId)
 {
     this->machineId = machineId;
 
-    for (int i = 0; i < PARALLEL_MAX; i++) {
-        auto *cbox            = findChild<QComboBox *>(QString("comboBoxLpt%1").arg(i + 1));
-        auto *model           = cbox->model();
-        const auto removeRows = model->rowCount();
-        int   c               = 0;
-        int   selectedRow     = 0;
-        while (true) {
-            const char *lptName = lpt_device_get_name(c);
-            if (lptName == nullptr) {
-                break;
-            }
+    int                 c                          = 0;
 
-            int row = Models::AddEntry(model, tr(lptName), c);
-            if (c == lpt_ports[i].device) {
-                selectedRow = row - removeRows;
-            }
-            c++;
+    // LPT Device
+    QComboBox *         cbox[PARALLEL_MAX]         = { 0 };
+    QAbstractItemModel *models[PARALLEL_MAX]       = { 0 };
+    int                 removeRows_[PARALLEL_MAX]  = { 0 };
+    int                 selectedRows[PARALLEL_MAX] = { 0 };
+
+    for (uint8_t i = 0; i < PARALLEL_MAX; ++i) {
+        cbox[i]        = findChild<QComboBox *>(QString("comboBoxLpt%1").arg(i + 1));
+        models[i]      = cbox[i]->model();
+        removeRows_[i] = models[i]->rowCount();
+    }
+
+    while (true) {
+        const char    *lptName = lpt_device_get_name(c);
+
+        if (lptName == nullptr)
+            break;
+
+        const QString  name    = tr(lptName);
+
+        for (uint8_t i = 0; i < PARALLEL_MAX; ++i) {
+            int row = Models::AddEntry(models[i], name, c);
+
+            if (c == lpt_ports[i].device)
+                selectedRows[i] = row - removeRows_[i];
         }
-        model->removeRows(0, removeRows);
-        cbox->setEnabled(model->rowCount() > 0);
-        cbox->setCurrentIndex(-1);
-        cbox->setCurrentIndex(selectedRow);
+
+       c++;
+    }
+
+    for (uint8_t i = 0; i < PARALLEL_MAX; ++i) {
+        models[i]->removeRows(0, removeRows_[i]);
+        cbox[i]->setEnabled(models[i]->rowCount() > 1);
+        cbox[i]->setCurrentIndex(-1);
+        cbox[i]->setCurrentIndex(selectedRows[i]);
 
         auto *checkBox = findChild<QCheckBox *>(QString("checkBoxParallel%1").arg(i + 1));
         if (checkBox != NULL)
             checkBox->setChecked(lpt_ports[i].enabled > 0);
-        if (cbox != NULL)
-            cbox->setEnabled(lpt_ports[i].enabled > 0);
+        if (cbox[i] != NULL)
+            cbox[i]->setEnabled(lpt_ports[i].enabled > 0);
     }
 
     for (int i = 0; i < SERIAL_MAX; i++) {
diff --git a/src/qt/qt_settingssound.cpp b/src/qt/qt_settingssound.cpp
index cca903076..3e1240888 100644
--- a/src/qt/qt_settingssound.cpp
+++ b/src/qt/qt_settingssound.cpp
@@ -73,46 +73,51 @@ SettingsSound::onCurrentMachineChanged(const int machineId)
 {
     this->machineId = machineId;
 
-    int c;
-    int selectedRow;
+    int                 c;
+    int                 selectedRow;
 
     // Sound Card
+    QComboBox *         cbox[SOUND_CARD_MAX]         = { 0 };
+    QAbstractItemModel *models[SOUND_CARD_MAX]       = { 0 };
+    int                 removeRows_[SOUND_CARD_MAX]  = { 0 };
+    int                 selectedRows[SOUND_CARD_MAX] = { 0 };
+    int                 m_has_snd                    = machine_has_flags(machineId, MACHINE_SOUND);
+
     for (uint8_t i = 0; i < SOUND_CARD_MAX; ++i) {
-        QComboBox *cbox = findChild<QComboBox *>(QString("comboBoxSoundCard%1").arg(i + 1));
-        c               = 0;
-        auto model      = cbox->model();
-        auto removeRows = model->rowCount();
-        selectedRow     = 0;
+        cbox[i]        = findChild<QComboBox *>(QString("comboBoxSoundCard%1").arg(i + 1));
+        models[i]      = cbox[i]->model();
+        removeRows_[i] = models[i]->rowCount();
+    }
 
-        while (true) {
-            /* Skip "internal" if machine doesn't have it or this is not the primary card. */
-            if ((c == 1) && ((i > 0) || (machine_has_flags(machineId, MACHINE_SOUND) == 0))) {
-                c++;
-                continue;
-            }
+    c               = 0;
+    while (true) {
+        const QString name = DeviceConfig::DeviceName(sound_card_getdevice(c),
+                                                      sound_card_get_internal_name(c), 1);
 
-            const QString name = DeviceConfig::DeviceName(sound_card_getdevice(c), sound_card_get_internal_name(c), 1);
-            if (name.isEmpty()) {
-                break;
-            }
+        if (name.isEmpty())
+            break;
 
-            if (sound_card_available(c)) {
-                const device_t *sound_dev = sound_card_getdevice(c);
-                if (device_is_valid(sound_dev, machineId)) {
-                    int row = Models::AddEntry(model, name, c);
-                    if (c == sound_card_current[i]) {
-                        selectedRow = row - removeRows;
+        if (sound_card_available(c)) {
+            if (device_is_valid(sound_card_getdevice(c), machineId)) {
+                for (uint8_t i = 0; i < SOUND_CARD_MAX; ++i) {
+                    if ((c != 1) || ((i == 0) && m_has_snd)) {
+                        int row = Models::AddEntry(models[i], name, c);
+
+                        if (c == sound_card_current[i])
+                            selectedRows[i] = row - removeRows_[i];
                     }
                 }
             }
-
-            c++;
         }
 
-        model->removeRows(0, removeRows);
-        cbox->setEnabled(model->rowCount() > 0);
-        cbox->setCurrentIndex(-1);
-        cbox->setCurrentIndex(selectedRow);
+       c++;
+    }
+
+    for (uint8_t i = 0; i < SOUND_CARD_MAX; ++i) {
+        models[i]->removeRows(0, removeRows_[i]);
+        cbox[i]->setEnabled(models[i]->rowCount() > 1);
+        cbox[i]->setCurrentIndex(-1);
+        cbox[i]->setCurrentIndex(selectedRows[i]);
     }
 
     // Midi Out
diff --git a/src/qt/qt_settingsstoragecontrollers.cpp b/src/qt/qt_settingsstoragecontrollers.cpp
index 4adfe1546..eebed79e2 100644
--- a/src/qt/qt_settingsstoragecontrollers.cpp
+++ b/src/qt/qt_settingsstoragecontrollers.cpp
@@ -171,35 +171,48 @@ SettingsStorageControllers::onCurrentMachineChanged(int machineId)
     ui->comboBoxCDInterface->setCurrentIndex(-1);
     ui->comboBoxCDInterface->setCurrentIndex(selectedRow);
 
+    // SCSI Card
+    QComboBox *         cbox[SCSI_CARD_MAX]         = { 0 };
+    QAbstractItemModel *models[SCSI_CARD_MAX]       = { 0 };
+    int                 removeRows_[SCSI_CARD_MAX]  = { 0 };
+    int                 selectedRows[SCSI_CARD_MAX] = { 0 };
+    int                 m_has_scsi                  = machine_has_flags(machineId, MACHINE_SCSI);
+
     for (uint8_t i = 0; i < SCSI_CARD_MAX; ++i) {
-        QComboBox *cbox = findChild<QComboBox *>(QString("comboBoxSCSI%1").arg(i + 1));
-        c               = 0;
-        model           = cbox->model();
-        removeRows      = model->rowCount();
-        selectedRow     = 0;
+        cbox[i]        = findChild<QComboBox *>(QString("comboBoxSCSI%1").arg(i + 1));
+        models[i]      = cbox[i]->model();
+        removeRows_[i] = models[i]->rowCount();
+    }
 
-        while (true) {
-            QString name = DeviceConfig::DeviceName(scsi_card_getdevice(c), scsi_card_get_internal_name(c), 1);
-            if (name.isEmpty()) {
-                break;
-            }
+    c = 0;
+    while (true) {
+        const QString name = DeviceConfig::DeviceName(scsi_card_getdevice(c),
+                                                      scsi_card_get_internal_name(c), 1);
 
-            if (scsi_card_available(c)) {
-                const device_t *scsi_dev = scsi_card_getdevice(c);
-                if (device_is_valid(scsi_dev, machineId)) {
-                    int row = Models::AddEntry(model, name, c);
-                    if (c == scsi_card_current[i]) {
-                        selectedRow = row - removeRows;
+        if (name.isEmpty())
+            break;
+
+        if (scsi_card_available(c)) {
+            if (device_is_valid(scsi_card_getdevice(c), machineId)) {
+                for (uint8_t i = 0; i < SCSI_CARD_MAX; ++i) {
+                    if ((c != 1) || ((i == 0) && m_has_scsi)) {
+                        int row = Models::AddEntry(models[i], name, c);
+
+                        if (c == scsi_card_current[i])
+                            selectedRows[i] = row - removeRows_[i];
                     }
                 }
             }
-            c++;
         }
 
-        model->removeRows(0, removeRows);
-        cbox->setEnabled(model->rowCount() > 0);
-        cbox->setCurrentIndex(-1);
-        cbox->setCurrentIndex(selectedRow);
+       c++;
+    }
+
+    for (uint8_t i = 0; i < SCSI_CARD_MAX; ++i) {
+        models[i]->removeRows(0, removeRows_[i]);
+        cbox[i]->setEnabled(models[i]->rowCount() > 1);
+        cbox[i]->setCurrentIndex(-1);
+        cbox[i]->setCurrentIndex(selectedRows[i]);
     }
 
     int is_at = IS_AT(machineId);

From 3fc6d29462a2f3bf6e5c7ecf79ca423e9f5ebb33 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sun, 30 Mar 2025 04:53:48 +0200
Subject: [PATCH 36/59] JEGA/JVGA: Only update renderer override on master, do
 not update CRTC cursor location unless it's either master or slave, and only
 override the text mode renderer - fixes AX Windows 3.0 386 enhanced mode
 returning from DOS box to full screen.

---
 src/video/vid_ega.c         |  5 +----
 src/video/vid_ega_render.c  |  5 +++++
 src/video/vid_jega.c        | 39 +++++++++++++++++++++++++++----------
 src/video/vid_svga.c        |  6 ++----
 src/video/vid_svga_render.c | 10 ++++++++++
 5 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c
index f002ef999..5b5427b9e 100644
--- a/src/video/vid_ega.c
+++ b/src/video/vid_ega.c
@@ -783,10 +783,7 @@ ega_poll(void *priv)
             ega->y_add *= ega->vres + 1;
             for (y = 0; y <= ega->vres; y++) {
                 /* Render scanline */
-                if (ega->render_override)
-                    ega->render_override(ega->priv_parent);
-                else
-                    ega->render(ega);
+                ega->render(ega);
 
                 /* Render overscan */
                 ega->x_add = (overscan_x >> 1);
diff --git a/src/video/vid_ega_render.c b/src/video/vid_ega_render.c
index 10667084a..8a73ffbbb 100644
--- a/src/video/vid_ega_render.c
+++ b/src/video/vid_ega_render.c
@@ -107,6 +107,11 @@ ega_render_overscan_right(ega_t *ega)
 void
 ega_render_text(ega_t *ega)
 {
+    if (ega->render_override) {
+        ega->render_override(ega->priv_parent);
+        return;
+    }
+
     if ((ega->displine + ega->y_add) < 0)
         return;
 
diff --git a/src/video/vid_jega.c b/src/video/vid_jega.c
index 11c9cbf8d..a238fbff9 100644
--- a/src/video/vid_jega.c
+++ b/src/video/vid_jega.c
@@ -464,21 +464,40 @@ jega_out(uint16_t addr, uint8_t val, void *priv)
         case 0x3d5:
             /* Data */
             if (jega->regs_index != RINVALID_INDEX) {
+                if ((jega->regs_index < 7) && (jega->regs[0x11] & 0x80))
+                    return;
+                if ((jega->regs_index == 7) && (jega->regs[0x11] & 0x80))
+                    val = (jega->regs[7] & ~0x10) | (val & 0x10);
+                /*
+                   Do not allow cursor updates if neither master nor slave is
+                   active - the AX Windows 3.0 386 Enhanced Mode DOS grabber
+                   relies on this for the cursor position to behave correctly.
+                 */
+                if ((jega->regs_index >= 0x0e) && (jega->regs_index <= 0x0f) && !(jega->regs[RMOD1] & 0x0c))
+                    return;
                 jega->regs[jega->regs_index] = val;
                 jega_log("JEGA Out %04X(%02X) %02Xh(%d) %04X:%04X\n", addr, jega->regs_index, val, val, cs >> 4, cpu_state.pc);
                 switch (jega->regs_index) {
                     case RMOD1:
                         /* if the value is changed */
-                        if (jega->is_vga) {
-                            if (val & 0x40)
-                                jega->vga.svga.render_override = NULL;
-                            else
-                                jega->vga.svga.render_override = jega_render_text;
-                        } else {
-                            if (val & 0x40)
-                                jega->ega.render_override = NULL;
-                            else
-                                jega->ega.render_override = jega_render_text;
+                        /*
+                           Do not allow override toggling unless it's on master and
+                           only override the text renderer - the AX Windows 3.0 386
+                           Enhanced Mode DOS grabber relies on this for the grabbing
+                           to behave correctly.
+                         */
+                        if (val & 0x08) {
+                            if (jega->is_vga) {
+                                if (val & 0x40)
+                                    jega->vga.svga.render_override = NULL;
+                                else
+                                    jega->vga.svga.render_override = jega_render_text;
+                            } else {
+                                if (val & 0x40)
+                                    jega->ega.render_override = NULL;
+                                else
+                                    jega->ega.render_override = jega_render_text;
+                            }
                         }
                         break;
                     case RDAGS:
diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index 8d1535dda..b4abc18e5 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -1176,10 +1176,7 @@ svga_do_render(svga_t *svga)
     }
 
     if (!svga->override) {
-        if (svga->render_override)
-            svga->render_override(svga->priv_parent);
-        else
-            svga->render(svga);
+        svga->render(svga);
 
         svga->x_add = (svga->monitor->mon_overscan_x >> 1);
         svga_render_overscan_left(svga);
@@ -2019,6 +2016,7 @@ svga_doblit(int wx, int wy, svga_t *svga)
 
         /* Block resolution changes while in DPMS mode to avoid getting a bogus
            screen width (320). We're already rendering a blank screen anyway. */
+        pclog("%i + %i, %i + %i\n", svga->monitor->mon_xsize, x_add, svga->monitor->mon_ysize, y_add);
         if (!svga->dpms)
             set_screen_size_monitor(svga->monitor->mon_xsize + x_add, svga->monitor->mon_ysize + y_add, svga->monitor_index);
 
diff --git a/src/video/vid_svga_render.c b/src/video/vid_svga_render.c
index c05d308fa..fbd667a1b 100644
--- a/src/video/vid_svga_render.c
+++ b/src/video/vid_svga_render.c
@@ -147,6 +147,11 @@ svga_render_text_40(svga_t *svga)
     int       bg;
     uint32_t  addr = 0;
 
+    if (svga->render_override) {
+        svga->render_override(svga->priv_parent);
+        return;
+    }
+
     if ((svga->displine + svga->y_add) < 0)
         return;
 
@@ -225,6 +230,11 @@ svga_render_text_80(svga_t *svga)
     int       bg;
     uint32_t  addr = 0;
 
+    if (svga->render_override) {
+        svga->render_override(svga->priv_parent);
+        return;
+    }
+
     if ((svga->displine + svga->y_add) < 0)
         return;
 

From e4877a57c52e81cace94e7e025352a9d1a0dca03 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sun, 30 Mar 2025 07:28:20 +0200
Subject: [PATCH 37/59] EGA/JEGA: More fixes and implemented more C&T SuperEGA
 behavior.

---
 src/video/vid_ega.c  | 97 ++++++++++++++++++++++++++++++++------------
 src/video/vid_jega.c |  3 +-
 2 files changed, 72 insertions(+), 28 deletions(-)

diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c
index 5b5427b9e..82c88d827 100644
--- a/src/video/vid_ega.c
+++ b/src/video/vid_ega.c
@@ -61,14 +61,38 @@ int update_overscan = 0;
 
 uint8_t ega_in(uint16_t addr, void *priv);
 
+static int
+ega_get_type(ega_t *ega)
+{
+    int ret = ega_type;
+
+    if (ega->actual_type == EGA_SUPEREGA)
+        ret = (ega->crtc[0x17] & 0x10) ? EGA_TYPE_OTHER : EGA_TYPE_IBM;
+
+    return ret;
+}
+
+static int
+ega_get_actual_type(ega_t *ega)
+{
+    int ret = ega->actual_type;
+
+    if (ega->actual_type == EGA_SUPEREGA)
+        ret = (ega->crtc[0x17] & 0x10) ? EGA_SUPEREGA : EGA_IBM;
+
+    return ret;
+}
+
 void
 ega_out(uint16_t addr, uint8_t val, void *priv)
 {
     ega_t  *ega = (ega_t *) priv;
     uint8_t o;
     uint8_t old;
-    uint8_t gdcmask  = (ega->actual_type == EGA_SUPEREGA) ? 0xff : 0x0f;
-    uint8_t crtcmask = (ega->actual_type == EGA_SUPEREGA) ? 0xff : 0x1f;
+    int     type     = ega_get_type(ega);
+    int     atype    = ega_get_actual_type(ega);
+    uint8_t gdcmask  = (atype == EGA_SUPEREGA) ? 0xff : 0x0f;
+    uint8_t crtcmask = (atype == EGA_SUPEREGA) ? 0xff : 0x1f;
 
     if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(ega->miscout & 1))
         addr ^= 0x60;
@@ -94,7 +118,7 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
 
         case 0x3c0:
         case 0x3c1:
-            if (ega->actual_type == EGA_SUPEREGA)
+            if (atype == EGA_SUPEREGA)
                 val &= 0x7f; /* Bit 7 indicates the flipflop status (read only) */
             if (!ega->attrff) {
                 ega->attraddr = val & 31;
@@ -110,7 +134,8 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
                 ega->attrregs[ega->attraddr & 31] = val;
                 if (ega->attraddr < 16)
                     ega->fullchange = changeframecount;
-                if (ega->attraddr == 0x10 || ega->attraddr == 0x14 || ega->attraddr < 0x10) {
+                int is_attr14 = ega->chipset && (ega->attraddr == 0x14);
+                if ((ega->attraddr == 0x10) || is_attr14 || (ega->attraddr < 0x10)) {
                     for (uint8_t c = 0; c < 16; c++) {
                         if (ega->chipset) {
                             if (ega->attrregs[0x10] & 0x80)
@@ -148,7 +173,7 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
             if (!(val & 1))
                 io_sethandler(0x03a0, 0x0020, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
             ega_recalctimings(ega);
-            if ((ega_type == EGA_TYPE_COMPAQ) && !(val & 0x02))
+            if ((type == EGA_TYPE_COMPAQ) && !(val & 0x02))
                 mem_mapping_disable(&ega->mapping);
             else  switch (ega->gdcreg[6] & 0xc) {
                 case 0x0: /*128k at A0000*/
@@ -198,7 +223,7 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
             }
             break;
         case 0x3c6:
-            if (ega_type == EGA_TYPE_COMPAQ)
+            if (type == EGA_TYPE_COMPAQ)
                 ega->ctl_mode = val;
             break;
         case 0x3ce:
@@ -219,7 +244,7 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
                     ega->chain2_read = val & 0x10;
                     break;
                 case 6:
-                    if ((ega_type == EGA_TYPE_COMPAQ) && !(ega->miscout & 0x02))
+                    if ((type == EGA_TYPE_COMPAQ) && !(ega->miscout & 0x02))
                         mem_mapping_disable(&ega->mapping);
                     else  switch (val & 0xc) {
                         case 0x0: /*128k at A0000*/
@@ -306,6 +331,8 @@ ega_in(uint16_t addr, void *priv)
     ega_t  *ega = (ega_t *) priv;
     uint8_t gdcmask = (ega->actual_type == EGA_SUPEREGA) ? 0xff : 0x0f;
     uint8_t ret     = 0xff;
+    int     type    = ega_get_type(ega);
+    int     atype   = ega_get_actual_type(ega);
 
     if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(ega->miscout & 1))
         addr ^= 0x60;
@@ -329,48 +356,58 @@ ega_in(uint16_t addr, void *priv)
             break;
 
         case 0x3c0:
-            if (ega_type == EGA_TYPE_OTHER)
-                ret = ega->attraddr | ega->attr_palette_enable;
-            if (ega->actual_type == EGA_SUPEREGA && ega->attrff)
-                    ret |= 0x80; /* Bit 7 indicates the flipflop status (read only) */
-            break;
         case 0x3c1:
-            if (ega_type == EGA_TYPE_OTHER)
-                ret = ega->attrregs[ega->attraddr];
+            if (type == EGA_TYPE_OTHER) {
+                int data = (atype == EGA_SUPEREGA) ? (ega->attrff & 1) : (addr & 1);
+                if (data)
+                    ret = ega->attrregs[ega->attraddr];
+                else
+                    ret = ega->attraddr | ega->attr_palette_enable;
+                if (atype == EGA_SUPEREGA)
+                    /* Bit 7 indicates the flipflop status (read only) */
+                    ret = (ret & 0x3f) | (ega->attrff ? 0x80 : 0x00);
+            }
             break;
         case 0x3c2:
             ret = (egaswitches & (8 >> egaswitchread)) ? 0x10 : 0x00;
             break;
         case 0x3c4:
-            if (ega_type == EGA_TYPE_OTHER)
+            if (type == EGA_TYPE_OTHER)
                 ret = ega->seqaddr;
             break;
         case 0x3c5:
-            if (ega_type == EGA_TYPE_OTHER)
-                ret = ega->seqregs[ega->seqaddr & 0xf];
+            if (type == EGA_TYPE_OTHER) {
+                if ((ega->seqaddr & 0x0f) > 0x04)
+                    ret = ega->chipset ? ega->seqregs[ega->seqaddr & 0xf] : 0xff;
+                else
+                    ret = ega->seqregs[ega->seqaddr & 0xf];
+            }
             break;
         case 0x3c6:
-            if (ega_type == EGA_TYPE_COMPAQ)
+            if (type == EGA_TYPE_COMPAQ)
                 ret = ega->ctl_mode;
             break;
         case 0x3c8:
-            if (ega_type == EGA_TYPE_OTHER)
+            if (type == EGA_TYPE_OTHER)
                 ret = 2;
             break;
         case 0x3cc:
-            if (ega_type == EGA_TYPE_OTHER)
+            if (type == EGA_TYPE_OTHER)
                 ret = ega->miscout;
             break;
         case 0x3ce:
-            if (ega_type == EGA_TYPE_OTHER)
+            if (type == EGA_TYPE_OTHER)
                 ret = ega->gdcaddr;
             break;
         case 0x3cf:
-            if (ega_type == EGA_TYPE_OTHER) {
+            if (type == EGA_TYPE_OTHER) {
                 switch (ega->gdcaddr & gdcmask) {
                     default:
                         ret = ega->gdcreg[ega->gdcaddr & gdcmask];
                         break;
+                    case 0x09 ... 0xf7:
+                        ret = ega->chipset ? ega->gdcreg[ega->gdcaddr & gdcmask] : 0xff;
+                        break;
                     case 0xf8:
                         ret = ega->la;
                         break;
@@ -388,8 +425,14 @@ ega_in(uint16_t addr, void *priv)
             break;
         case 0x3d0:
         case 0x3d4:
-            if (ega_type == EGA_TYPE_OTHER)
+            if (type == EGA_TYPE_OTHER) {
                 ret = ega->crtcreg;
+                if (atype == EGA_SUPEREGA) {
+                    ret = (ret & 0x1f) | 0xc0;
+                    if ((ega->crtcreg & 0xc0) == 0xc0)
+                        ret |= 0x20;
+                }
+            }
             break;
         case 0x3d1:
         case 0x3d5:
@@ -402,28 +445,28 @@ ega_in(uint16_t addr, void *priv)
                     break;
 
                 case 0x10:
-                    if (ega_type == EGA_TYPE_OTHER)
+                    if (type == EGA_TYPE_OTHER)
                         ret = ega->crtc[ega->crtcreg];
                     else
                         ret = ega->light_pen >> 8;
                     break;
 
                 case 0x11:
-                    if (ega_type == EGA_TYPE_OTHER)
+                    if (type == EGA_TYPE_OTHER)
                         ret = ega->crtc[ega->crtcreg];
                     else
                         ret = ega->light_pen & 0xff;
                     break;
 
                 default:
-                    if (ega_type == EGA_TYPE_OTHER)
+                    if (type == EGA_TYPE_OTHER)
                         ret = ega->crtc[ega->crtcreg];
                     break;
             }
             break;
         case 0x3da:
             ega->attrff = 0;
-            if (ega_type == EGA_TYPE_COMPAQ) {
+            if (type == EGA_TYPE_COMPAQ) {
                 ret = ega->stat & 0xcf;
                 switch ((ega->attrregs[0x12] >> 4) & 0x03) {
                     case 0x00:
diff --git a/src/video/vid_jega.c b/src/video/vid_jega.c
index a238fbff9..4240f5e98 100644
--- a/src/video/vid_jega.c
+++ b/src/video/vid_jega.c
@@ -428,7 +428,8 @@ jega_out(uint16_t addr, uint8_t val, void *priv)
                 }
             } else {
                 jega->attrregs[jega->attraddr & 31] = val;
-                if (jega->attraddr < 0x10) {
+                int is_attr14 = jega->is_vga ? (jega->attraddr == 0x14) : 0;
+                if (is_attr14 || (jega->attraddr < 0x10)) {
                     for (uint8_t c = 0; c < 16; c++) {
                         if (jega->is_vga) {
                             if (jega->attrregs[0x10] & 0x80)

From d2afb44412e414b0357c3f318c0fb5f5fbf41237 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sun, 30 Mar 2025 07:32:46 +0200
Subject: [PATCH 38/59] SVGA: Remove some excess logging.

---
 src/video/vid_svga.c        | 1 -
 src/video/vid_svga_render.c | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index b4abc18e5..d0189e0f7 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -2016,7 +2016,6 @@ svga_doblit(int wx, int wy, svga_t *svga)
 
         /* Block resolution changes while in DPMS mode to avoid getting a bogus
            screen width (320). We're already rendering a blank screen anyway. */
-        pclog("%i + %i, %i + %i\n", svga->monitor->mon_xsize, x_add, svga->monitor->mon_ysize, y_add);
         if (!svga->dpms)
             set_screen_size_monitor(svga->monitor->mon_xsize + x_add, svga->monitor->mon_ysize + y_add, svga->monitor_index);
 
diff --git a/src/video/vid_svga_render.c b/src/video/vid_svga_render.c
index fbd667a1b..d47697a7e 100644
--- a/src/video/vid_svga_render.c
+++ b/src/video/vid_svga_render.c
@@ -85,18 +85,9 @@ svga_render_blank(svga_t *svga)
             break;
     }
 
-#if 0
-    pclog("svga->displine = %i, svga->y_add = %i, svga->x_add = %i\n", svga->displine, svga->y_add, svga->x_add);
-#endif
     uint32_t *line_ptr   = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
-#if 0
-    pclog("svga->hdisp = %i, svga->scrollcache = %i, char_width = %i, sizeof(uint32_t) = %i\n", svga->hdisp, svga->scrollcache, char_width, sizeof(uint32_t));
-#endif
     uint32_t  line_width = (uint32_t) (svga->hdisp + svga->scrollcache) * char_width * sizeof(uint32_t);
 
-#if 0
-    pclog("line_width = %i\n", line_width);
-#endif
     if ((svga->hdisp + svga->scrollcache) > 0)
         memset(line_ptr, 0, line_width);
 }

From 5569fa6f5dfbe2bed794236515307fcedcf17b91 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sun, 30 Mar 2025 08:22:14 +0200
Subject: [PATCH 39/59] C&T SuperEGA: More fixes, the BIOS no longer freezes on
 attempting to boot from anything.

---
 src/video/vid_ega.c | 90 +++++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 44 deletions(-)

diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c
index 82c88d827..03121751d 100644
--- a/src/video/vid_ega.c
+++ b/src/video/vid_ega.c
@@ -61,37 +61,15 @@ int update_overscan = 0;
 
 uint8_t ega_in(uint16_t addr, void *priv);
 
-static int
-ega_get_type(ega_t *ega)
-{
-    int ret = ega_type;
-
-    if (ega->actual_type == EGA_SUPEREGA)
-        ret = (ega->crtc[0x17] & 0x10) ? EGA_TYPE_OTHER : EGA_TYPE_IBM;
-
-    return ret;
-}
-
-static int
-ega_get_actual_type(ega_t *ega)
-{
-    int ret = ega->actual_type;
-
-    if (ega->actual_type == EGA_SUPEREGA)
-        ret = (ega->crtc[0x17] & 0x10) ? EGA_SUPEREGA : EGA_IBM;
-
-    return ret;
-}
-
 void
 ega_out(uint16_t addr, uint8_t val, void *priv)
 {
     ega_t  *ega = (ega_t *) priv;
     uint8_t o;
     uint8_t old;
-    int     type     = ega_get_type(ega);
-    int     atype    = ega_get_actual_type(ega);
-    uint8_t gdcmask  = (atype == EGA_SUPEREGA) ? 0xff : 0x0f;
+    int     type     = ega_type;
+    int     atype    = ega->actual_type;
+    uint8_t gdcmask  = (ega_type == EGA_SUPEREGA) ? 0xff : 0x0f;
     uint8_t crtcmask = (atype == EGA_SUPEREGA) ? 0xff : 0x1f;
 
     if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(ega->miscout & 1))
@@ -168,7 +146,8 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
             ega->pallook        = ega->vres ? pallook16 : pallook64;
             ega->vidclock       = val & 4;
             ega->miscout        = val;
-            ega->overscan_color = ega->vres ? pallook16[ega->attrregs[0x11] & 0x0f] : pallook64[ega->attrregs[0x11] & 0x3f];
+            ega->overscan_color = ega->vres ? pallook16[ega->attrregs[0x11] & 0x0f] :
+                                              pallook64[ega->attrregs[0x11] & 0x3f];
             io_removehandler(0x03a0, 0x0020, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
             if (!(val & 1))
                 io_sethandler(0x03a0, 0x0020, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
@@ -290,28 +269,34 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
             if (ega->chipset)
                 ega->crtcreg = val & 0x3f;
             else
-                ega->crtcreg = val & crtcmask;
+                ega->crtcreg = val;
             return;
         case 0x3d1:
         case 0x3d5:
+            int idx = ega->crtcreg;
+
             if (ega->chipset) {
                 if ((ega->crtcreg < 7) && (ega->crtc[0x11] & 0x80) && !(ega->regs[0xb4] & 0x80))
                     return;
                 if ((ega->crtcreg == 7) && (ega->crtc[0x11] & 0x80) && !(ega->regs[0xb4] & 0x80))
                     val = (ega->crtc[7] & ~0x10) | (val & 0x10);
             } else {
-                if ((ega->crtcreg < 7) && (ega->crtc[0x11] & 0x80))
+                idx &= crtcmask;
+                if ((idx >= 0x19) & (idx <= 0xf6))
                     return;
-                if ((ega->crtcreg == 7) && (ega->crtc[0x11] & 0x80))
+                if ((idx < 7) && (ega->crtc[0x11] & 0x80))
+                    return;
+                if ((idx == 7) && (ega->crtc[0x11] & 0x80))
                     val = (ega->crtc[7] & ~0x10) | (val & 0x10);
             }
-            old                     = ega->crtc[ega->crtcreg];
-            ega->crtc[ega->crtcreg] = val;
+            old                     = ega->crtc[idx];
+            ega->crtc[idx] = val;
             if (old != val) {
-                if (ega->crtcreg < 0xe || ega->crtcreg > 0x10) {
-                    if ((ega->crtcreg == 0xc) || (ega->crtcreg == 0xd)) {
+                if ((idx < 0xe) || (idx > 0x10)) {
+                    if ((idx == 0xc) || (idx == 0xd)) {
                         ega->fullchange = 3;
-                        ega->ma_latch   = ((ega->crtc[0xc] << 8) | ega->crtc[0xd]) + ((ega->crtc[8] & 0x60) >> 5);
+                        ega->ma_latch   = ((ega->crtc[0xc] << 8) | ega->crtc[0xd]) +
+                                          ((ega->crtc[8] & 0x60) >> 5);
                     } else {
                         ega->fullchange = changeframecount;
                         ega_recalctimings(ega);
@@ -329,10 +314,11 @@ uint8_t
 ega_in(uint16_t addr, void *priv)
 {
     ega_t  *ega = (ega_t *) priv;
-    uint8_t gdcmask = (ega->actual_type == EGA_SUPEREGA) ? 0xff : 0x0f;
-    uint8_t ret     = 0xff;
-    int     type    = ega_get_type(ega);
-    int     atype   = ega_get_actual_type(ega);
+    uint8_t ret      = 0xff;
+    int     type     = ega_type;
+    int     atype    = ega->actual_type;
+    uint8_t gdcmask  = (atype == EGA_SUPEREGA) ? 0xff : 0x0f;
+    uint8_t crtcmask = (atype == EGA_SUPEREGA) ? 0xff : 0x1f;
 
     if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(ega->miscout & 1))
         addr ^= 0x60;
@@ -372,8 +358,12 @@ ega_in(uint16_t addr, void *priv)
             ret = (egaswitches & (8 >> egaswitchread)) ? 0x10 : 0x00;
             break;
         case 0x3c4:
-            if (type == EGA_TYPE_OTHER)
-                ret = ega->seqaddr;
+            if (type == EGA_TYPE_OTHER) {
+                if (atype == EGA_SUPEREGA)
+                    ret = 0x1f | ((ega->miscout & 0x01) << 5);
+                else
+                    ret = ega->seqaddr;
+            }
             break;
         case 0x3c5:
             if (type == EGA_TYPE_OTHER) {
@@ -396,8 +386,14 @@ ega_in(uint16_t addr, void *priv)
                 ret = ega->miscout;
             break;
         case 0x3ce:
-            if (type == EGA_TYPE_OTHER)
+            if (ega_type == EGA_TYPE_OTHER) {
                 ret = ega->gdcaddr;
+                if (atype == EGA_SUPEREGA) {
+                    ret = (ret & 0x0f) | 0xe0;
+                    if ((ega->gdcaddr & 0xe0) == 0xe0)
+                        ret |= 0x10;
+                }
+            }
             break;
         case 0x3cf:
             if (type == EGA_TYPE_OTHER) {
@@ -425,7 +421,7 @@ ega_in(uint16_t addr, void *priv)
             break;
         case 0x3d0:
         case 0x3d4:
-            if (type == EGA_TYPE_OTHER) {
+            if (ega_type == EGA_TYPE_OTHER) {
                 ret = ega->crtcreg;
                 if (atype == EGA_SUPEREGA) {
                     ret = (ret & 0x1f) | 0xc0;
@@ -436,7 +432,7 @@ ega_in(uint16_t addr, void *priv)
             break;
         case 0x3d1:
         case 0x3d5:
-            switch (ega->crtcreg) {
+            switch (ega->crtcreg & crtcmask) {
                 case 0xc:
                 case 0xd:
                 case 0xe:
@@ -458,6 +454,11 @@ ega_in(uint16_t addr, void *priv)
                         ret = ega->light_pen & 0xff;
                     break;
 
+                case 0x19 ... 0xf6:
+                    if (type == EGA_TYPE_OTHER)
+                        ret = ega->chipset ? ega->crtc[ega->crtcreg] : 0xff;
+                    break;
+
                 default:
                     if (type == EGA_TYPE_OTHER)
                         ret = ega->crtc[ega->crtcreg];
@@ -672,7 +673,8 @@ ega_recalctimings(ega_t *ega)
         disptime     = (double) (ega->crtc[0] + 2);
         _dispontime  = (double) (ega->crtc[1] + 1);
     }
-    if ((ega->actual_type == EGA_SUPEREGA) && (ega->crtc[0xf9] & 0x01)) {
+    if ((ega->actual_type == EGA_SUPEREGA) && (ega->crtc[0x17] & 0x10) &&
+        (ega->crtc[0xf9] & 0x01)) {
         disptime    *= 2.0;
         _dispontime *= 2.0;
     }

From 512154e4a837c76405f446c0691e321817c526c2 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sun, 30 Mar 2025 09:00:39 +0200
Subject: [PATCH 40/59] EGA: Add braces around a case block to make clang
 happy.

---
 src/video/vid_ega.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c
index 03121751d..8333e522e 100644
--- a/src/video/vid_ega.c
+++ b/src/video/vid_ega.c
@@ -272,7 +272,7 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
                 ega->crtcreg = val;
             return;
         case 0x3d1:
-        case 0x3d5:
+        case 0x3d5: {
             int idx = ega->crtcreg;
 
             if (ega->chipset) {
@@ -305,7 +305,7 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
             }
             break;
 
-        default:
+        } default:
             break;
     }
 }

From 8f94ccec8045afda48b88990d07b9ae966b91da7 Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Sun, 30 Mar 2025 21:03:46 +0600
Subject: [PATCH 41/59] Qt: Fix HiDPI scaling on non-software renderers

---
 src/qt/qt_hardwarerenderer.cpp     |  7 +++++--
 src/qt/qt_openglrenderer.cpp       | 29 ++++++++++++++++-------------
 src/qt/qt_renderercommon.cpp       |  3 +++
 src/qt/qt_renderercommon.hpp       |  2 ++
 src/qt/qt_vulkanrenderer.cpp       | 16 +++++-----------
 src/qt/qt_vulkanwindowrenderer.cpp |  5 ++++-
 6 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/qt/qt_hardwarerenderer.cpp b/src/qt/qt_hardwarerenderer.cpp
index ee2ec07df..d5aa86b79 100644
--- a/src/qt/qt_hardwarerenderer.cpp
+++ b/src/qt/qt_hardwarerenderer.cpp
@@ -37,7 +37,7 @@ void
 HardwareRenderer::resizeGL(int w, int h)
 {
     m_context->makeCurrent(this);
-    glViewport(0, 0, qRound(w * devicePixelRatio()), qRound(h * devicePixelRatio()));
+    glViewport(0, 0, qRound(w * devicePixelRatioF()), qRound(h * devicePixelRatioF()));
 }
 
 #define PROGRAM_VERTEX_ATTRIBUTE   0
@@ -220,14 +220,17 @@ HardwareRenderer::onBlit(int buf_idx, int x, int y, int w, int h)
 #endif
     buf_usage[buf_idx].clear();
     source.setRect(x, y, w, h);
-    if (origSource != source)
+    if (origSource != source) {
+        this->pixelRatio = devicePixelRatioF();
         onResize(this->width(), this->height());
+    }
     update();
 }
 
 void
 HardwareRenderer::resizeEvent(QResizeEvent *event)
 {
+    this->pixelRatio = devicePixelRatioF();
     onResize(width(), height());
 
     QOpenGLWindow::resizeEvent(event);
diff --git a/src/qt/qt_openglrenderer.cpp b/src/qt/qt_openglrenderer.cpp
index b465bfddd..cc48ca06e 100644
--- a/src/qt/qt_openglrenderer.cpp
+++ b/src/qt/qt_openglrenderer.cpp
@@ -1154,14 +1154,15 @@ OpenGLRenderer::onBlit(int buf_idx, int x, int y, int w, int h)
 
     buf_usage[buf_idx].clear();
     source.setRect(x, y, w, h);
+    this->pixelRatio = devicePixelRatio();
     onResize(this->width(), this->height());
 
 #ifdef Q_OS_MACOS
     glw.glViewport(
-        destination.x() * devicePixelRatio(),
-        destination.y() * devicePixelRatio(),
-        destination.width() * devicePixelRatio(),
-        destination.height() * devicePixelRatio());
+        destination.x(),
+        destination.y(),
+        destination.width(),
+        destination.height());
 #endif
 
     if (video_framerate == -1)
@@ -1187,6 +1188,7 @@ OpenGLRenderer::exposeEvent(QExposeEvent *event)
     if (!isInitialized)
         initialize();
 
+    this->pixelRatio = devicePixelRatio();
     onResize(size().width(), size().height());
 }
 
@@ -1195,6 +1197,7 @@ OpenGLRenderer::resizeEvent(QResizeEvent *event)
 {
     Q_UNUSED(event);
 
+    this->pixelRatio = devicePixelRatio();
     onResize(event->size().width(), event->size().height());
 
     if (notReady())
@@ -1203,10 +1206,10 @@ OpenGLRenderer::resizeEvent(QResizeEvent *event)
     context->makeCurrent(this);
 
     glw.glViewport(
-        destination.x() * devicePixelRatio(),
-        destination.y() * devicePixelRatio(),
-        destination.width() * devicePixelRatio(),
-        destination.height() * devicePixelRatio());
+        destination.x(),
+        destination.y(),
+        destination.width(),
+        destination.height());
 }
 
 void
@@ -1386,10 +1389,10 @@ OpenGLRenderer::render()
         uint32_t x, y, w, h;
     } window_rect;
 
-    window_rect.x = destination.x() * devicePixelRatio();
-    window_rect.y = destination.y() * devicePixelRatio();
-    window_rect.w = destination.width() * devicePixelRatio();
-    window_rect.h = destination.height() * devicePixelRatio();
+    window_rect.x = destination.x();
+    window_rect.y = destination.y();
+    window_rect.w = destination.width();
+    window_rect.h = destination.height();
 
     glw.glBindTexture(GL_TEXTURE_2D, scene_texture.id);
     scene_texture.min_filter = scene_texture.mag_filter = video_filter_method ? GL_LINEAR : GL_NEAREST;
@@ -1652,7 +1655,7 @@ OpenGLRenderer::render()
     }
 
     if (monitors[r_monitor_index].mon_screenshots) {
-        int width = destination.width() * devicePixelRatio(), height = destination.height() * devicePixelRatio();
+        int width = destination.width(), height = destination.height();
         char path[1024];
         char fn[256];
     
diff --git a/src/qt/qt_renderercommon.cpp b/src/qt/qt_renderercommon.cpp
index 2a20ff63c..3a34452e6 100644
--- a/src/qt/qt_renderercommon.cpp
+++ b/src/qt/qt_renderercommon.cpp
@@ -59,6 +59,9 @@ RendererCommon::onResize(int width, int height)
     bool main_max = main_window->isMaximized();
     bool main_is_max = (main_is_ancestor && main_max == false);
 
+    width = round(pixelRatio * width);
+    height = round(pixelRatio * height);
+
     if (is_fs && (video_fullscreen_scale_maximized ? (parent_max && main_is_max) : 1))
         destination.setRect(0, 0, width, height);
     else {
diff --git a/src/qt/qt_renderercommon.hpp b/src/qt/qt_renderercommon.hpp
index bbda9516b..333b9df0a 100644
--- a/src/qt/qt_renderercommon.hpp
+++ b/src/qt/qt_renderercommon.hpp
@@ -49,5 +49,7 @@ protected:
     QRect    destination;
     QWidget *parentWidget { nullptr };
 
+    double pixelRatio = 1.0;
+
     std::vector<std::atomic_flag> buf_usage;
 };
diff --git a/src/qt/qt_vulkanrenderer.cpp b/src/qt/qt_vulkanrenderer.cpp
index 39830569c..2306661ec 100644
--- a/src/qt/qt_vulkanrenderer.cpp
+++ b/src/qt/qt_vulkanrenderer.cpp
@@ -970,17 +970,11 @@ VulkanRenderer2::startNextFrame()
     m_devFuncs->vkCmdBindVertexBuffers(cb, 0, 1, &m_buf, &vbOffset);
 
     VkViewport viewport;
-    if (dpi_scale) {
-        viewport.x        = destination.x() * m_window->devicePixelRatio();
-        viewport.y        = destination.y() * m_window->devicePixelRatio();
-        viewport.width    = destination.width() * m_window->devicePixelRatio();
-        viewport.height   = destination.height() * m_window->devicePixelRatio();
-    } else {
-        viewport.x        = destination.x();
-        viewport.y        = destination.y();
-        viewport.width    = destination.width();
-        viewport.height   = destination.height();
-    }
+    viewport.x        = destination.x();
+    viewport.y        = destination.y();
+    viewport.width    = destination.width();
+    viewport.height   = destination.height();
+    
     viewport.minDepth = 0;
     viewport.maxDepth = 1;
     m_devFuncs->vkCmdSetViewport(cb, 0, 1, &viewport);
diff --git a/src/qt/qt_vulkanwindowrenderer.cpp b/src/qt/qt_vulkanwindowrenderer.cpp
index ab46b5961..d0fbb39a3 100644
--- a/src/qt/qt_vulkanwindowrenderer.cpp
+++ b/src/qt/qt_vulkanwindowrenderer.cpp
@@ -846,6 +846,7 @@ VulkanWindowRenderer::createRenderer()
 void
 VulkanWindowRenderer::resizeEvent(QResizeEvent *event)
 {
+    this->pixelRatio = devicePixelRatio();
     onResize(width(), height());
 
     QVulkanWindow::resizeEvent(event);
@@ -868,8 +869,10 @@ VulkanWindowRenderer::onBlit(int buf_idx, int x, int y, int w, int h)
     if (isExposed())
         requestUpdate();
     buf_usage[0].clear();
-    if (origSource != source)
+    if (origSource != source) {
+        this->pixelRatio = devicePixelRatio();
         onResize(this->width(), this->height());
+    }
 }
 
 uint32_t

From 5ae5e99e41010861ab185012f47504fed40304dc Mon Sep 17 00:00:00 2001
From: TC1995 <mariogplayer90@gmail.com>
Date: Sun, 30 Mar 2025 22:06:16 +0200
Subject: [PATCH 42/59] Major changes on the 8514/A side again (March 30th,
 2025)

1. The DX/DY coordinates for BitBLT are now signed again, fixes 8514/A cursor issues.
2. Made the busy/data available processor statuses more like the ATI one for more stability and no stalls, fixes Windows 3.x and IBM OS/2 1.x (possibly later ones too) that use the built-in 8514/A driver.
3. Made the mode switching clearer (through a note) regarding the shadow sets, this should make every program happy, I hope.
4. In the Mach32 series only, a first load of the CRT sets also initializes the GE offsets if the corresponding bit is set, fixes Mach8/32 mode tests in their eeprom and demoai with hdiload from ATI/IBM.
---
 src/include/86box/vid_8514a.h     |   4 +-
 src/include/86box/vid_ati_mach8.h |   3 +-
 src/video/vid_8514a.c             | 199 +++++++++++++++------------
 src/video/vid_ati_mach8.c         | 215 +++++++++++++++++++-----------
 4 files changed, 256 insertions(+), 165 deletions(-)

diff --git a/src/include/86box/vid_8514a.h b/src/include/86box/vid_8514a.h
index a467311ca..7694a028a 100644
--- a/src/include/86box/vid_8514a.h
+++ b/src/include/86box/vid_8514a.h
@@ -92,8 +92,8 @@ typedef struct ibm8514_t {
         uint16_t advfunc_cntl;
         uint16_t cur_y;
         uint16_t cur_x;
-        uint16_t destx;
-        uint16_t desty;
+        int16_t  destx;
+        int16_t  desty;
         int16_t  desty_axstp;
         int16_t  destx_distp;
         int16_t  err_term;
diff --git a/src/include/86box/vid_ati_mach8.h b/src/include/86box/vid_ati_mach8.h
index 4a5d3deb5..8ed1dbc74 100644
--- a/src/include/86box/vid_ati_mach8.h
+++ b/src/include/86box/vid_ati_mach8.h
@@ -77,7 +77,8 @@ typedef struct mach_t {
     uint8_t overscan_g_col_24;
     uint8_t overscan_r_col_24;
     uint16_t fifo_test_data[17];
-    int resolution_crt;
+    int port_len;
+    int crt_resolution;
 
     struct {
         uint8_t  line_idx;
diff --git a/src/video/vid_8514a.c b/src/video/vid_8514a.c
index 393b90b57..7c0bf9702 100644
--- a/src/video/vid_8514a.c
+++ b/src/video/vid_8514a.c
@@ -834,10 +834,25 @@ ibm8514_accel_in_fifo(svga_t *svga, uint16_t port, int len)
 
                 if (dev->force_busy)
                     temp |= 0x0200; /*Hardware busy*/
-                dev->force_busy = 0;
+
+                if (dev->accel.cmd_back)
+                    dev->force_busy = 0;
+
                 if (dev->data_available) {
                     temp |= 0x0100; /*Read Data available*/
-                    dev->data_available = 0;
+                    switch (dev->accel.cmd >> 13) {
+                        case 2:
+                        case 3:
+                        case 4:
+                        case 6:
+                            if (dev->accel.sy < 0)
+                                dev->data_available = 0;
+                            break;
+                        default:
+                            if (!dev->accel.sy)
+                                dev->data_available = 0;
+                            break;
+                    }
                 }
             }
             break;
@@ -850,9 +865,22 @@ ibm8514_accel_in_fifo(svga_t *svga, uint16_t port, int len)
                     temp |= 0x02; /*Hardware busy*/
 
                 dev->force_busy2 = 0;
+
                 if (dev->data_available2) {
                     temp |= 0x01; /*Read Data available*/
-                    dev->data_available2 = 0;
+                    switch (dev->accel.cmd >> 13) {
+                        case 2:
+                        case 3:
+                        case 4:
+                        case 6:
+                            if (dev->accel.sy < 0)
+                                dev->data_available2 = 0;
+                            break;
+                        default:
+                            if (!dev->accel.sy)
+                                dev->data_available2 = 0;
+                            break;
+                    }
                 }
             }
             break;
@@ -931,10 +959,10 @@ ibm8514_accel_in(uint16_t port, svga_t *svga)
                 if (cmd == 6) {
                     if ((dev->subsys_cntl & INT_GE_BSY) &&
                         !(dev->subsys_stat & INT_GE_BSY) &&
-                        (dev->accel.dx_ibm >= clip_l) &&
-                        (dev->accel.dx_ibm <= clip_r_ibm) &&
-                        (dev->accel.dy_ibm >= clip_t) &&
-                        (dev->accel.dy_ibm <= clip_b_ibm))
+                        (dev->accel.dx >= clip_l) &&
+                        (dev->accel.dx <= clip_r_ibm) &&
+                        (dev->accel.dy >= clip_t) &&
+                        (dev->accel.dy <= clip_b_ibm))
                         temp |= INT_GE_BSY;
                 } else {
                     if ((dev->subsys_cntl & INT_GE_BSY) &&
@@ -2796,8 +2824,13 @@ skip_nibble_rect_write:
             {
                 dev->accel.x_count = 0;
 
-                dev->accel.dx_ibm = dev->accel.destx;
-                dev->accel.dy_ibm = dev->accel.desty;
+                dev->accel.dx = dev->accel.destx;
+                if (dev->accel.destx >= 0x600)
+                    dev->accel.dx |= ~0x5ff;
+
+                dev->accel.dy = dev->accel.desty;
+                if (dev->accel.desty >= 0x600)
+                    dev->accel.dy |= ~0x5ff;
 
                 dev->accel.cx = dev->accel.cur_x;
                 if (dev->accel.cur_x >= 0x600)
@@ -2812,13 +2845,13 @@ skip_nibble_rect_write:
 
                 if ((dev->accel_bpp == 24) || (dev->accel_bpp <= 8)) {
                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
+                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
                 } else if (dev->bpp) {
                     dev->accel.src  = (dev->accel.ge_offset << 1) + (dev->accel.cy * dev->pitch);
-                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy_ibm * dev->pitch);
+                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy * dev->pitch);
                 } else {
                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
+                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
                 }
                 dev->accel.fill_state = 0;
 
@@ -2844,15 +2877,15 @@ skip_nibble_rect_write:
                     dev->data_available2 = 1;
                     return; /*Wait for data from CPU*/
                 } else
-                    ibm8514_log("BitBLT normal: Parameters: DX=%d, DY=%d, CX=%d, CY=%d, dstwidth=%d, dstheight=%d, clipl=%d, clipr=%d, clipt=%d, clipb=%d.\n", dev->accel.dx_ibm, dev->accel.dy_ibm, dev->accel.cx, dev->accel.cy, dev->accel.sx, dev->accel.sy, clip_l, clip_r, clip_t, clip_b);
+                    ibm8514_log("BitBLT normal: Parameters: DX=%d, DY=%d, CX=%d, CY=%d, dstwidth=%d, dstheight=%d, clipl=%d, clipr=%d, clipt=%d, clipb=%d.\n", dev->accel.dx, dev->accel.dy, dev->accel.cx, dev->accel.cy, dev->accel.sx, dev->accel.sy, clip_l, clip_r, clip_t, clip_b);
             }
 
             if (cpu_input) {
                 while (count-- && (dev->accel.sy >= 0)) {
-                    if ((dev->accel.dx_ibm >= clip_l) &&
-                        (dev->accel.dx_ibm <= clip_r) &&
-                        (dev->accel.dy_ibm >= clip_t) &&
-                        (dev->accel.dy_ibm <= clip_b)) {
+                    if ((dev->accel.dx >= clip_l) &&
+                        (dev->accel.dx <= clip_r) &&
+                        (dev->accel.dy >= clip_t) &&
+                        (dev->accel.dy <= clip_b)) {
                         if (pixcntl == 3) {
                             if (!(dev->accel.cmd & 0x10) && ((frgd_mix != 3) || (bkgd_mix != 3))) {
                                 READ(dev->accel.src + dev->accel.cx, mix_dat);
@@ -2916,7 +2949,7 @@ skip_nibble_rect_write:
                             }
                         }
 
-                        READ(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
+                        READ(dev->accel.dest + dev->accel.dx, dest_dat);
 
                         if ((compare_mode == 0) ||
                             ((compare_mode == 0x10) && (dest_dat >= compare)) ||
@@ -2932,20 +2965,20 @@ skip_nibble_rect_write:
                                     goto skip_nibble_bitblt_write;
 
                                 dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                WRITE(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
+                                WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
                             } else {
                                 MIX(mix_dat & mix_mask, dest_dat, src_dat);
                                 dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                WRITE(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
+                                WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
                             }
                         }
                     }
 
                     if (dev->accel.cmd & 0x20) {
-                        dev->accel.dx_ibm++;
+                        dev->accel.dx++;
                         dev->accel.cx++;
                     } else {
-                        dev->accel.dx_ibm--;
+                        dev->accel.dx--;
                         dev->accel.cx--;
                     }
 
@@ -2972,30 +3005,30 @@ skip_nibble_bitblt_write:
                         dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
 
                         if (dev->accel.cmd & 0x20) {
-                            dev->accel.dx_ibm -= (dev->accel.sx + 1);
+                            dev->accel.dx -= (dev->accel.sx + 1);
                             dev->accel.cx -= (dev->accel.sx + 1);
                         } else {
-                            dev->accel.dx_ibm += (dev->accel.sx + 1);
+                            dev->accel.dx += (dev->accel.sx + 1);
                             dev->accel.cx += (dev->accel.sx + 1);
                         }
 
                         if (dev->accel.cmd & 0x80) {
-                            dev->accel.dy_ibm++;
+                            dev->accel.dy++;
                             dev->accel.cy++;
                         } else {
-                            dev->accel.dy_ibm--;
+                            dev->accel.dy--;
                             dev->accel.cy--;
                         }
 
                         if ((dev->accel_bpp == 24) || (dev->accel_bpp <= 8)) {
                             dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                            dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
+                            dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
                         } else if (dev->bpp) {
                             dev->accel.src  = (dev->accel.ge_offset << 1) + (dev->accel.cy * dev->pitch);
-                            dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy_ibm * dev->pitch);
+                            dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy * dev->pitch);
                         } else {
                             dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                            dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
+                            dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
                         }
 
                         dev->accel.sy--;
@@ -3018,10 +3051,10 @@ skip_nibble_bitblt_write:
                                 mix_dat >>= 8;
                                 dev->accel.temp_cnt = 8;
                             }
-                            if ((dev->accel.dx_ibm >= clip_l) &&
-                                (dev->accel.dx_ibm <= clip_r) &&
-                                (dev->accel.dy_ibm >= clip_t) &&
-                                (dev->accel.dy_ibm <= clip_b)) {
+                            if ((dev->accel.dx >= clip_l) &&
+                                (dev->accel.dx <= clip_r) &&
+                                (dev->accel.dy >= clip_t) &&
+                                (dev->accel.dy <= clip_b)) {
                                 switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                                     case 0:
                                         src_dat = bkgd_color;
@@ -3040,7 +3073,7 @@ skip_nibble_bitblt_write:
                                         break;
                                 }
 
-                                READ(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
+                                READ(dev->accel.dest + dev->accel.dx, dest_dat);
 
                                 if ((compare_mode == 0) ||
                                     ((compare_mode == 0x10) && (dest_dat >= compare)) ||
@@ -3052,7 +3085,7 @@ skip_nibble_bitblt_write:
                                     old_dest_dat = dest_dat;
                                     MIX(mix_dat & mix_mask, dest_dat, src_dat);
                                     dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                    WRITE(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
+                                    WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
                                 }
                             }
 
@@ -3063,10 +3096,10 @@ skip_nibble_bitblt_write:
                             }
 
                             if (dev->accel.cmd & 0x20) {
-                                dev->accel.dx_ibm++;
+                                dev->accel.dx++;
                                 dev->accel.cx++;
                             } else {
-                                dev->accel.dx_ibm--;
+                                dev->accel.dx--;
                                 dev->accel.cx--;
                             }
 
@@ -3075,30 +3108,30 @@ skip_nibble_bitblt_write:
                                 dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
 
                                 if (dev->accel.cmd & 0x20) {
-                                    dev->accel.dx_ibm -= (dev->accel.sx + 1);
+                                    dev->accel.dx -= (dev->accel.sx + 1);
                                     dev->accel.cx -= (dev->accel.sx + 1);
                                 } else {
-                                    dev->accel.dx_ibm += (dev->accel.sx + 1);
+                                    dev->accel.dx += (dev->accel.sx + 1);
                                     dev->accel.cx += (dev->accel.sx + 1);
                                 }
 
                                 if (dev->accel.cmd & 0x80) {
-                                    dev->accel.dy_ibm++;
+                                    dev->accel.dy++;
                                     dev->accel.cy++;
                                 } else {
-                                    dev->accel.dy_ibm--;
+                                    dev->accel.dy--;
                                     dev->accel.cy--;
                                 }
 
                                 if ((dev->accel_bpp == 24) || (dev->accel_bpp <= 8)) {
                                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
                                 } else if (dev->bpp) {
                                     dev->accel.src  = (dev->accel.ge_offset << 1) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy_ibm * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy * dev->pitch);
                                 } else {
                                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
                                 }
 
                                 dev->accel.sy--;
@@ -3117,10 +3150,10 @@ skip_nibble_bitblt_write:
                                 dev->accel.temp_cnt = 8;
                                 mix_dat = old_mix_dat;
                             }
-                            if ((dev->accel.dx_ibm >= clip_l) &&
-                                (dev->accel.dx_ibm <= clip_r) &&
-                                (dev->accel.dy_ibm >= clip_t) &&
-                                (dev->accel.dy_ibm <= clip_b)) {
+                            if ((dev->accel.dx >= clip_l) &&
+                                (dev->accel.dx <= clip_r) &&
+                                (dev->accel.dy >= clip_t) &&
+                                (dev->accel.dy <= clip_b)) {
                                 switch ((mix_dat & 0x01) ? frgd_mix : bkgd_mix) {
                                     case 0:
                                         src_dat = bkgd_color;
@@ -3139,7 +3172,7 @@ skip_nibble_bitblt_write:
                                         break;
                                 }
 
-                                READ(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
+                                READ(dev->accel.dest + dev->accel.dx, dest_dat);
 
                                 if ((compare_mode == 0) ||
                                     ((compare_mode == 0x10) && (dest_dat >= compare)) ||
@@ -3151,7 +3184,7 @@ skip_nibble_bitblt_write:
                                     old_dest_dat = dest_dat;
                                     MIX(mix_dat & 0x01, dest_dat, src_dat);
                                     dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                    WRITE(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
+                                    WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
                                 }
                             }
 
@@ -3159,10 +3192,10 @@ skip_nibble_bitblt_write:
                             mix_dat >>= 1;
 
                             if (dev->accel.cmd & 0x20) {
-                                dev->accel.dx_ibm++;
+                                dev->accel.dx++;
                                 dev->accel.cx++;
                             } else {
-                                dev->accel.dx_ibm--;
+                                dev->accel.dx--;
                                 dev->accel.cx--;
                             }
 
@@ -3171,36 +3204,36 @@ skip_nibble_bitblt_write:
                                 dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
 
                                 if (dev->accel.cmd & 0x20) {
-                                    dev->accel.dx_ibm -= (dev->accel.sx + 1);
+                                    dev->accel.dx -= (dev->accel.sx + 1);
                                     dev->accel.cx -= (dev->accel.sx + 1);
                                 } else {
-                                    dev->accel.dx_ibm += (dev->accel.sx + 1);
+                                    dev->accel.dx += (dev->accel.sx + 1);
                                     dev->accel.cx += (dev->accel.sx + 1);
                                 }
 
                                 if (dev->accel.cmd & 0x80) {
-                                    dev->accel.dy_ibm++;
+                                    dev->accel.dy++;
                                     dev->accel.cy++;
                                 } else {
-                                    dev->accel.dy_ibm--;
+                                    dev->accel.dy--;
                                     dev->accel.cy--;
                                 }
 
                                 if ((dev->accel_bpp == 24) || (dev->accel_bpp <= 8)) {
                                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
                                 } else if (dev->bpp) {
                                     dev->accel.src  = (dev->accel.ge_offset << 1) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy_ibm * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy * dev->pitch);
                                 } else {
                                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
                                 }
                                 dev->accel.sy--;
 
                                 if (dev->accel.sy < 0) {
-                                    dev->accel.destx = dev->accel.dx_ibm;
-                                    dev->accel.desty = dev->accel.dy_ibm;
+                                    dev->accel.destx = dev->accel.dx;
+                                    dev->accel.desty = dev->accel.dy;
                                     dev->accel.cmd_back = 1;
                                     dev->fifo_idx = 0;
                                     return;
@@ -3214,13 +3247,13 @@ skip_nibble_bitblt_write:
                         int64_t dx;
 
                         cx = (int64_t) dev->accel.cx;
-                        dx = (int64_t) dev->accel.dx_ibm;
+                        dx = (int64_t) dev->accel.dx;
 
                         while (1) {
                             if ((dx >= (((int64_t)clip_l) * 3)) &&
                                 (dx <= (((uint64_t)clip_r) * 3)) &&
-                                (dev->accel.dy_ibm >= (clip_t << 1)) &&
-                                (dev->accel.dy_ibm <= (clip_b << 1))) {
+                                (dev->accel.dy >= (clip_t << 1)) &&
+                                (dev->accel.dy <= (clip_b << 1))) {
                                 READ(dev->accel.src + cx, src_dat);
                                 READ(dev->accel.dest + dx, dest_dat);
                                 dest_dat = (src_dat & wrt_mask) | (dest_dat & ~wrt_mask);
@@ -3239,10 +3272,10 @@ skip_nibble_bitblt_write:
                         }
                     } else {
                         while (count-- && dev->accel.sy >= 0) {
-                            if ((dev->accel.dx_ibm >= clip_l) &&
-                                (dev->accel.dx_ibm <= clip_r) &&
-                                (dev->accel.dy_ibm >= clip_t) &&
-                                (dev->accel.dy_ibm <= clip_b)) {
+                            if ((dev->accel.dx >= clip_l) &&
+                                (dev->accel.dx <= clip_r) &&
+                                (dev->accel.dy >= clip_t) &&
+                                (dev->accel.dy <= clip_b)) {
                                 if (pixcntl == 3) {
                                     if (!(dev->accel.cmd & 0x10) && ((frgd_mix != 3) || (bkgd_mix != 3))) {
                                         READ(dev->accel.src + dev->accel.cx, mix_dat);
@@ -3276,7 +3309,7 @@ skip_nibble_bitblt_write:
                                         break;
                                 }
 
-                                READ(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
+                                READ(dev->accel.dest + dev->accel.dx, dest_dat);
 
                                 if ((compare_mode == 0) ||
                                     ((compare_mode == 0x10) && (dest_dat >= compare)) ||
@@ -3291,11 +3324,11 @@ skip_nibble_bitblt_write:
 
                                     if (dev->accel.cmd & 0x04) {
                                         if (dev->accel.sx) {
-                                            WRITE(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
+                                            WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
                                         }
                                     } else {
-                                        WRITE(dev->accel.dest + dev->accel.dx_ibm, dest_dat);
-                                        ibm8514_log("BitBLT DX=%d, DY=%d, data=%02x, old=%02x, src=%02x, frmix=%02x, bkmix=%02x, pixcntl=%d.\n", dev->accel.dx_ibm, dev->accel.dy_ibm, dest_dat, old_dest_dat, src_dat, dev->accel.frgd_mix & 0x1f, dev->accel.bkgd_mix & 0x1f, pixcntl);
+                                        WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
+                                        ibm8514_log("BitBLT DX=%d, DY=%d, data=%02x, old=%02x, src=%02x, frmix=%02x, bkmix=%02x, pixcntl=%d.\n", dev->accel.dx, dev->accel.dy, dest_dat, old_dest_dat, src_dat, dev->accel.frgd_mix & 0x1f, dev->accel.bkgd_mix & 0x1f, pixcntl);
                                     }
                                 }
                             }
@@ -3304,10 +3337,10 @@ skip_nibble_bitblt_write:
                             mix_dat |= 1;
 
                             if (dev->accel.cmd & 0x20) {
-                                dev->accel.dx_ibm++;
+                                dev->accel.dx++;
                                 dev->accel.cx++;
                             } else {
-                                dev->accel.dx_ibm--;
+                                dev->accel.dx--;
                                 dev->accel.cx--;
                             }
 
@@ -3317,36 +3350,36 @@ skip_nibble_bitblt_write:
                                 dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
 
                                 if (dev->accel.cmd & 0x20) {
-                                    dev->accel.dx_ibm -= (dev->accel.sx + 1);
+                                    dev->accel.dx -= (dev->accel.sx + 1);
                                     dev->accel.cx -= (dev->accel.sx + 1);
                                 } else {
-                                    dev->accel.dx_ibm += (dev->accel.sx + 1);
+                                    dev->accel.dx += (dev->accel.sx + 1);
                                     dev->accel.cx += (dev->accel.sx + 1);
                                 }
 
                                 if (dev->accel.cmd & 0x80) {
-                                    dev->accel.dy_ibm++;
+                                    dev->accel.dy++;
                                     dev->accel.cy++;
                                 } else {
-                                    dev->accel.dy_ibm--;
+                                    dev->accel.dy--;
                                     dev->accel.cy--;
                                 }
 
                                 if ((dev->accel_bpp == 24) || (dev->accel_bpp <= 8)) {
                                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
                                 } else if (dev->bpp) {
                                     dev->accel.src  = (dev->accel.ge_offset << 1) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy_ibm * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 1) + (dev->accel.dy * dev->pitch);
                                 } else {
                                     dev->accel.src  = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy_ibm * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
                                 }
                                 dev->accel.sy--;
 
                                 if (dev->accel.sy < 0) {
-                                    dev->accel.destx = dev->accel.dx_ibm;
-                                    dev->accel.desty = dev->accel.dy_ibm;
+                                    dev->accel.destx = dev->accel.dx;
+                                    dev->accel.desty = dev->accel.dy;
                                     dev->accel.cmd_back = 1;
                                     dev->fifo_idx = 0;
                                     return;
diff --git a/src/video/vid_ati_mach8.c b/src/video/vid_ati_mach8.c
index c21730497..474ae5660 100644
--- a/src/video/vid_ati_mach8.c
+++ b/src/video/vid_ati_mach8.c
@@ -344,7 +344,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                  dev->accel.rd_mask, mach->accel.dp_config, clip_l, clip_r, clip_t, clip_b, mach->accel.linedraw_opt, dev->accel_bpp, cmd_type, mach->accel.ge_offset, count, cpu_input, mono_src, frgd_sel, dev->accel.cur_x, dev->accel.cur_y,
                  mach->accel.dest_x_end, dev->ext_pitch, dev->ext_crt_pitch, mach->accel.dp_config & 1, mach->accel.mono_pattern_enable);
 
-    mach_log("cmd_type = %i, frgd_sel = %i, bkgd_sel = %i, mono_src = %i.\n", cmd_type, frgd_sel, bkgd_sel, mono_src);
+    mach_log("cmd_type = %i, frgd_sel = %i, bkgd_sel = %i, mono_src = %i, dpconfig = %04x.\n", cmd_type, frgd_sel, bkgd_sel, mono_src, mach->accel.dp_config);
 
     switch (cmd_type) {
         case 1: /*Extended Raw Linedraw from bres_count register (0x96ee)*/
@@ -900,14 +900,10 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 }
 
                 dev->accel.sy = 0;
-                if (mach->accel.dp_config & 0x02)
-                    dev->accel.dest = (dev->accel.dy * dev->pitch);
-                else {
-                    if (dev->bpp)
-                        dev->accel.dest = (mach->accel.ge_offset << 1) + (dev->accel.dy * dev->pitch);
-                    else
-                        dev->accel.dest = (mach->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
-                }
+                if (dev->bpp)
+                    dev->accel.dest = (mach->accel.ge_offset << 1) + (dev->accel.dy * dev->pitch);
+                else
+                    dev->accel.dest = (mach->accel.ge_offset << 2) + (dev->accel.dy * dev->pitch);
 
                 mach->accel.src_stepx = 0;
                 /*Source Width*/
@@ -2221,7 +2217,7 @@ mach_accel_out_pixtrans(svga_t *svga, mach_t *mach, ibm8514_t *dev, uint16_t val
         case 0x200: /*16-bit size*/
             if (mono_src == 2) {
                 if ((frgd_sel != 2) && (bkgd_sel != 2)) {
-                    if (((mach->accel.dp_config & 0x1000) && !swap) || swap) {
+                    if (((mach->accel.dp_config & 0x1000) && !swap) || (!(mach->accel.dp_config & 0x1000) && swap)) {
                         mach_log("16-bit bus size swap.\n");
                         val = (val >> 8) | (val << 8);
                     }
@@ -2663,17 +2659,22 @@ ati_render_32bpp(svga_t *svga)
     }
 }
 
+/*The situation is the following:
+  When ATI mode is selected, allow complete auto-detection.
+  But when 8514/A mode is selected, allow detection based on the shadow register sets.
+*/
+
 static void
 mach_set_resolution(mach_t *mach, svga_t *svga)
 {
     ibm8514_t    *dev  = (ibm8514_t *) svga->dev8514;
 
     dev->hdisp = (dev->hdisped + 1) << 3;
-    if (!dev->htotal) /*Default to 1024x768 87hz 8514/A htotal timings if it goes to 0.*/
-        dev->htotal = 0x9d;
-
     dev->h_total = dev->htotal + 1;
 
+    if (dev->h_total == 1) /*Default to 1024x768 87hz 8514/A htotal timings if it goes to 0.*/
+        dev->h_total = 0x9e;
+
     dev->vdisp = (dev->v_disp + 1) >> 1;
     if ((dev->vdisp == 478) || (dev->vdisp == 598) || (dev->vdisp == 766) || (dev->vdisp == 1022))
         dev->vdisp += 2;
@@ -2686,26 +2687,72 @@ mach_set_resolution(mach_t *mach, svga_t *svga)
     if (dev->interlace)
         dev->v_syncstart >>= 1;
 
-    mach_log("Shadow set ATI=%x, shadow set 8514/A=%x, resolution h=%d, v=%d.\n", mach->shadow_set & 0x03, dev->accel.advfunc_cntl & 0x04, dev->hdisp, dev->vdisp);
+    mach_log("Shadow set ATI=%x, shadow set 8514/A=%x, resolution h=%d, v=%d, vtotal=%d, vsyncstart=%d.\n", mach->shadow_set & 0x03, dev->accel.advfunc_cntl & 0x04, dev->hdisp, dev->vdisp, dev->v_total, dev->v_syncstart);
     if ((mach->accel.clock_sel & 0x01) || dev->bpp || ((mach->accel.ext_ge_config & 0x30) == 0x30)) /*ATI and 15bpp+ mode*/
         svga_recalctimings(svga);
     else { /*8514/A mode*/
-        if (mach->resolution_crt == 0x02) {
-            if (!(dev->accel.advfunc_cntl & 0x04)) {
-                dev->hdisp = 640;
-                dev->vdisp = 480;
-                svga_recalctimings(svga);
-            }
-        } else {
-            if (ATI_8514A_ULTRA) {
-                if (dev->accel.advfunc_cntl & 0x04) {
-                    if (dev->hdisp == 640) {
-                        dev->hdisp = 1024;
-                        dev->vdisp = 768;
+        switch (mach->shadow_set & 0x03) {
+            case 0x00: /*Primary CRT Register set*/
+                if (dev->on) {
+                    if (mach->crt_resolution == 0x01) {
+                        if (ATI_8514A_ULTRA) {
+                            if (dev->accel.advfunc_cntl & 0x04) {
+                                if (dev->hdisp == 640) {
+                                    dev->hdisp = 1024;
+                                    dev->vdisp = 768;
+                                    svga_recalctimings(svga);
+                                }
+                            } else {
+                                if (dev->hdisp == 1024) {
+                                    dev->hdisp = 640;
+                                    dev->vdisp = 480;
+                                    svga_recalctimings(svga);
+                                }
+                            }
+                        } else
+                            svga_recalctimings(svga);
+                    } else if (mach->crt_resolution == 0x02) {
+                        if (dev->accel.advfunc_cntl & 0x04) {
+                            if (dev->hdisp == 640) {
+                                dev->hdisp = 1024;
+                                dev->vdisp = 768;
+                                svga_recalctimings(svga);
+                            }
+                        } else {
+                            if (dev->hdisp == 1024) {
+                                dev->hdisp = 640;
+                                dev->vdisp = 480;
+                                svga_recalctimings(svga);
+                            }
+                        }
+                    } else
                         svga_recalctimings(svga);
-                    }
                 }
-            }
+                break;
+            case 0x01: /*Shadow 640x480 CRT register set*/
+                if (dev->on) {
+                    if (!(dev->accel.advfunc_cntl & 0x04)) {
+                        if (dev->hdisp == 1024) {
+                            dev->hdisp = 640;
+                            dev->vdisp = 480;
+                        }
+                    }
+                    svga_recalctimings(svga);
+                }
+                break;
+            case 0x02: /*Shadow 1024x768 CRT register set*/
+                if (dev->on) {
+                    if (dev->accel.advfunc_cntl & 0x04) {
+                        if (dev->hdisp == 640) {
+                            dev->hdisp = 1024;
+                            dev->vdisp = 768;
+                        }
+                    }
+                    svga_recalctimings(svga);
+                }
+                break;
+            default:
+                break;
         }
     }
 }
@@ -2739,6 +2786,7 @@ ati8514_recalctimings(svga_t *svga)
         if (dev->interlace)
             dev->dispend >>= 1;
 
+        mach->crt_resolution = 0x00;
         mach_log("cntl=%d, hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x, shadow=%x interlace=%d.\n",
                  dev->accel.advfunc_cntl & 0x04, dev->h_disp, dev->dispend, dev->pitch, dev->rowoffset,
                  mach->accel.ext_ge_config & 0xcec0, mach->shadow_set & 3, dev->interlace);
@@ -2752,7 +2800,6 @@ ati8514_recalctimings(svga_t *svga)
             }
         }
         dev->accel_bpp = 8;
-        mach->resolution_crt = 0;
         svga->render8514 = ibm8514_render_8bpp;
     }
 }
@@ -2808,15 +2855,15 @@ mach_recalctimings(svga_t *svga)
             svga->ati_4color = 0;
     }
 
-    mach_log("ON?=%d, override=%d.\n", dev->on, svga->override);
+    mach_log("ON?=%d, override=%d, gelo=%04x, gehi=%04x, vgahdisp=%d.\n", dev->on, svga->override, mach->accel.ge_offset_lo, mach->accel.ge_offset_hi, svga->hdisp);
     if (dev->on) {
-        mach_log("8514/A ON, extpitch=%d, devma=%x, vgamalatch=%x.\n", dev->ext_pitch, dev->ma, svga->ma_latch);
-        dev->ma_latch                   = (mach->accel.crt_offset_lo | (mach->accel.crt_offset_hi << 16)) << 2;
+        dev->ma_latch                   = 0; /*(mach->accel.crt_offset_lo | (mach->accel.crt_offset_hi << 16)) << 2;*/
         dev->pitch                      = dev->ext_pitch;
         dev->rowoffset                  = dev->ext_crt_pitch;
         dev->rowcount                   = !!(dev->disp_cntl & 0x08);
         dev->accel.ge_offset            = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
         mach->accel.ge_offset           = dev->accel.ge_offset;
+        mach_log("8514/A ON, extpitch=%d, geoffset=%x, 8514malatch=%x, vgamalatch=%x.\n", dev->ext_pitch, mach->accel.ge_offset, dev->ma_latch, svga->ma_latch);
 
         mach_log("HDISP=%d, VDISP=%d, shadowset=%x, 8514/A mode=%x, clocksel=%02x, interlace=%x.\n",
                  dev->hdisp, dev->vdisp, mach->shadow_set & 0x03, dev->accel.advfunc_cntl & 0x04,
@@ -2836,6 +2883,7 @@ mach_recalctimings(svga_t *svga)
         if (dev->interlace)
             dev->dispend >>= 1;
 
+        mach->crt_resolution = 0x00;
         if (ATI_MACH32) {
             mach_log("cntl=%d, clksel=%x, hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x, shadow=%x interlace=%d, vgahdisp=%d.\n",
                      dev->accel.advfunc_cntl & 0x04, mach->accel.clock_sel & 0x01, dev->h_disp, dev->dispend, dev->pitch, dev->rowoffset,
@@ -2877,7 +2925,6 @@ mach_recalctimings(svga_t *svga)
                          dev->h_disp, dev->dispend, dev->pitch, dev->ext_crt_pitch, mach->accel.ext_ge_config & 0xcec0,
                          dev->accel_bpp, mach->shadow_set & 3, svga->hdisp);
 
-                mach->resolution_crt = 0;
                 switch (dev->accel_bpp) {
                     case 8:
                         svga->render8514 = ibm8514_render_8bpp;
@@ -2915,7 +2962,6 @@ mach_recalctimings(svga_t *svga)
                 }
             }
             dev->accel_bpp = 8;
-            mach->resolution_crt = 0;
             svga->render8514 = ibm8514_render_8bpp;
         }
     } else {
@@ -2973,7 +3019,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 
     switch (port) {
         case 0x2e8:
-            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
                 if (!(mach->shadow_cntl & 0x04))
                     dev->htotal = val;
 
@@ -2982,44 +3028,44 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             break;
 
         case 0xae8:
-            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
                 if (!(mach->shadow_cntl & 0x04)) {
                     WRITE8(port, dev->hsync_start, val);
                 }
-                svga_recalctimings(svga);
+                mach_set_resolution(mach, svga);
             }
             break;
 
         case 0xee8:
-            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
                 if (!(mach->shadow_cntl & 0x04)) {
                     WRITE8(port, dev->hsync_width, val);
                 }
-                svga_recalctimings(svga);
+                mach_set_resolution(mach, svga);
             }
             break;
 
         case 0x1ee8:
         case 0x1ee9:
             if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) /*For 8514/A mode, take the shadow sets into account.*/
-                svga_recalctimings(svga);
+                mach_set_resolution(mach, svga);
             break;
 
         case 0x6e8:
             if (len == 2) {
                 mach_log("HDISP and HTOTAL=%04x, len=%d, set=%x, ATI mode bit=%x.\n", val, len, mach->shadow_set & 0x03, mach->accel.clock_sel & 0x01);
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
-                    if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
-                        if (!(mach->shadow_cntl & 0x08)) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x04))
+                        dev->htotal = (val >> 8) & 0xff;
+
+                    if (!(mach->shadow_cntl & 0x08)) {
+                        if (dev->htotal || (mach->accel.clock_sel & 0x01)) {
                             WRITE8(port, dev->hdisped, val);
                         }
                     }
 
-                    if (ATI_8514A_ULTRA) {
-                        if (!(mach->shadow_cntl & 0x04))
-                            dev->htotal = (val >> 8) & 0xff;
-                    }
-                    mach_set_resolution(mach, svga);
+                    if (dev->htotal || (mach->accel.clock_sel & 0x01))
+                        mach_set_resolution(mach, svga);
                 }
             } else {
                 mach_log("HDISP and HTOTAL=%02x, len=%d, set=%x, ATI mode bit=%x.\n", val, len, mach->shadow_set & 0x03, mach->accel.clock_sel & 0x01);
@@ -3032,9 +3078,6 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                     if (!(mach->shadow_cntl & 0x08)) {
                         WRITE8(port, dev->hdisped, val);
                     }
-                    if (mach->resolution_crt == 0x00)
-                        mach->resolution_crt = 0x02;
-
                     mach_set_resolution(mach, svga);
                 }
             }
@@ -3045,10 +3088,10 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
         case 0x6e9:
             if (len == 1) {
                 mach_log("HDISP and HTOTAL+1=%02x, len=%d, set=%x, ATI mode bit=%x.\n", val, len, mach->shadow_set & 0x03, mach->accel.clock_sel & 0x01);
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
-                    if (!(mach->shadow_cntl & 0x04)) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x04))
                         dev->htotal = val;
-                    }
+
                     mach_set_resolution(mach, svga);
                 }
             }
@@ -3056,7 +3099,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 
         case 0x12e8:
             if (len == 2) {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
                     if (!(mach->shadow_cntl & 0x10)) {
                         dev->v_total_reg = val;
                         dev->v_total_reg &= 0x1fff;
@@ -3064,7 +3107,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                     mach_set_resolution(mach, svga);
                 }
             } else {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) { /*For 8514/A mode, take the shadow sets into account.*/
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
                     if (!(mach->shadow_cntl & 0x10)) {
                         WRITE8(port, dev->v_total_reg, val);
                         dev->v_total_reg &= 0x1fff;
@@ -3077,7 +3120,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 
         case 0x12e9:
             if (len == 1) {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
                     if (!(mach->shadow_cntl & 0x10)) { /*For 8514/A mode, take the shadow sets into account.*/
                         WRITE8(port, dev->v_total_reg, val);
                         dev->v_total_reg &= 0x1fff;
@@ -3090,8 +3133,14 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 
         case 0x16e8:
             if (len == 2) {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
-                    if (!(mach->shadow_cntl & 0x20)) { /*For 8514/A mode, take the shadow sets into account.*/
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x20)) {
+                        dev->v_disp = val;
+                        dev->v_disp &= 0x1fff;
+                    }
+                    mach_set_resolution(mach, svga);
+                } else if (!(mach->accel.clock_sel & 0x01) && ((mach->shadow_set & 0x03) == 0x00) && dev->on) { /*Still write the parameter even after going to 8514/A mode if needed*/
+                    if (!(mach->shadow_cntl & 0x20)) {
                         dev->v_disp = val;
                         dev->v_disp &= 0x1fff;
                     }
@@ -3100,8 +3149,8 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                 mach_log("ATI 8514/A: V_DISP write 16E8=%d, vdisp2=%d.\n", dev->v_disp, dev->v_disp2);
                 mach_log("ATI 8514/A: (0x%04x): vdisp=0x%02x.\n", port, val);
             } else {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
-                    if (!(mach->shadow_cntl & 0x20)) { /*For 8514/A mode, take the shadow sets into account.*/
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {  /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x20)) {
                         WRITE8(port, dev->v_disp, val);
                         dev->v_disp &= 0x1fff;
                     }
@@ -3111,8 +3160,8 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             break;
         case 0x16e9:
             if (len == 1) {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
-                    if (!(mach->shadow_cntl & 0x20)) { /*For 8514/A mode, take the shadow sets into account.*/
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x20)) {
                         WRITE8(port, dev->v_disp, val);
                         dev->v_disp &= 0x1fff;
                     }
@@ -3125,8 +3174,8 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 
         case 0x1ae8:
             if (len == 2) {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) {
-                    if (!(mach->shadow_cntl & 0x10)) { /*For 8514/A mode, take the shadow sets into account.*/
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {  /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x10)) {
                         dev->v_sync_start = val;
                         dev->v_sync_start &= 0x1fff;
                     }
@@ -3135,8 +3184,8 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                 mach_log("ATI 8514/A: V_SYNCSTART write 1AE8 = %d\n", dev->v_syncstart);
                 mach_log("ATI 8514/A: (0x%04x): vsyncstart=0x%02x.\n", port, val);
             } else {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) {
-                    if (!(mach->shadow_cntl & 0x10)) { /*For 8514/A mode, take the shadow sets into account.*/
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {  /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x10)) {
                         WRITE8(port, dev->v_sync_start, val);
                         dev->v_sync_start &= 0x1fff;
                     }
@@ -3146,8 +3195,8 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             break;
         case 0x1ae9:
             if (len == 1) {
-                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03)) || ATI_8514A_ULTRA) {
-                    if (!(mach->shadow_cntl & 0x10)) { /*For 8514/A mode, take the shadow sets into account.*/
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {  /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x10)) {
                         WRITE8(port, dev->v_sync_start, val);
                         dev->v_sync_start &= 0x1fff;
                     }
@@ -3168,7 +3217,6 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             svga_recalctimings(svga);
             break;
 
-
         case 0x42e8:
         case 0x42e9:
             mach_log("VBLANK stat=%02x, val=%02x.\n", dev->subsys_stat, val);
@@ -3672,11 +3720,19 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             if ((mach->shadow_set & 0x03) == 0x00)
                 mach_log("Primary CRT register set.\n");
             else if ((mach->shadow_set & 0x03) == 0x01) {
+                mach->crt_resolution = 0x01;
                 mach_log("CRT Shadow Set 1: 640x480.\n");
-                mach->resolution_crt = 0x01;
             } else if ((mach->shadow_set & 0x03) == 0x02) {
+                mach->crt_resolution = 0x02;
                 mach_log("CRT Shadow Set 2: 1024x768.\n");
-                mach->resolution_crt = 0x02;
+            }
+
+            if (ATI_MACH32) {
+                if ((mach->shadow_set & 0x300) == 0x000) {
+                    mach_log("Load both SRC/DST GE Offset/Pitch.\n");
+                    mach->accel.ge_offset_lo = 0;
+                    mach->accel.ge_offset_hi = 0;
+                }
             }
             break;
 
@@ -4182,11 +4238,11 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
                             case 4:
                             case 6:
                                 if (dev->accel.sy < 0)
-                                    dev->data_available = 0;
+                                    dev->data_available2 = 0;
                                 break;
                             default:
                                 if (!dev->accel.sy)
-                                    dev->data_available = 0;
+                                    dev->data_available2 = 0;
                                 break;
                         }
                     }
@@ -4525,10 +4581,10 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
                     if (cmd == 6) {
                         if ((dev->subsys_cntl & INT_GE_BSY) &&
                             !(dev->subsys_stat & INT_GE_BSY) &&
-                            (dev->accel.dx_ibm >= clip_l) &&
-                            (dev->accel.dx_ibm <= clip_r_ibm) &&
-                            (dev->accel.dy_ibm >= clip_t) &&
-                            (dev->accel.dy_ibm <= clip_b_ibm))
+                            (dev->accel.dx >= clip_l) &&
+                            (dev->accel.dx <= clip_r_ibm) &&
+                            (dev->accel.dy >= clip_t) &&
+                            (dev->accel.dy <= clip_b_ibm))
                             temp |= INT_GE_BSY;
                     } else {
                         if ((dev->subsys_cntl & INT_GE_BSY) &&
@@ -4678,6 +4734,7 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
                         temp = 0x0000;
                 }
             } else {
+                mach_log("ScratchPad0=%x.\n", mach->accel.scratch0);
                 if (mach->accel.scratch0 == 0x1234)
                     temp = 0x0000;
             }
@@ -7019,7 +7076,7 @@ ati8514_init(svga_t *svga, void *ext8514, void *dev8514)
     dev->disp_cntl = 0x33;
     mach->accel.clock_sel = 0x1c;
     mach->shadow_set = 0x02;
-    mach->resolution_crt = 0x02;
+    mach->crt_resolution = 0x02;
 
     io_sethandler(0x02ea, 4, ati8514_in, NULL, NULL, ati8514_out, NULL, NULL, svga);
     ati8514_io_set(svga);

From 8ff30ab2e63c55a03190b70040bc37bdac703d8d Mon Sep 17 00:00:00 2001
From: TC1995 <mariogplayer90@gmail.com>
Date: Sun, 30 Mar 2025 23:17:58 +0200
Subject: [PATCH 43/59] Mach64 ISA/VLB LFB update of the day (March 30th, 2025)

The LFB can now be enabled properly on the ISA/VLB variants of the Mach64GX.
---
 src/video/vid_ati_mach64.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/video/vid_ati_mach64.c b/src/video/vid_ati_mach64.c
index 24935e3a2..4ec9afff8 100644
--- a/src/video/vid_ati_mach64.c
+++ b/src/video/vid_ati_mach64.c
@@ -3768,6 +3768,9 @@ mach64_ext_outb(uint16_t port, uint8_t val, void *priv)
         case 0x6aee:
         case 0x6aef:
             WRITE8(port, mach64->config_cntl, val);
+            if (!mach64->pci)
+                mach64->linear_base = (mach64->config_cntl & 0x3ff0) << 18;
+
             mach64_updatemapping(mach64);
             break;
 

From 3f0138a58c117c96fec7e74326ca0a31fa48e537 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Mon, 31 Mar 2025 04:35:17 +0200
Subject: [PATCH 44/59] VIA On-board AC'97 Audio: Fix PCI registers, implement
 PCI Power Manager capability registers, properly separate the modem SGD from
 the audio SGD, and fix 5-bit volume attenuation, this also fixes audio
 playback in NT 4.0.

---
 src/chipset/via_pipc.c     | 149 +++++++++++++++++-------
 src/sound/snd_ac97_codec.c |   5 +-
 src/sound/snd_ac97_via.c   | 224 ++++++++++++++++++++-----------------
 3 files changed, 233 insertions(+), 145 deletions(-)

diff --git a/src/chipset/via_pipc.c b/src/chipset/via_pipc.c
index 6b855f5aa..248664983 100644
--- a/src/chipset/via_pipc.c
+++ b/src/chipset/via_pipc.c
@@ -493,14 +493,28 @@ pipc_reset_hard(void *priv)
             }
             dev->ac97_regs[i][0x1c] = 0x01;
 
+            if (i == 0) {
+                dev->ac97_regs[i][0x34] = 0xc0;
+
+                dev->ac97_regs[i][0xc0] = 0x01;
+                dev->ac97_regs[i][0xc1] = 0x00;
+                dev->ac97_regs[i][0xc2] = 0x03;
+                dev->ac97_regs[i][0xc3] = 0x00;
+
+                dev->ac97_regs[i][0xc4] = 0x00;
+                dev->ac97_regs[i][0xc5] = 0x00;
+                dev->ac97_regs[i][0xc6] = 0x00;
+                dev->ac97_regs[i][0xc7] = 0x00;
+            }
+
             dev->ac97_regs[i][0x3d] = 0x03;
 
-            if (i == 0)
+            if (i == 0) {
                 dev->ac97_regs[i][0x40] = 0x01;
-
-            dev->ac97_regs[i][0x43] = 0x1c;
-            dev->ac97_regs[i][0x48] = 0x01;
-            dev->ac97_regs[i][0x4b] = 0x02;
+                dev->ac97_regs[i][0x43] = 0x1c;
+                dev->ac97_regs[i][0x48] = 0x01;
+                dev->ac97_regs[i][0x4b] = 0x00;
+            }
 
             pipc_sgd_handlers(dev, i);
             pipc_codec_handlers(dev, i);
@@ -742,10 +756,12 @@ pipc_codec_handlers(pipc_t *dev, uint8_t modem)
     if (!dev->ac97)
         return;
 
+    uint32_t base = (dev->ac97_regs[modem][0x1d] << 8);
+
     if (modem)
-        ac97_via_remap_modem_codec(dev->ac97, dev->ac97_regs[1][0x1d] << 8, dev->ac97_regs[1][0x04] & PCI_COMMAND_IO);
+        ac97_via_remap_modem_codec(dev->ac97, base, dev->ac97_regs[1][0x04] & PCI_COMMAND_IO);
     else
-        ac97_via_remap_audio_codec(dev->ac97, dev->ac97_regs[0][0x1d] << 8, dev->ac97_regs[0][0x04] & PCI_COMMAND_IO);
+        ac97_via_remap_audio_codec(dev->ac97, base, dev->ac97_regs[0][0x04] & PCI_COMMAND_IO);
 }
 
 static uint8_t
@@ -1204,7 +1220,7 @@ pipc_write(int func, int addr, uint8_t val, void *priv)
 
             case 0x77:
                 if ((dev->local >= VIA_PIPC_686A) && (val & 0x10))
-                    pclog("PIPC: Warning: Internal I/O APIC enabled.\n");
+                    warning("PIPC: Warning: Internal I/O APIC enabled.\n");
                 nvr_via_wp_set(!!(val & 0x04), 0x32, dev->nvr);
                 nvr_via_wp_set(!!(val & 0x02), 0x0d, dev->nvr);
                 break;
@@ -1488,36 +1504,39 @@ pipc_write(int func, int addr, uint8_t val, void *priv)
                 break;
         }
     } else if (func <= pm_func + 2) { /* AC97 / MC97 */
-        /* Read-only addresses. */
-        if ((addr < 0x4) || ((addr >= 0x6) && (addr < 0x9)) || ((addr >= 0xc) && (addr < 0x11)) || (addr == 0x16) || (addr == 0x17) || (addr == 0x1a) || (addr == 0x1b) || ((addr >= 0x1e) && (addr < 0x2c)) || ((addr >= 0x30) && (addr < 0x34)) || ((addr >= 0x35) && (addr < 0x3c)) || ((addr >= 0x3d) && (addr < 0x41)) || ((addr >= 0x45) && (addr < 0x4a)) || (addr >= 0x4c))
-            return;
-
         /* Small shortcut. */
         func = func - pm_func - 1;
 
-        /* Check disable bits and specific read-only addresses for both controllers. */
-        if ((func == 0) && (((addr >= 0x09) && (addr < 0xc)) || (addr == 0x44) || (dev->pci_isa_regs[0x85] & 0x04)))
+        /* Check disable bits. */
+        if ((func == 0) && (dev->pci_isa_regs[0x85] & 0x04))
             return;
 
-        if ((func == 1) && ((addr == 0x14) || (addr == 0x15) || (addr == 0x18) || (addr == 0x19) || (addr == 0x42) || (addr == 0x43) || (addr == 0x48) || (addr == 0x4a) || (addr == 0x4b) || (dev->pci_isa_regs[0x85] & 0x08)))
+        if ((func == 1) && (dev->pci_isa_regs[0x85] & 0x08))
             return;
 
         switch (addr) {
             case 0x04:
-                dev->ac97_regs[func][addr] = val;
+                dev->ac97_regs[func][addr] = val & 0x01;
                 pipc_sgd_handlers(dev, func);
+                if (func == 0) {
+                    pipc_fmnmi_handlers(dev, func);
+                    pipc_sb_handlers(dev, func);
+                }
                 pipc_codec_handlers(dev, func);
-                pipc_fmnmi_handlers(dev, func);
                 break;
 
             case 0x09:
             case 0x0a:
             case 0x0b:
-                if (dev->ac97_regs[func][0x44] & 0x20)
+                /* Not writable on audio, only on modem. */
+                if ((func == 1) && (dev->ac97_regs[func][0x44] & 0x20))
                     dev->ac97_regs[func][addr] = val;
                 break;
 
-            case 0x10:
+            /*
+               The lowest 10 bytes are always 0x01, indicating
+               a 256-byte I/O space.
+             */
             case 0x11:
                 dev->ac97_regs[func][addr] = val;
                 pipc_sgd_handlers(dev, func);
@@ -1525,21 +1544,26 @@ pipc_write(int func, int addr, uint8_t val, void *priv)
 
             case 0x14:
             case 0x15:
-                if (addr == 0x14)
-                    val = (val & 0xfc) | 1;
-                dev->ac97_regs[func][addr] = val;
-                pipc_fmnmi_handlers(dev, func);
+                /* Not present on modem. */
+                if (func == 0) {
+                    if (addr == 0x14)
+                        val = (val & 0xfc) | 1;
+                    dev->ac97_regs[func][addr] = val;
+                    pipc_fmnmi_handlers(dev, func);
+                }
                 break;
 
             case 0x18:
             case 0x19:
-                if (addr == 0x18)
-                    val = (val & 0xfc) | 1;
-                dev->ac97_regs[func][addr] = val;
-                pipc_sb_handlers(dev, func);
+                /* Not present on modem. */
+                if (func == 0) {
+                    if (addr == 0x18)
+                        val = (val & 0xfc) | 1;
+                    dev->ac97_regs[func][addr] = val;
+                    pipc_sb_handlers(dev, func);
+                }
                 break;
 
-            case 0x1c:
             case 0x1d:
                 dev->ac97_regs[func][addr] = val;
                 pipc_codec_handlers(dev, func);
@@ -1549,39 +1573,84 @@ pipc_write(int func, int addr, uint8_t val, void *priv)
             case 0x2d:
             case 0x2e:
             case 0x2f:
-                if ((func == 0) && (dev->ac97_regs[func][0x42] & 0x20))
+                if (((func == 0) && (dev->ac97_regs[func][0x42] & 0x20)) ||
+                    ((func == 1) && (dev->ac97_regs[func][0x44] & 0x10)))
                     dev->ac97_regs[func][addr] = val;
                 break;
 
+            case 0x3c:
+                dev->ac97_regs[func][addr] = val & 0x0f;
+                break;
+
             case 0x41:
                 dev->ac97_regs[func][addr] = val;
                 ac97_via_write_control(dev->ac97, func, val);
                 break;
 
             case 0x42:
-            case 0x4a:
-            case 0x4b:
-                dev->ac97_regs[0][addr] = dev->ac97_regs[1][addr] = val;
-                gameport_remap(dev->gameport, (dev->ac97_regs[0][0x42] & 0x08) ? ((dev->ac97_regs[0][0x4b] << 8) | (dev->ac97_regs[0][0x4a] & 0xf8)) : 0);
-                if (addr == 0x42)
-                    pipc_sb_handlers(dev, func);
+            case 0x4a ... 0x4b:
+                if (func == 0) {
+                    dev->ac97_regs[func][addr] = val;
+                    gameport_remap(dev->gameport, (dev->ac97_regs[func][0x42] & 0x08) ?
+                                                  ((dev->ac97_regs[func][0x4b] << 8) |
+                                                  (dev->ac97_regs[func][0x4a] & 0xf8)) : 0);
+
+                    if (addr == 0x42)
+                        pipc_sb_handlers(dev, func);
+                }
                 break;
 
             case 0x43:
-                dev->ac97_regs[0][addr] = dev->ac97_regs[1][addr] = val;
+                if (func == 0)
+                    dev->ac97_regs[func][addr] = val;
                 break;
 
             case 0x44:
-                dev->ac97_regs[0][addr] = dev->ac97_regs[1][addr] = val & 0xf0;
+                if (func == 1)
+                    dev->ac97_regs[func][addr] = val & 0xf0;
                 break;
 
-            case 0x45:
             case 0x48:
-                dev->ac97_regs[0][addr] = dev->ac97_regs[1][addr] = val & 0x0f;
+                if (func == 0)
+                    dev->ac97_regs[func][addr] = val & 0x0f;
+                break;
+
+            case 0x80:
+            case 0x81:
+            case 0x82:
+                dev->ac97_regs[func][addr] = val;
+                break;
+            case 0x83:
+                dev->ac97_regs[func][addr] = ((dev->ac97_regs[func][addr] & 0x01) |
+                                              (val & 0xc0)) & ~(val & 0x0a);
+                break;
+
+            case 0x88:
+            case 0x89:
+                dev->ac97_regs[func][addr] = val;
+                break;
+            case 0x8a:
+            case 0x8b:
+                dev->ac97_regs[func][addr] &= ~val;
+                break;
+
+            case 0x8e:
+            case 0x8f:
+                dev->ac97_regs[func][addr] = val;
+                break;
+
+            case 0xc4:
+                if (func == 0)
+                    dev->ac97_regs[func][addr] = (dev->ac97_regs[func][addr] & 0x0c) |
+                                                 (val & 0x03);
+                break;
+            case 0xc5:
+                if (func == 0)
+                    dev->ac97_regs[func][addr] = (dev->ac97_regs[func][addr] & 0x60) |
+                                                 (val & 0x9f);
                 break;
 
             default:
-                dev->ac97_regs[func][addr] = val;
                 break;
         }
     }
diff --git a/src/sound/snd_ac97_codec.c b/src/sound/snd_ac97_codec.c
index e92830f67..7a9951289 100644
--- a/src/sound/snd_ac97_codec.c
+++ b/src/sound/snd_ac97_codec.c
@@ -539,8 +539,9 @@ ac97_codec_getattn(void *priv, uint8_t reg, int *l, int *r)
             *l = codec_attn[0x3f - (l_val & 0x3f)];
             *r = codec_attn[0x3f - (r_val & 0x3f)];
         } else { /* 5-bit gain */
-            *l = codec_attn[0x47 - (l_val & 0x1f)];
-            *r = codec_attn[0x47 - (r_val & 0x1f)];
+            /* Yes, 0x3f is correct, the 0x47 was most likely a decimal-hex mix-up. */
+            *l = codec_attn[0x3f - (l_val & 0x1f)];
+            *r = codec_attn[0x3f - (r_val & 0x1f)];
         }
 
         /* Apply per-channel mute and center/LFE powerdowns where applicable. */
diff --git a/src/sound/snd_ac97_via.c b/src/sound/snd_ac97_via.c
index 8c1e45c40..68ef5fe5d 100644
--- a/src/sound/snd_ac97_via.c
+++ b/src/sound/snd_ac97_via.c
@@ -24,6 +24,7 @@
 #include <86box/86box.h>
 #include <86box/device.h>
 #include <86box/io.h>
+#include <86box/dma.h>
 #include <86box/mem.h>
 #include <86box/pci.h>
 #include <86box/pic.h>
@@ -31,10 +32,13 @@
 #include <86box/sound.h>
 #include <86box/timer.h>
 #include <86box/plat_unused.h>
+#include "cpu.h"
 
 typedef struct ac97_via_sgd_t {
     uint8_t            id;
     uint8_t            always_run;
+    uint8_t            modem;
+    uint8_t            pad;
     struct _ac97_via_ *dev;
 
     uint32_t entry_ptr;
@@ -63,7 +67,7 @@ typedef struct _ac97_via_ {
     uint16_t audio_codec_base;
     uint16_t modem_sgd_base;
     uint16_t modem_codec_base;
-    uint8_t  sgd_regs[256];
+    uint8_t  sgd_regs[2][256];
     uint8_t  pcm_enabled : 1;
     uint8_t  fm_enabled : 1;
     uint8_t  vsr_enabled : 1;
@@ -78,7 +82,7 @@ typedef struct _ac97_via_ {
     int irq_pin;
 
     ac97_codec_t  *codec[2][2];
-    ac97_via_sgd_t sgd[6];
+    ac97_via_sgd_t sgd[2][6];
 
     int master_vol_l;
     int master_vol_r;
@@ -105,7 +109,7 @@ ac97_via_log(const char *fmt, ...)
 #endif
 
 static void ac97_via_sgd_process(void *priv);
-static void ac97_via_update_codec(ac97_via_t *dev);
+static void ac97_via_update_codec(ac97_via_t *dev, int modem);
 static void ac97_via_speed_changed(void *priv);
 static void ac97_via_filter_cd_audio(int channel, double *buffer, void *priv);
 
@@ -160,29 +164,29 @@ ac97_via_write_control(void *priv, uint8_t modem, uint8_t val)
         /* Start or stop PCM playback. */
         i = (val & 0xf4) == 0xc4;
         if (i && !dev->pcm_enabled)
-            timer_advance_u64(&dev->sgd[0].poll_timer, dev->sgd[0].timer_latch);
+            timer_advance_u64(&dev->sgd[0][0].poll_timer, dev->sgd[0][0].timer_latch);
         dev->pcm_enabled = i;
 
         /* Start or stop FM playback. */
         i = (val & 0xf2) == 0xc2;
         if (i && !dev->fm_enabled)
-            timer_advance_u64(&dev->sgd[2].poll_timer, dev->sgd[2].timer_latch);
+            timer_advance_u64(&dev->sgd[0][2].poll_timer, dev->sgd[0][2].timer_latch);
         dev->fm_enabled = i;
 
         /* Update primary audio codec state. */
         if (dev->codec[0][0])
-            ac97_via_update_codec(dev);
+            ac97_via_update_codec(dev, 0);
     }
 }
 
 static void
-ac97_via_update_irqs(ac97_via_t *dev)
+ac97_via_update_irqs(ac97_via_t *dev, int modem)
 {
     /* Check interrupt flags in all SGDs. */
     for (uint8_t i = 0x00; i < ((sizeof(dev->sgd) / sizeof(dev->sgd[0])) << 4); i += 0x10) {
         /* Stop immediately if any flag is set. Doing it this way optimizes
            rising edges for the playback SGD (0 - first to be checked). */
-        if (dev->sgd_regs[i] & (dev->sgd_regs[i | 0x2] & 0x03)) {
+        if (dev->sgd_regs[modem][i] & (dev->sgd_regs[modem][i | 0x2] & 0x03)) {
             pci_set_irq(dev->pci_slot, dev->irq_pin, &dev->irq_state);
             return;
         }
@@ -192,15 +196,15 @@ ac97_via_update_irqs(ac97_via_t *dev)
 }
 
 static void
-ac97_via_update_codec(ac97_via_t *dev)
+ac97_via_update_codec(ac97_via_t *dev, int modem)
 {
     /* Get primary audio codec. */
-    ac97_codec_t *codec = dev->codec[0][0];
+    ac97_codec_t *codec = dev->codec[modem][0];
 
     /* Update volumes according to codec registers. */
     ac97_codec_getattn(codec, 0x02, &dev->master_vol_l, &dev->master_vol_r);
-    ac97_codec_getattn(codec, 0x18, &dev->sgd[0].vol_l, &dev->sgd[0].vol_r);
-    ac97_codec_getattn(codec, 0x18, &dev->sgd[2].vol_l, &dev->sgd[2].vol_r); /* VIAFMTSR sets Master, CD and PCM volumes to 0 dB */
+    ac97_codec_getattn(codec, 0x18, &dev->sgd[modem][0].vol_l, &dev->sgd[modem][0].vol_r);
+    ac97_codec_getattn(codec, 0x18, &dev->sgd[modem][2].vol_l, &dev->sgd[modem][2].vol_r); /* VIAFMTSR sets Master, CD and PCM volumes to 0 dB */
     ac97_codec_getattn(codec, 0x12, &dev->cd_vol_l, &dev->cd_vol_r);
 
     /* Update sample rate according to codec registers and the variable sample rate flag. */
@@ -211,9 +215,9 @@ uint8_t
 ac97_via_sgd_read(uint16_t addr, void *priv)
 {
     const ac97_via_t *dev = (ac97_via_t *) priv;
-#ifdef ENABLE_AC97_VIA_LOG
+// #ifdef ENABLE_AC97_VIA_LOG
     uint8_t modem = (addr & 0xff00) == dev->modem_sgd_base;
-#endif
+// #endif
     addr &= 0xff;
     uint8_t ret;
 
@@ -221,83 +225,83 @@ ac97_via_sgd_read(uint16_t addr, void *priv)
         /* Process SGD channel registers. */
         switch (addr & 0xf) {
             case 0x4:
-                ret = dev->sgd[addr >> 4].entry_ptr;
+                ret = dev->sgd[modem][addr >> 4].entry_ptr;
                 break;
 
             case 0x5:
-                ret = dev->sgd[addr >> 4].entry_ptr >> 8;
+                ret = dev->sgd[modem][addr >> 4].entry_ptr >> 8;
                 break;
 
             case 0x6:
-                ret = dev->sgd[addr >> 4].entry_ptr >> 16;
+                ret = dev->sgd[modem][addr >> 4].entry_ptr >> 16;
                 break;
 
             case 0x7:
-                ret = dev->sgd[addr >> 4].entry_ptr >> 24;
+                ret = dev->sgd[modem][addr >> 4].entry_ptr >> 24;
                 break;
 
             case 0xc:
-                ret = dev->sgd[addr >> 4].sample_count;
+                ret = dev->sgd[modem][addr >> 4].sample_count;
                 break;
 
             case 0xd:
-                ret = dev->sgd[addr >> 4].sample_count >> 8;
+                ret = dev->sgd[modem][addr >> 4].sample_count >> 8;
                 break;
 
             case 0xe:
-                ret = dev->sgd[addr >> 4].sample_count >> 16;
+                ret = dev->sgd[modem][addr >> 4].sample_count >> 16;
                 break;
 
             default:
-                ret = dev->sgd_regs[addr];
+                ret = dev->sgd_regs[modem][addr];
                 break;
         }
     } else {
         /* Process regular registers. */
         switch (addr) {
             case 0x84:
-                ret = (dev->sgd_regs[0x00] & 0x01);
-                ret |= (dev->sgd_regs[0x10] & 0x01) << 1;
-                ret |= (dev->sgd_regs[0x20] & 0x01) << 2;
+                ret = (dev->sgd_regs[modem][0x00] & 0x01);
+                ret |= (dev->sgd_regs[modem][0x10] & 0x01) << 1;
+                ret |= (dev->sgd_regs[modem][0x20] & 0x01) << 2;
 
-                ret |= (dev->sgd_regs[0x00] & 0x02) << 3;
-                ret |= (dev->sgd_regs[0x10] & 0x02) << 4;
-                ret |= (dev->sgd_regs[0x20] & 0x02) << 5;
+                ret |= (dev->sgd_regs[modem][0x00] & 0x02) << 3;
+                ret |= (dev->sgd_regs[modem][0x10] & 0x02) << 4;
+                ret |= (dev->sgd_regs[modem][0x20] & 0x02) << 5;
                 break;
 
             case 0x85:
-                ret = (dev->sgd_regs[0x00] & 0x04) >> 2;
-                ret |= (dev->sgd_regs[0x10] & 0x04) >> 1;
-                ret |= (dev->sgd_regs[0x20] & 0x04);
+                ret = (dev->sgd_regs[modem][0x00] & 0x04) >> 2;
+                ret |= (dev->sgd_regs[modem][0x10] & 0x04) >> 1;
+                ret |= (dev->sgd_regs[modem][0x20] & 0x04);
 
-                ret |= (dev->sgd_regs[0x00] & 0x80) >> 3;
-                ret |= (dev->sgd_regs[0x10] & 0x80) >> 2;
-                ret |= (dev->sgd_regs[0x20] & 0x80) >> 1;
+                ret |= (dev->sgd_regs[modem][0x00] & 0x80) >> 3;
+                ret |= (dev->sgd_regs[modem][0x10] & 0x80) >> 2;
+                ret |= (dev->sgd_regs[modem][0x20] & 0x80) >> 1;
                 break;
 
             case 0x86:
-                ret = (dev->sgd_regs[0x40] & 0x01);
-                ret |= (dev->sgd_regs[0x50] & 0x01) << 1;
+                ret = (dev->sgd_regs[modem][0x40] & 0x01);
+                ret |= (dev->sgd_regs[modem][0x50] & 0x01) << 1;
 
-                ret |= (dev->sgd_regs[0x40] & 0x02) << 3;
-                ret |= (dev->sgd_regs[0x50] & 0x02) << 4;
+                ret |= (dev->sgd_regs[modem][0x40] & 0x02) << 3;
+                ret |= (dev->sgd_regs[modem][0x50] & 0x02) << 4;
                 break;
 
             case 0x87:
-                ret = (dev->sgd_regs[0x40] & 0x04) >> 2;
-                ret |= (dev->sgd_regs[0x50] & 0x04) >> 1;
+                ret = (dev->sgd_regs[modem][0x40] & 0x04) >> 2;
+                ret |= (dev->sgd_regs[modem][0x50] & 0x04) >> 1;
 
-                ret |= (dev->sgd_regs[0x40] & 0x80) >> 3;
-                ret |= (dev->sgd_regs[0x50] & 0x80) >> 2;
+                ret |= (dev->sgd_regs[modem][0x40] & 0x80) >> 3;
+                ret |= (dev->sgd_regs[modem][0x50] & 0x80) >> 2;
                 break;
 
             default:
-                ret = dev->sgd_regs[addr];
+                ret = dev->sgd_regs[modem][addr];
                 break;
         }
     }
 
-    ac97_via_log("AC97 VIA %d: sgd_read(%02X) = %02X\n", modem, addr, ret);
+    ac97_via_log("[%04X:%08X] [%i] AC97 VIA %d: sgd_read(%02X) = %02X\n", CS, cpu_state.pc, msw & 1, modem, addr, ret);
 
     return ret;
 }
@@ -311,7 +315,9 @@ ac97_via_sgd_write(uint16_t addr, uint8_t val, void *priv)
     ac97_codec_t *codec;
     addr &= 0xff;
 
-    ac97_via_log("AC97 VIA %d: sgd_write(%02X, %02X)\n", modem, addr, val);
+    ac97_via_log("[%04X:%08X] [%i] AC97 VIA %d: sgd_write(%02X, %02X)\n", CS, cpu_state.pc, msw & 1, modem, addr, val);
+
+    // if ((CS == 0x10000) && (cpu_state.pc == 0x000073d1))
 
     /* Check function-specific read only registers. */
     if ((addr >= (modem ? 0x00 : 0x40)) && (addr < (modem ? 0x40 : 0x60)))
@@ -324,42 +330,42 @@ ac97_via_sgd_write(uint16_t addr, uint8_t val, void *priv)
         switch (addr & 0xf) {
             case 0x0:
                 /* Clear RWC status bits. */
-                dev->sgd_regs[addr] &= ~(val & 0x07);
+                dev->sgd_regs[modem][addr] &= ~(val & 0x07);
 
                 /* Update status interrupts. */
-                ac97_via_update_irqs(dev);
+                ac97_via_update_irqs(dev, modem);
 
                 return;
 
             case 0x1:
                 /* Start SGD if requested. */
                 if (val & 0x80) {
-                    if (dev->sgd_regs[addr & 0xf0] & 0x80) {
+                    if (dev->sgd_regs[modem][addr & 0xf0] & 0x80) {
                         /* Queue SGD trigger if already running. */
-                        dev->sgd_regs[addr & 0xf0] |= 0x08;
+                        dev->sgd_regs[modem][addr & 0xf0] |= 0x08;
                     } else {
                         /* Start SGD immediately. */
-                        dev->sgd_regs[addr & 0xf0] = (dev->sgd_regs[addr & 0xf0] & ~0x47) | 0x80;
+                        dev->sgd_regs[modem][addr & 0xf0] = (dev->sgd_regs[modem][addr & 0xf0] & ~0x47) | 0x80;
 
                         /* Start at the specified entry pointer. */
-                        dev->sgd[addr >> 4].entry_ptr  = *((uint32_t *) &dev->sgd_regs[(addr & 0xf0) | 0x4]) & 0xfffffffe;
-                        dev->sgd[addr >> 4].restart    = 2;
+                        dev->sgd[modem][addr >> 4].entry_ptr  = *((uint32_t *) &dev->sgd_regs[modem][(addr & 0xf0) | 0x4]) & 0xfffffffe;
+                        dev->sgd[modem][addr >> 4].restart    = 2;
 
                         /* Start the actual SGD process. */
-                        ac97_via_sgd_process(&dev->sgd[addr >> 4]);
+                        ac97_via_sgd_process(&dev->sgd[modem][addr >> 4]);
                     }
                 }
                 /* Stop SGD if requested. */
                 if (val & 0x40)
-                    dev->sgd_regs[addr & 0xf0] &= ~0x88;
+                    dev->sgd_regs[modem][addr & 0xf0] &= ~0x88;
 
                 val &= 0x08;
 
                 /* (Un)pause SGD if requested. */
                 if (val & 0x08)
-                    dev->sgd_regs[addr & 0xf0] |= 0x40;
+                    dev->sgd_regs[modem][addr & 0xf0] |= 0x40;
                 else
-                    dev->sgd_regs[addr & 0xf0] &= ~0x40;
+                    dev->sgd_regs[modem][addr & 0xf0] &= ~0x40;
 
                 break;
 
@@ -387,7 +393,7 @@ ac97_via_sgd_write(uint16_t addr, uint8_t val, void *priv)
 
             case 0x82:
                 /* Determine the selected codec. */
-                i     = !!(dev->sgd_regs[0x83] & 0x40);
+                i     = !!(dev->sgd_regs[modem][0x83] & 0x40);
                 codec = dev->codec[modem][i];
 
                 /* Keep value in register if this codec is not present. */
@@ -395,20 +401,20 @@ ac97_via_sgd_write(uint16_t addr, uint8_t val, void *priv)
                     /* Read from or write to codec. */
                     if (val & 0x80) {
                         if (val & 1) { /* return 0x0000 on unaligned reads (real 686B behavior) */
-                            dev->sgd_regs[0x80] = dev->sgd_regs[0x81] = 0x00;
+                            dev->sgd_regs[modem][0x80] = dev->sgd_regs[modem][0x81] = 0x00;
                         } else {
-                            *((uint16_t *) &dev->codec_shadow[modem].regs_codec[i][val & 0x7f]) = *((uint16_t *) &dev->sgd_regs[0x80]) = ac97_codec_readw(codec, val);
+                            *((uint16_t *) &dev->codec_shadow[modem].regs_codec[i][val & 0x7f]) = *((uint16_t *) &dev->sgd_regs[modem][0x80]) = ac97_codec_readw(codec, val);
                         }
 
                         /* Flag data/status/index for this codec as valid. */
-                        dev->sgd_regs[0x83] |= 0x02 << (i << 1);
+                        dev->sgd_regs[modem][0x83] |= 0x02 << (i << 1);
                     } else if (!(val & 1)) { /* do nothing on unaligned writes */
                         ac97_codec_writew(codec, val,
-                                          *((uint16_t *) &dev->codec_shadow[modem].regs_codec[i][val & 0x7f]) = *((uint16_t *) &dev->sgd_regs[0x80]));
+                                          *((uint16_t *) &dev->codec_shadow[modem].regs_codec[i][val & 0x7f]) = *((uint16_t *) &dev->sgd_regs[modem][0x80]));
 
                         /* Update primary audio codec state if that codec was written to. */
                         if (!modem && !i) {
-                            ac97_via_update_codec(dev);
+                            ac97_via_update_codec(dev, 0);
 
                             /* Set up CD audio filter if CD volume was written to. Setting it
                                up at init prevents CD audio from working on other cards, but
@@ -424,9 +430,9 @@ ac97_via_sgd_write(uint16_t addr, uint8_t val, void *priv)
             case 0x83:
                 /* Clear RWC status bits. */
 #if 0 /* race condition with Linux accessing a register and clearing status bits on the same dword write */
-            val = (dev->sgd_regs[addr] & ~(val & 0x0a)) | (val & 0xc0);
+            val = ((dev->sgd_regs[modem][addr] & 0x3f) & ~(val & 0x0a)) | (val & 0xc0);
 #else
-                val = dev->sgd_regs[addr] | (val & 0xc0);
+                val = (dev->sgd_regs[modem][addr] & 0x3f) | (val & 0xc0);
 #endif
                 break;
 
@@ -435,7 +441,7 @@ ac97_via_sgd_write(uint16_t addr, uint8_t val, void *priv)
         }
     }
 
-    dev->sgd_regs[addr] = val;
+    dev->sgd_regs[modem][addr] = val;
 }
 
 void
@@ -479,6 +485,8 @@ ac97_via_codec_read(uint16_t addr, void *priv)
 
     ac97_via_log("AC97 VIA %d: codec_read(%02X) = %02X\n", modem, addr, ret);
 
+    ac97_via_log("[%04X:%08X] [%i] AC97 VIA %d: codec_read(%02X) = %02X\n", CS, cpu_state.pc, msw & 1, modem, addr, ret);
+
     return ret;
 }
 
@@ -489,6 +497,8 @@ ac97_via_codec_write(uint16_t addr, uint8_t val, void *priv)
     uint8_t     modem = (addr & 0xff00) == dev->modem_codec_base;
     addr &= 0xff;
 
+    ac97_via_log("[%04X:%08X] [%i] AC97 VIA %d: codec_write(%02X, %02X)\n", CS, cpu_state.pc, msw & 1, modem, addr, val);
+
     ac97_via_log("AC97 VIA %d: codec_write(%02X, %02X)\n", modem, addr, val);
 
     /* Unknown behavior, maybe it does write to the shadow registers? */
@@ -501,12 +511,12 @@ ac97_via_remap_audio_codec(void *priv, uint16_t new_io_base, uint8_t enable)
     ac97_via_t *dev = (ac97_via_t *) priv;
 
     if (dev->audio_codec_base)
-        io_removehandler(dev->audio_codec_base, 256, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
+        io_removehandler(dev->audio_codec_base, 4, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
 
     dev->audio_codec_base = new_io_base;
 
     if (dev->audio_codec_base && enable)
-        io_sethandler(dev->audio_codec_base, 256, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
+        io_sethandler(dev->audio_codec_base, 4, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
 }
 
 void
@@ -515,12 +525,12 @@ ac97_via_remap_modem_codec(void *priv, uint16_t new_io_base, uint8_t enable)
     ac97_via_t *dev = (ac97_via_t *) priv;
 
     if (dev->modem_codec_base)
-        io_removehandler(dev->modem_codec_base, 256, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
+        io_removehandler(dev->modem_codec_base, 4, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
 
     dev->modem_codec_base = new_io_base;
 
     if (dev->modem_codec_base && enable)
-        io_sethandler(dev->modem_codec_base, 256, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
+        io_sethandler(dev->modem_codec_base, 4, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
 }
 
 static void
@@ -551,12 +561,12 @@ ac97_via_sgd_process(void *priv)
     ac97_via_t     *dev = sgd->dev;
 
     /* Stop if this SGD is not active. */
-    uint8_t sgd_status = dev->sgd_regs[sgd->id] & 0xc4;
+    uint8_t sgd_status = dev->sgd_regs[sgd->modem][sgd->id] & 0xc4;
     if (!(sgd_status & 0x80))
         return;
 
     /* Schedule next run. */
-    timer_on_auto(&sgd->dma_timer, 10.0);
+    timer_on_auto(&sgd->dma_timer, 1.0);
 
     /* Process SGD if it's active, and the FIFO has room or is disabled. */
     if (((sgd_status & 0xc7) == 0x80) && (sgd->always_run || ((sgd->fifo_end - sgd->fifo_pos) <= (sizeof(sgd->fifo) - 4)))) {
@@ -564,13 +574,15 @@ ac97_via_sgd_process(void *priv)
         if (sgd->restart) {
             /* (Re)load entry pointer if required. */
             if (sgd->restart & 2)
-                sgd->entry_ptr = *((uint32_t *) &dev->sgd_regs[sgd->id | 0x4]) & 0xfffffffe; /* TODO: probe real hardware - does "even addr" actually mean dword aligned? */
+                sgd->entry_ptr = *((uint32_t *) &dev->sgd_regs[sgd->modem][sgd->id | 0x4]) & 0xfffffffe; /* TODO: probe real hardware - does "even addr" actually mean dword aligned? */
             sgd->restart = 0;
 
             /* Read entry. */
-            sgd->sample_ptr = mem_readl_phys(sgd->entry_ptr);
+            // sgd->sample_ptr = mem_readl_phys(sgd->entry_ptr);
+            dma_bm_read(sgd->entry_ptr, (uint8_t *) &sgd->sample_ptr, 4, 4);
             sgd->entry_ptr += 4;
-            sgd->sample_count = mem_readl_phys(sgd->entry_ptr);
+            // sgd->sample_count = mem_readl_phys(sgd->entry_ptr);
+            dma_bm_read(sgd->entry_ptr, (uint8_t *) &sgd->sample_count, 4, 4);
             sgd->entry_ptr += 4;
 #ifdef ENABLE_AC97_VIA_LOG
             if (((sgd->sample_ptr == 0xffffffff) && (sgd->sample_count == 0xffffffff)) || ((sgd->sample_ptr == 0x00000000) && (sgd->sample_count == 0x00000000)))
@@ -588,10 +600,12 @@ ac97_via_sgd_process(void *priv)
 
         if (sgd->id & 0x10) {
             /* Write channel: read data from FIFO. */
-            mem_writel_phys(sgd->sample_ptr, *((uint32_t *) &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)]));
+            // mem_writel_phys(sgd->sample_ptr, *((uint32_t *) &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)]));
+            dma_bm_write(sgd->sample_ptr, &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)], 4, 4);
         } else {
             /* Read channel: write data to FIFO. */
-            *((uint32_t *) &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)]) = mem_readl_phys(sgd->sample_ptr);
+            // *((uint32_t *) &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)]) = mem_readl_phys(sgd->sample_ptr);
+            dma_bm_read(sgd->sample_ptr, &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)], 4, 4);
         }
         sgd->fifo_end += 4;
         sgd->sample_ptr += 4;
@@ -608,17 +622,17 @@ ac97_via_sgd_process(void *priv)
                 ac97_via_log(" with STOP");
 
                 /* Raise STOP to pause SGD. */
-                dev->sgd_regs[sgd->id] |= 0x04;
+                dev->sgd_regs[sgd->modem][sgd->id] |= 0x04;
             }
 
             if (sgd->entry_flags & 0x40) {
                 ac97_via_log(" with FLAG");
 
                 /* Raise FLAG to pause SGD. */
-                dev->sgd_regs[sgd->id] |= 0x01;
+                dev->sgd_regs[sgd->modem][sgd->id] |= 0x01;
 
 #ifdef ENABLE_AC97_VIA_LOG
-                if (dev->sgd_regs[sgd->id | 0x2] & 0x01)
+                if (dev->sgd_regs[sgd->modem][sgd->id | 0x2] & 0x01)
                     ac97_via_log(" interrupt");
 #endif
             }
@@ -627,19 +641,19 @@ ac97_via_sgd_process(void *priv)
                 ac97_via_log(" with EOL");
 
                 /* Raise EOL. */
-                dev->sgd_regs[sgd->id] |= 0x02;
+                dev->sgd_regs[sgd->modem][sgd->id] |= 0x02;
 
 #ifdef ENABLE_AC97_VIA_LOG
-                if (dev->sgd_regs[sgd->id | 0x2] & 0x02)
+                if (dev->sgd_regs[sgd->modem][sgd->id | 0x2] & 0x02)
                     ac97_via_log(" interrupt");
 #endif
 
                 /* Restart SGD if a trigger is queued or auto-start is enabled. */
-                if ((dev->sgd_regs[sgd->id] & 0x08) || (dev->sgd_regs[sgd->id | 0x2] & 0x80)) {
+                if ((dev->sgd_regs[sgd->modem][sgd->id] & 0x08) || (dev->sgd_regs[sgd->modem][sgd->id | 0x2] & 0x80)) {
                     ac97_via_log(" restart");
 
                     /* Un-queue trigger. */
-                    dev->sgd_regs[sgd->id] &= ~0x08;
+                    dev->sgd_regs[sgd->modem][sgd->id] &= ~0x08;
 
                     /* Go back to the starting block on the next run. */
                     sgd->restart = 2;
@@ -647,13 +661,13 @@ ac97_via_sgd_process(void *priv)
                     ac97_via_log(" finish");
 
                     /* Terminate SGD. */
-                    dev->sgd_regs[sgd->id] &= ~0x80;
+                    dev->sgd_regs[sgd->modem][sgd->id] &= ~0x80;
                 }
             }
             ac97_via_log("\n");
 
             /* Fire any requested status interrupts. */
-            ac97_via_update_irqs(dev);
+            ac97_via_update_irqs(dev, sgd->modem);
         }
     }
 }
@@ -662,7 +676,7 @@ static void
 ac97_via_poll_stereo(void *priv)
 {
     ac97_via_t     *dev = (ac97_via_t *) priv;
-    ac97_via_sgd_t *sgd = &dev->sgd[0]; /* Audio Read */
+    ac97_via_sgd_t *sgd = &dev->sgd[0][0]; /* Audio Read */
 
     /* Schedule next run if PCM playback is enabled. */
     if (dev->pcm_enabled)
@@ -672,7 +686,7 @@ ac97_via_poll_stereo(void *priv)
     ac97_via_update_stereo(dev, sgd);
 
     /* Feed next sample from the FIFO. */
-    switch (dev->sgd_regs[sgd->id | 0x2] & 0x30) {
+    switch (dev->sgd_regs[0][sgd->id | 0x2] & 0x30) {
         case 0x00: /* Mono, 8-bit PCM */
             if ((sgd->fifo_end - sgd->fifo_pos) >= 1) {
                 sgd->out_l = sgd->out_r = (sgd->fifo[sgd->fifo_pos++ & (sizeof(sgd->fifo) - 1)] ^ 0x80) << 8;
@@ -718,7 +732,7 @@ static void
 ac97_via_poll_fm(void *priv)
 {
     ac97_via_t     *dev = (ac97_via_t *) priv;
-    ac97_via_sgd_t *sgd = &dev->sgd[2]; /* FM Read */
+    ac97_via_sgd_t *sgd = &dev->sgd[0][2]; /* FM Read */
 
     /* Schedule next run if FM playback is enabled. */
     if (dev->fm_enabled)
@@ -746,15 +760,15 @@ ac97_via_get_buffer(int32_t *buffer, int len, void *priv)
 {
     ac97_via_t *dev = (ac97_via_t *) priv;
 
-    ac97_via_update_stereo(dev, &dev->sgd[0]);
-    ac97_via_update_stereo(dev, &dev->sgd[2]);
+    ac97_via_update_stereo(dev, &dev->sgd[0][0]);
+    ac97_via_update_stereo(dev, &dev->sgd[0][2]);
 
     for (int c = 0; c < len * 2; c++) {
-        buffer[c] += dev->sgd[0].buffer[c] / 2;
-        buffer[c] += dev->sgd[2].buffer[c] / 2;
+        buffer[c] += dev->sgd[0][0].buffer[c] / 2;
+        buffer[c] += dev->sgd[0][2].buffer[c] / 2;
     }
 
-    dev->sgd[0].pos = dev->sgd[2].pos = 0;
+    dev->sgd[0][0].pos = dev->sgd[0][2].pos = 0;
 }
 
 static void
@@ -780,8 +794,8 @@ ac97_via_speed_changed(void *priv)
     else
         freq = (double) SOUND_FREQ;
 
-    dev->sgd[0].timer_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / freq));
-    dev->sgd[2].timer_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / 24000.0)); /* FM operates at a fixed 24 KHz */
+    dev->sgd[0][0].timer_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / freq));
+    dev->sgd[0][2].timer_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / 24000.0)); /* FM operates at a fixed 24 KHz */
 }
 
 static void *
@@ -799,19 +813,23 @@ ac97_via_init(UNUSED(const device_t *info))
 
     /* Set up SGD channels. */
     for (uint8_t i = 0; i < (sizeof(dev->sgd) / sizeof(dev->sgd[0])); i++) {
-        dev->sgd[i].id  = i << 4;
-        dev->sgd[i].dev = dev;
+        for (uint8_t j = 0; j < 2; j++) {
+            dev->sgd[j][i].id  = i << 4;
+            dev->sgd[j][i].dev = dev;
 
-        /* Disable the FIFO on SGDs we don't care about. */
-        if ((i != 0) && (i != 2))
-            dev->sgd[i].always_run = 1;
+            dev->sgd[j][i].modem = j;
 
-        timer_add(&dev->sgd[i].dma_timer, ac97_via_sgd_process, &dev->sgd[i], 0);
+            /* Disable the FIFO on SGDs we don't care about. */
+            if ((i != 0) && (i != 2))
+                dev->sgd[j][i].always_run = 1;
+
+            timer_add(&dev->sgd[j][i].dma_timer, ac97_via_sgd_process, &dev->sgd[j][i], 0);
+        }
     }
 
     /* Set up playback pollers. */
-    timer_add(&dev->sgd[0].poll_timer, ac97_via_poll_stereo, dev, 0);
-    timer_add(&dev->sgd[2].poll_timer, ac97_via_poll_fm, dev, 0);
+    timer_add(&dev->sgd[0][0].poll_timer, ac97_via_poll_stereo, dev, 0);
+    timer_add(&dev->sgd[0][2].poll_timer, ac97_via_poll_fm, dev, 0);
     ac97_via_speed_changed(dev);
 
     /* Set up playback handler. */

From afd910931b75019590f2fd1c87148fd10aa60ea0 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Mon, 31 Mar 2025 04:36:37 +0200
Subject: [PATCH 45/59] Fix an accidental CPU mess-up.

---
 src/machine/machine_table.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index fa383139b..e421e5637 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -1713,7 +1713,7 @@ const machine_t machines[] = {
     {
         .name = "[8088] VTech Laser Turbo XT",
         .internal_name = "ltxt",
-        .type = MACHINE_TYPE_8088,
+        .type = MACHINE_TYPE_8088_VTECH,
         .chipset = MACHINE_CHIPSET_DISCRETE,
         .init = machine_xt_laserxt_init,
         .p1_handler = NULL,
@@ -1762,7 +1762,7 @@ const machine_t machines[] = {
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
-            .package = CPU_PKG_8088_VTECH,
+            .package = CPU_PKG_8088,
             .block = CPU_BLOCK_NONE,
             .min_bus = 0,
             .max_bus = 0,

From a00f4e2e7f006f41aacd0d67b0e35403ddef05f8 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Mon, 31 Mar 2025 06:12:56 +0200
Subject: [PATCH 46/59] The _VTECH suffix is supposed to be on the CPU package,
 not on the machine type.

---
 src/machine/machine_table.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index e421e5637..142571d9d 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -1713,7 +1713,7 @@ const machine_t machines[] = {
     {
         .name = "[8088] VTech Laser Turbo XT",
         .internal_name = "ltxt",
-        .type = MACHINE_TYPE_8088_VTECH,
+        .type = MACHINE_TYPE_8088,
         .chipset = MACHINE_CHIPSET_DISCRETE,
         .init = machine_xt_laserxt_init,
         .p1_handler = NULL,
@@ -1721,7 +1721,7 @@ const machine_t machines[] = {
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
-            .package = CPU_PKG_8088,
+            .package = CPU_PKG_8088_VTECH,
             .block = CPU_BLOCK_NONE,
             .min_bus = 0,
             .max_bus = 0,

From 73dfb3fea9e825618055eb992ade9b6a703da4cb Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Mon, 31 Mar 2025 22:48:46 +0600
Subject: [PATCH 47/59] Hardware Renderer: Make sure to account for
 devicePixelRatio when setting up the matrix

---
 src/qt/qt_hardwarerenderer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/qt_hardwarerenderer.cpp b/src/qt/qt_hardwarerenderer.cpp
index d5aa86b79..fb84606b0 100644
--- a/src/qt/qt_hardwarerenderer.cpp
+++ b/src/qt/qt_hardwarerenderer.cpp
@@ -145,7 +145,7 @@ HardwareRenderer::paintGL()
     QVector<QVector2D> texcoords;
     QMatrix4x4         mat;
     mat.setToIdentity();
-    mat.ortho(QRectF(0, 0, (qreal) width(), (qreal) height()));
+    mat.ortho(QRectF(0, 0, (qreal) width() * (qreal) devicePixelRatioF(), (qreal) height() * (qreal) devicePixelRatioF()));
     verts.push_back(QVector2D((float) destination.x(), (float) destination.y()));
     verts.push_back(QVector2D((float) destination.x(), (float) destination.y() + (float) destination.height()));
     verts.push_back(QVector2D((float) destination.x() + (float) destination.width(), (float) destination.y() + (float) destination.height()));

From 04247b3c25401039ea1d4aa1df150691de921c5b Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Tue, 1 Apr 2025 06:36:16 +0200
Subject: [PATCH 48/59] Both recompilers: Temporarily disable recompilation of
 exactly four memory versions in 32-bit address move of opcode C6h (8-bit MOV
 immediate) because they currently break NT 3.x NTVDM, fixes #5038.

---
 src/codegen/codegen_ops_mov.h     | 8 +++++++-
 src/codegen_new/codegen_ops_mov.c | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/codegen/codegen_ops_mov.h b/src/codegen/codegen_ops_mov.h
index 039489035..6a5054b81 100644
--- a/src/codegen/codegen_ops_mov.h
+++ b/src/codegen/codegen_ops_mov.h
@@ -152,7 +152,13 @@ ropMOV_b_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t
 {
     if ((fetchdat & 0xc0) == 0xc0) {
         STORE_IMM_REG_B(fetchdat & 7, (fetchdat >> 8) & 0xff);
-    } else {
+    }
+/* TODO: Fix the recompilation of that specific case so it no longer breaks NT 3.x NTVDM. */
+#ifndef RECOMPILE_MOVB_IMM_MEM_ALWAYS
+    else if (((fetchdat & 0xfc) == 0x80) && (op_32 & 0x200))
+        return 0;
+#endif
+    else {
         x86seg  *target_seg = FETCH_EA(op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32);
         uint32_t imm        = fastreadb(cs + op_pc + 1);
         int      host_reg   = LOAD_REG_IMM(imm);
diff --git a/src/codegen_new/codegen_ops_mov.c b/src/codegen_new/codegen_ops_mov.c
index 031d2ea05..f79a959a7 100644
--- a/src/codegen_new/codegen_ops_mov.c
+++ b/src/codegen_new/codegen_ops_mov.c
@@ -296,7 +296,13 @@ ropMOV_b_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t
 
         imm = fastreadb(cs + op_pc + 1);
         uop_MOV_IMM(ir, IREG_8(dest_reg), imm);
-    } else {
+    }
+/* TODO: Fix the recompilation of that specific case so it no longer breaks NT 3.x NTVDM. */
+#ifndef RECOMPILE_MOVB_IMM_MEM_ALWAYS
+    else if (((fetchdat & 0xfc) == 0x80) && (op_32 & 0x200))
+        return 0;
+#endif
+    else {
         uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
         target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);
         codegen_check_seg_write(block, ir, target_seg);

From 4c0f0ddd24c0e0ef0df2d035d9fcc337f7164082 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Tue, 1 Apr 2025 06:42:14 +0200
Subject: [PATCH 49/59] VIA AC'97: Restore the 0x47 back (turns out it was
 *NOT* a mix-up), but divide by 208925 instead of by 32767, in order to keep
 the maximum in the -32768 to 32767 range even at +12 dB gain.

---
 src/sound/snd_ac97_codec.c | 2 +-
 src/sound/snd_ac97_via.c   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/sound/snd_ac97_codec.c b/src/sound/snd_ac97_codec.c
index 7a9951289..ad535591f 100644
--- a/src/sound/snd_ac97_codec.c
+++ b/src/sound/snd_ac97_codec.c
@@ -537,7 +537,7 @@ ac97_codec_getattn(void *priv, uint8_t reg, int *l, int *r)
         uint8_t r_val = val;
         if (reg <= 0x06) { /* 6-bit level */
             *l = codec_attn[0x3f - (l_val & 0x3f)];
-            *r = codec_attn[0x3f - (r_val & 0x3f)];
+            *r = codec_attn[0x47 - (r_val & 0x3f)];
         } else { /* 5-bit gain */
             /* Yes, 0x3f is correct, the 0x47 was most likely a decimal-hex mix-up. */
             *l = codec_attn[0x3f - (l_val & 0x1f)];
diff --git a/src/sound/snd_ac97_via.c b/src/sound/snd_ac97_via.c
index 68ef5fe5d..2d994b08f 100644
--- a/src/sound/snd_ac97_via.c
+++ b/src/sound/snd_ac97_via.c
@@ -536,8 +536,13 @@ ac97_via_remap_modem_codec(void *priv, uint16_t new_io_base, uint8_t enable)
 static void
 ac97_via_update_stereo(ac97_via_t *dev, ac97_via_sgd_t *sgd)
 {
+#ifdef OLD_CODE
     int32_t l = (((sgd->out_l * sgd->vol_l) >> 15) * dev->master_vol_l) >> 15;
     int32_t r = (((sgd->out_r * sgd->vol_r) >> 15) * dev->master_vol_r) >> 15;
+#else
+    int32_t l = (((sgd->out_l * sgd->vol_l) / 208925) * dev->master_vol_l) >> 15;
+    int32_t r = (((sgd->out_r * sgd->vol_r) / 208925) * dev->master_vol_r) >> 15;
+#endif
 
     if (l < -32768)
         l = -32768;

From 5ea48b20277374e23a1cf3208cfdd2153f7fc25a Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Tue, 1 Apr 2025 06:42:51 +0200
Subject: [PATCH 50/59] Correct the fix.

---
 src/sound/snd_ac97_codec.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/sound/snd_ac97_codec.c b/src/sound/snd_ac97_codec.c
index ad535591f..e92830f67 100644
--- a/src/sound/snd_ac97_codec.c
+++ b/src/sound/snd_ac97_codec.c
@@ -537,11 +537,10 @@ ac97_codec_getattn(void *priv, uint8_t reg, int *l, int *r)
         uint8_t r_val = val;
         if (reg <= 0x06) { /* 6-bit level */
             *l = codec_attn[0x3f - (l_val & 0x3f)];
-            *r = codec_attn[0x47 - (r_val & 0x3f)];
+            *r = codec_attn[0x3f - (r_val & 0x3f)];
         } else { /* 5-bit gain */
-            /* Yes, 0x3f is correct, the 0x47 was most likely a decimal-hex mix-up. */
-            *l = codec_attn[0x3f - (l_val & 0x1f)];
-            *r = codec_attn[0x3f - (r_val & 0x1f)];
+            *l = codec_attn[0x47 - (l_val & 0x1f)];
+            *r = codec_attn[0x47 - (r_val & 0x1f)];
         }
 
         /* Apply per-channel mute and center/LFE powerdowns where applicable. */

From 1783da99a4b2becec060134c0ffcec57cdcccd6f Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Tue, 1 Apr 2025 08:48:01 +0200
Subject: [PATCH 51/59] 86F internal handler: make the common handlers function
 initialize the floppy density hole return function, fixes 3-mode (dual-RPM)
 3.5" drives.

---
 src/floppy/fdd_86f.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/floppy/fdd_86f.c b/src/floppy/fdd_86f.c
index f5626e35b..0a7120b16 100644
--- a/src/floppy/fdd_86f.c
+++ b/src/floppy/fdd_86f.c
@@ -3452,6 +3452,7 @@ d86f_common_handlers(int drive)
     drives[drive].poll          = d86f_poll;
     drives[drive].format        = d86f_proxy_format;
     drives[drive].stop          = d86f_stop;
+    drives[drive].hole          = d86f_hole;
 }
 
 int

From 3e7f8a18de884e4ffe7ed9962b34442a4960017a Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Tue, 1 Apr 2025 09:18:12 +0200
Subject: [PATCH 52/59] FDC: Initialize DRVRATE to 1 on the OKI IF386AX so that
 1.25 MB floppies can be read on a 3.5" 3-mode drive.

---
 src/floppy/fdc.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c
index 51c3aa24a..6ffa47f29 100644
--- a/src/floppy/fdc.c
+++ b/src/floppy/fdc.c
@@ -2268,10 +2268,21 @@ fdc_reset(void *priv)
     fdc_update_rwc(fdc, 1, default_rwc);
     fdc_update_rwc(fdc, 2, default_rwc);
     fdc_update_rwc(fdc, 3, default_rwc);
-    fdc_update_drvrate(fdc, 0, 0);
-    fdc_update_drvrate(fdc, 1, 0);
-    fdc_update_drvrate(fdc, 2, 0);
-    fdc_update_drvrate(fdc, 3, 0);
+    /*
+       The OKI IF386SX natively supports the Japanese 1.25 MB floppy format,
+       since it can read such images just fine, it also attempts to use data
+       rate 01 on a 3.5" MB drive (which is the only kind it can physically
+       take, anyway), and rate 01 on a 3.5" MB drive is usually used by 3-mode
+       drives to switch to 360 RPM. Hence why I'm switching DRVDEN to 1, so
+       rate 01 becomes 500 kbps, so on a 3-mode 3.5" drive, 1.25 MB floppies
+       can be read. The side effect is that to read 5.25" 360k drives, you
+       need to use a dual-RPM 5.25" drive - but hey, that finally gets those
+       drives some usage as well.
+     */
+    fdc_update_drvrate(fdc, 0, !strcmp(machine_get_internal_name(),  "if386sx"));
+    fdc_update_drvrate(fdc, 1, !strcmp(machine_get_internal_name(),  "if386sx"));
+    fdc_update_drvrate(fdc, 2, !strcmp(machine_get_internal_name(),  "if386sx"));
+    fdc_update_drvrate(fdc, 3, !strcmp(machine_get_internal_name(),  "if386sx"));
     fdc_update_drv2en(fdc, 1);
     fdc_update_rates(fdc);
 

From fd618440618e3d6e426d60e59921fd8495531b09 Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Tue, 1 Apr 2025 15:44:37 +0600
Subject: [PATCH 53/59] Switch to SAASound for CMS

---
 src/include/86box/snd_cms.h                |  23 +-
 src/sound/CMakeLists.txt                   |   3 +
 src/sound/saasound/CMakeLists.txt          |  16 +
 src/sound/saasound/SAAAmp.cpp              | 203 +++++++++
 src/sound/saasound/SAAAmp.h                |  44 ++
 src/sound/saasound/SAAConfig.h             |  41 ++
 src/sound/saasound/SAADevice.cpp           | 392 +++++++++++++++++
 src/sound/saasound/SAADevice.h             |  69 +++
 src/sound/saasound/SAAEnv.cpp              | 380 ++++++++++++++++
 src/sound/saasound/SAAEnv.h                |  54 +++
 src/sound/saasound/SAAFreq.cpp             | 280 ++++++++++++
 src/sound/saasound/SAAFreq.dat             | 141 ++++++
 src/sound/saasound/SAAFreq.h               |  72 +++
 src/sound/saasound/SAAImpl.cpp             | 487 +++++++++++++++++++++
 src/sound/saasound/SAAImpl.h               |  75 ++++
 src/sound/saasound/SAANoise.cpp            | 180 ++++++++
 src/sound/saasound/SAANoise.h              |  54 +++
 src/sound/saasound/SAASndC.cpp             | 100 +++++
 src/sound/saasound/SAASndC.h               | 102 +++++
 src/sound/saasound/SAASound.cpp            |  13 +
 src/sound/saasound/SAASound.h              | 130 ++++++
 src/sound/saasound/defns.h                 |  59 +++
 src/sound/saasound/resource.h              |  15 +
 src/sound/saasound/saasound_cmake_config.h |  14 +
 src/sound/saasound/types.h                 |  34 ++
 src/sound/snd_cms.c                        | 138 ++----
 26 files changed, 3006 insertions(+), 113 deletions(-)
 create mode 100644 src/sound/saasound/CMakeLists.txt
 create mode 100755 src/sound/saasound/SAAAmp.cpp
 create mode 100755 src/sound/saasound/SAAAmp.h
 create mode 100644 src/sound/saasound/SAAConfig.h
 create mode 100644 src/sound/saasound/SAADevice.cpp
 create mode 100644 src/sound/saasound/SAADevice.h
 create mode 100755 src/sound/saasound/SAAEnv.cpp
 create mode 100755 src/sound/saasound/SAAEnv.h
 create mode 100755 src/sound/saasound/SAAFreq.cpp
 create mode 100755 src/sound/saasound/SAAFreq.dat
 create mode 100755 src/sound/saasound/SAAFreq.h
 create mode 100644 src/sound/saasound/SAAImpl.cpp
 create mode 100755 src/sound/saasound/SAAImpl.h
 create mode 100755 src/sound/saasound/SAANoise.cpp
 create mode 100755 src/sound/saasound/SAANoise.h
 create mode 100755 src/sound/saasound/SAASndC.cpp
 create mode 100644 src/sound/saasound/SAASndC.h
 create mode 100755 src/sound/saasound/SAASound.cpp
 create mode 100644 src/sound/saasound/SAASound.h
 create mode 100644 src/sound/saasound/defns.h
 create mode 100755 src/sound/saasound/resource.h
 create mode 100644 src/sound/saasound/saasound_cmake_config.h
 create mode 100755 src/sound/saasound/types.h

diff --git a/src/include/86box/snd_cms.h b/src/include/86box/snd_cms.h
index 8eec22935..8201fe32c 100644
--- a/src/include/86box/snd_cms.h
+++ b/src/include/86box/snd_cms.h
@@ -7,23 +7,20 @@
 #define MASTER_CLOCK 7159090
 
 typedef struct cms_t {
-    int      addrs[2];
-    uint8_t  regs[2][32];
-    uint16_t latch[2][6];
-    int      freq[2][6];
-    float    count[2][6];
-    int      vol[2][6][2];
-    int      stat[2][6];
-    uint16_t noise[2][2];
-    uint16_t noisefreq[2][2];
-    int      noisecount[2][2];
-    int      noisetype[2][2];
+#ifdef SAASOUND_H_INCLUDED
+    SAASND saasound;
+    SAASND saasound2;
+#else
+    void*  saasound;
+    void*  saasound2;
+#endif
 
     uint8_t latched_data;
 
-    int16_t buffer[SOUNDBUFLEN * 2];
+    int16_t buffer[WTBUFLEN * 2];
+    int16_t buffer2[WTBUFLEN * 2];
 
-    int pos;
+    int pos, pos2;
 } cms_t;
 
 extern void    cms_update(cms_t *cms);
diff --git a/src/sound/CMakeLists.txt b/src/sound/CMakeLists.txt
index 0a04b0ff1..d575717a0 100644
--- a/src/sound/CMakeLists.txt
+++ b/src/sound/CMakeLists.txt
@@ -180,6 +180,9 @@ endif()
 add_subdirectory(ymfm)
 target_link_libraries(86Box ymfm)
 
+add_subdirectory(saasound)
+target_link_libraries(86Box saasound)
+
 if(GUSMAX)
     target_compile_definitions(snd PRIVATE USE_GUSMAX)
 endif()
diff --git a/src/sound/saasound/CMakeLists.txt b/src/sound/saasound/CMakeLists.txt
new file mode 100644
index 000000000..2db75493e
--- /dev/null
+++ b/src/sound/saasound/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_library(saasound OBJECT
+    SAAAmp.cpp
+    SAAAmp.h
+    SAADevice.cpp
+    SAADevice.h
+    SAAEnv.cpp
+    SAAEnv.h
+    SAAFreq.cpp
+    SAAFreq.h
+    SAAImpl.cpp
+    SAAImpl.h
+    SAANoise.cpp
+    SAANoise.h
+    SAASndC.cpp
+    SAASndC.h
+    SAASound.cpp)
\ No newline at end of file
diff --git a/src/sound/saasound/SAAAmp.cpp b/src/sound/saasound/SAAAmp.cpp
new file mode 100755
index 000000000..8f2473fb1
--- /dev/null
+++ b/src/sound/saasound/SAAAmp.cpp
@@ -0,0 +1,203 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// SAAAmp.cpp: implementation of the CSAAAmp class.
+// This class handles Tone/Noise mixing, Envelope application and
+// amplification.
+//
+//////////////////////////////////////////////////////////////////////
+
+#include "SAASound.h"
+#include "types.h"
+#include "SAANoise.h"
+#include "SAAEnv.h"
+#include "SAAFreq.h"
+#include "SAAAmp.h"
+#include "defns.h"
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+CSAAAmp::CSAAAmp(CSAAFreq * const ToneGenerator, const CSAANoise * const NoiseGenerator, const CSAAEnv * const EnvGenerator)
+:
+m_pcConnectedToneGenerator(ToneGenerator),
+m_pcConnectedNoiseGenerator(NoiseGenerator),
+m_pcConnectedEnvGenerator(EnvGenerator),
+m_bUseEnvelope(EnvGenerator != NULL)
+{
+	leftlevel = 0;
+	leftlevela0x0e = 0;
+	rightlevel = 0;
+	rightlevela0x0e = 0;
+	m_nMixMode = 0;
+	m_bMute=true;
+	m_bSync = false;
+	m_nOutputIntermediate=0;
+	last_level_byte=0;
+	SetAmpLevel(0x00);
+
+}
+
+CSAAAmp::~CSAAAmp()
+{
+	// Nothing to do
+}
+
+void CSAAAmp::SetAmpLevel(BYTE level_byte)
+{
+	// if level unchanged since last call then do nothing
+	if (level_byte != last_level_byte)
+	{
+		last_level_byte = level_byte;
+		leftlevel = level_byte & 0x0f;
+		leftlevela0x0e = leftlevel & 0x0e;
+	
+		rightlevel = (level_byte >> 4) & 0x0f;
+		rightlevela0x0e = rightlevel & 0x0e;
+	}
+
+}
+
+void CSAAAmp::SetToneMixer(BYTE bEnabled)
+{
+	if (bEnabled == 0)
+	{
+		// clear mixer bit
+		m_nMixMode &= ~(0x01);
+	}
+	else
+	{
+		// set mixer bit
+		m_nMixMode |= 0x01;
+	}
+}
+
+void CSAAAmp::SetNoiseMixer(BYTE bEnabled)
+{
+	if (bEnabled == 0)
+	{
+		m_nMixMode &= ~(0x02);
+	}
+	else
+	{
+		m_nMixMode |= 0x02;
+	}
+}
+
+void CSAAAmp::Mute(bool bMute)
+{
+	// m_bMute refers to the GLOBAL mute setting (register 28 bit 0)
+	// NOT the per-channel mixer settings !!
+	m_bMute = bMute;
+}
+
+void CSAAAmp::Sync(bool bSync)
+{
+	// m_bSync refers to the GLOBAL sync setting (register 28 bit 1)
+	m_bSync = bSync;
+}
+
+void CSAAAmp::Tick(void)
+{
+	// updates m_nOutputIntermediate to 0, 1 or 2
+	//
+
+	// connected oscillator always ticks (this isn't really connected to the amp)
+	int level = m_pcConnectedToneGenerator->Tick();
+
+	switch (m_nMixMode)
+	{
+		case 0:
+			// no tone or noise for this channel
+			m_nOutputIntermediate = 0;
+			break;
+		case 1:
+			// tone only for this channel
+			m_nOutputIntermediate = level * 2;
+			// NOTE: ConnectedToneGenerator returns either 0 or 1
+			break;
+		case 2:
+			// noise only for this channel
+			m_nOutputIntermediate = m_pcConnectedNoiseGenerator->Level() * 2;
+			// NOTE: ConnectedNoiseGenerator()->Level() returns either 0 or 1
+			break;
+		case 3:
+			// tone+noise for this channel ... mixing algorithm :
+			//  tone   noise   output
+			//   0       0       0
+			//   1       0       2
+			//   0       1       0
+			//   1       1       1
+			// = 2 * tone - 1 * (tone & noise)
+			// = tone * (2 - noise)
+			m_nOutputIntermediate = level * (2 - m_pcConnectedNoiseGenerator->Level());
+			break;
+	}
+	// intermediate is between 0 and 2
+}
+
+inline int CSAAAmp::EffectiveAmplitude(int amp, int env) const
+{
+	// Return the effective amplitude of the low-pass-filtered result of the logical
+	// AND of the amplitude PDM and envelope PDM patterns.  This is a more accurate
+	// evaluation of the SAA than simply returning amp * env , based on how the SAA
+	// implements pulse-density modulation.
+	static const int pdm[16][16] = {
+	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+	{0,0,0,0,2,2,2,2,2,2,2,2,4,4,4,4},
+	{0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8},
+	{0,1,1,2,4,5,5,6,6,7,7,8,10,11,11,12},
+	{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15},
+	{0,1,2,3,6,7,8,9,10,11,12,13,16,17,18,19},
+	{0,2,3,5,6,8,9,11,12,14,15,17,18,20,21,23},
+	{0,2,3,5,8,10,11,13,14,16,17,19,22,24,25,27},
+	{0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30},
+	{0,2,4,6,10,12,14,16,18,20,22,24,28,30,32,34},
+	{0,3,5,8,10,13,15,18,20,23,25,28,30,33,35,38},
+	{0,3,5,8,12,15,17,20,22,25,27,30,34,37,39,42},
+	{0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45},
+	{0,3,6,9,14,17,20,23,26,29,32,35,40,43,46,49},
+	{0,4,7,11,14,18,21,25,28,32,35,39,42,46,49,53},
+	{0,4,7,11,16,20,23,27,30,34,37,41,46,50,53,57}
+	};
+
+	return(pdm[amp][env] * 4);
+}
+
+void CSAAAmp::TickAndOutputStereo(unsigned int & left, unsigned int & right)
+{
+	// This returns a value between 0 and 480 inclusive.
+	// This represents the full dynamic range of one output mixer (tone, or noise+tone, at full volume,
+	// without envelopes enabled).  Note that, with envelopes enabled, the actual dynamic range
+	// is reduced on-chip to just over 88% of this (424), so the "loudest" output requires disabling envs.
+	// NB for 6 channels at full volume, with simple additive mixing, you would see a combined
+	// output of 2880, and a multiplier of 11 (=31680) fits comfortably within 16-bit signed output range.
+
+	if (m_bSync)
+	{
+		// TODO check this
+		left = right = 0;
+		return;
+	}
+
+	// first, do the Tick:
+	Tick();
+	
+	// now calculate the returned amplitude for this sample:
+	////////////////////////////////////////////////////////
+
+	if (m_bMute)
+	{
+		left = right = 0;
+	}
+	else if (m_bUseEnvelope && m_pcConnectedEnvGenerator->IsActive())
+	{
+		left = EffectiveAmplitude(m_pcConnectedEnvGenerator->LeftLevel(), leftlevela0x0e) * (2 - m_nOutputIntermediate);
+		right = EffectiveAmplitude(m_pcConnectedEnvGenerator->RightLevel(), rightlevela0x0e) * (2 - m_nOutputIntermediate);
+	}
+	else
+	{
+		left = leftlevel * m_nOutputIntermediate * 16;
+		right = rightlevel * m_nOutputIntermediate * 16;
+	}
+}
diff --git a/src/sound/saasound/SAAAmp.h b/src/sound/saasound/SAAAmp.h
new file mode 100755
index 000000000..4a6761f21
--- /dev/null
+++ b/src/sound/saasound/SAAAmp.h
@@ -0,0 +1,44 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// SAAAmp.h: interface for the CSAAAmp class.
+// This class handles Tone/Noise mixing, Envelope application and
+// amplification.
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef SAAAMP_H_INCLUDED
+#define SAAAMP_H_INCLUDED
+
+class CSAAAmp  
+{
+private:
+	int leftlevel;
+	int leftlevela0x0e;
+	int rightlevel;
+	int rightlevela0x0e;
+	int m_nOutputIntermediate;
+	unsigned int m_nMixMode;
+	CSAAFreq * const m_pcConnectedToneGenerator; // not const because amp calls ->Tick()
+	const CSAANoise * const m_pcConnectedNoiseGenerator;
+	const CSAAEnv * const m_pcConnectedEnvGenerator;
+	const bool m_bUseEnvelope;
+	mutable bool m_bMute;
+	mutable bool m_bSync;
+	mutable BYTE last_level_byte;
+	int EffectiveAmplitude(int amp, int env) const;
+
+public:
+	CSAAAmp(CSAAFreq * const ToneGenerator, const CSAANoise * const NoiseGenerator, const CSAAEnv * const EnvGenerator);
+	~CSAAAmp();
+
+	void SetAmpLevel(BYTE level_byte); // really just a BYTE
+	void SetToneMixer(BYTE bEnabled);
+	void SetNoiseMixer(BYTE bEnabled);
+	void Mute(bool bMute);
+	void Sync(bool bSync);
+	void Tick(void);
+	void TickAndOutputStereo(unsigned int & left, unsigned int & right);
+
+};
+
+#endif	// SAAAMP_H_INCLUDED
diff --git a/src/sound/saasound/SAAConfig.h b/src/sound/saasound/SAAConfig.h
new file mode 100644
index 000000000..a655ec59f
--- /dev/null
+++ b/src/sound/saasound/SAAConfig.h
@@ -0,0 +1,41 @@
+// Part of SAASound copyright 2020 Dave Hooper <dave@beermex.com>
+//
+// SAAConfig.h: configuration file handler class
+//
+//////////////////////////////////////////////////////////////////////
+
+#include "defns.h"
+#ifdef USE_CONFIG_FILE
+
+#ifndef SAA_CONFIG_H_INCLUDED
+#define SAA_CONFIG_H_INCLUDED
+
+#define INI_READONLY
+#define INI_ANSIONLY  /*nb not really 'ANSI', this just forces all read/write to use 8-bit char*/
+#include "minIni/minIni.h"
+
+class SAAConfig
+{
+private:
+	minIni m_minIni;
+	bool m_bHasReadConfig;
+
+public:
+	bool m_bGenerateRegisterLogs;
+	bool m_bGeneratePcmLogs;
+	bool m_bGeneratePcmSeparateChannels;
+	t_string m_strRegisterLogPath;
+	t_string m_strPcmOutputPath;
+	unsigned int m_nOversample;
+	bool m_bHighpass;
+	double m_nBoost;
+
+	SAAConfig();
+	void ReadConfig();
+
+	t_string getChannelPcmOutputPath(int);
+};
+
+#endif  // SAA_CONFIG_H_INCLUDED
+
+#endif // USE_CONFIG_FILE
\ No newline at end of file
diff --git a/src/sound/saasound/SAADevice.cpp b/src/sound/saasound/SAADevice.cpp
new file mode 100644
index 000000000..306aa477a
--- /dev/null
+++ b/src/sound/saasound/SAADevice.cpp
@@ -0,0 +1,392 @@
+// Part of SAASound copyright 2020 Dave Hooper <dave@beermex.com>
+//
+// SAADevice.cpp: connecting the subcomponents of the SAA1099 together.
+// This class handles device inputs and outputs (clocking, data and
+// address bus, and simulated output)
+//
+//////////////////////////////////////////////////////////////////////
+
+#include "SAASound.h"
+#include "types.h"
+#include "SAAEnv.h"
+#include "SAANoise.h"
+#include "SAAFreq.h"
+#include "SAAAmp.h"
+#include "SAASound.h"
+#include "SAAImpl.h"
+#include "defns.h"
+
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+CSAADevice::CSAADevice()
+	:
+	m_nCurrentSaaReg(0),
+	m_bOutputEnabled(false),
+	m_bSync(false),
+	m_bHighpass(true),
+	m_nOversample(0),
+	m_Noise0(0xffffffff),
+	m_Noise1(0xffffffff),
+	m_Env0(),
+	m_Env1(),
+	m_Osc0(&m_Noise0, NULL),
+	m_Osc1(NULL, &m_Env0),
+	m_Osc2(NULL, NULL),
+	m_Osc3(&m_Noise1, NULL),
+	m_Osc4(NULL, &m_Env1),
+	m_Osc5(NULL, NULL),
+	m_Amp0(&m_Osc0, &m_Noise0, NULL),
+	m_Amp1(&m_Osc1, &m_Noise0, NULL),
+	m_Amp2(&m_Osc2, &m_Noise0, &m_Env0),
+	m_Amp3(&m_Osc3, &m_Noise1, NULL),
+	m_Amp4(&m_Osc4, &m_Noise1, NULL),
+	m_Amp5(&m_Osc5, &m_Noise1, &m_Env1)
+{
+	// Create and link up the objects that make up the emulator
+	Noise[0] = &m_Noise0;
+	Noise[1] = &m_Noise1;
+	Env[0] = &m_Env0;
+	Env[1] = &m_Env1;
+
+	// Create oscillators (tone generators) and link to noise generators and
+	// envelope controllers
+	Osc[0] = &m_Osc0;
+	Osc[1] = &m_Osc1;
+	Osc[2] = &m_Osc2;
+	Osc[3] = &m_Osc3;
+	Osc[4] = &m_Osc4;
+	Osc[5] = &m_Osc5;
+
+	// Create amplification/mixing stages and link to appropriate oscillators,
+	// noise generators and envelope controllers
+	Amp[0] = &m_Amp0;
+	Amp[1] = &m_Amp1;
+	Amp[2] = &m_Amp2;
+	Amp[3] = &m_Amp3;
+	Amp[4] = &m_Amp4;
+	Amp[5] = &m_Amp5;
+
+	_SetClockRate(EXTERNAL_CLK_HZ);
+	_SetOversample(DEFAULT_OVERSAMPLE);
+}
+
+CSAADevice::~CSAADevice()
+{
+}
+
+//////////////////////////////////////////////////////////////////////
+// CSAASound members
+//////////////////////////////////////////////////////////////////////
+
+void CSAADevice::_SetClockRate(unsigned int nClockRate)
+{
+	m_Osc0._SetClockRate(nClockRate);
+	m_Osc1._SetClockRate(nClockRate);
+	m_Osc2._SetClockRate(nClockRate);
+	m_Osc3._SetClockRate(nClockRate);
+	m_Osc4._SetClockRate(nClockRate);
+	m_Osc5._SetClockRate(nClockRate);
+	m_Noise0._SetClockRate(nClockRate);
+	m_Noise1._SetClockRate(nClockRate);
+}
+
+void CSAADevice::_SetSampleRate(unsigned int nSampleRate)
+{
+	m_Osc0._SetSampleRate(nSampleRate);
+	m_Osc1._SetSampleRate(nSampleRate);
+	m_Osc2._SetSampleRate(nSampleRate);
+	m_Osc3._SetSampleRate(nSampleRate);
+	m_Osc4._SetSampleRate(nSampleRate);
+	m_Osc5._SetSampleRate(nSampleRate);
+	m_Noise0._SetSampleRate(nSampleRate);
+	m_Noise1._SetSampleRate(nSampleRate);
+}
+
+void CSAADevice::_SetOversample(unsigned int nOversample)
+{
+	if (nOversample != m_nOversample)
+	{
+		m_nOversample = nOversample;
+		m_Osc0._SetOversample(nOversample);
+		m_Osc1._SetOversample(nOversample);
+		m_Osc2._SetOversample(nOversample);
+		m_Osc3._SetOversample(nOversample);
+		m_Osc4._SetOversample(nOversample);
+		m_Osc5._SetOversample(nOversample);
+		m_Noise0._SetOversample(nOversample);
+		m_Noise1._SetOversample(nOversample);
+	}
+}
+
+void CSAADevice::_WriteData(BYTE nData)
+{
+#if defined(DEBUG) || defined(DEBUGSAA)
+	m_Reg[m_nCurrentSaaReg] = nData;
+#endif
+
+	// route nData to the appropriate place
+	switch (m_nCurrentSaaReg)
+	{
+		// Amplitude data (==> Amp)
+	case 0:
+		m_Amp0.SetAmpLevel(nData);
+		break;
+	case 1:
+		m_Amp1.SetAmpLevel(nData);
+		break;
+	case 2:
+		m_Amp2.SetAmpLevel(nData);
+		break;
+	case 3:
+		m_Amp3.SetAmpLevel(nData);
+		break;
+	case 4:
+		m_Amp4.SetAmpLevel(nData);
+		break;
+	case 5:
+		m_Amp5.SetAmpLevel(nData);
+		break;
+
+		// Freq data (==> Osc)
+	case 8:
+		m_Osc0.SetFreqOffset(nData);
+		break;
+	case 9:
+		m_Osc1.SetFreqOffset(nData);
+		break;
+	case 10:
+		m_Osc2.SetFreqOffset(nData);
+		break;
+	case 11:
+		m_Osc3.SetFreqOffset(nData);
+		break;
+	case 12:
+		m_Osc4.SetFreqOffset(nData);
+		break;
+	case 13:
+		m_Osc5.SetFreqOffset(nData);
+		break;
+
+		// Freq octave data (==> Osc) for channels 0,1
+	case 16:
+		m_Osc0.SetFreqOctave(nData & 0x07);
+		m_Osc1.SetFreqOctave((nData >> 4) & 0x07);
+		break;
+
+		// Freq octave data (==> Osc) for channels 2,3
+	case 17:
+		m_Osc2.SetFreqOctave(nData & 0x07);
+		m_Osc3.SetFreqOctave((nData >> 4) & 0x07);
+		break;
+
+		// Freq octave data (==> Osc) for channels 4,5
+	case 18:
+		m_Osc4.SetFreqOctave(nData & 0x07);
+		m_Osc5.SetFreqOctave((nData >> 4) & 0x07);
+		break;
+
+		// Tone mixer control (==> Amp)
+	case 20:
+		m_Amp0.SetToneMixer(nData & 0x01);
+		m_Amp1.SetToneMixer(nData & 0x02);
+		m_Amp2.SetToneMixer(nData & 0x04);
+		m_Amp3.SetToneMixer(nData & 0x08);
+		m_Amp4.SetToneMixer(nData & 0x10);
+		m_Amp5.SetToneMixer(nData & 0x20);
+		break;
+
+		// Noise mixer control (==> Amp)
+	case 21:
+		m_Amp0.SetNoiseMixer(nData & 0x01);
+		m_Amp1.SetNoiseMixer(nData & 0x02);
+		m_Amp2.SetNoiseMixer(nData & 0x04);
+		m_Amp3.SetNoiseMixer(nData & 0x08);
+		m_Amp4.SetNoiseMixer(nData & 0x10);
+		m_Amp5.SetNoiseMixer(nData & 0x20);
+		break;
+
+		// Noise frequency/source control (==> Noise)
+	case 22:
+		m_Noise0.SetSource(nData & 0x03);
+		m_Noise1.SetSource((nData >> 4) & 0x03);
+		break;
+
+		// Envelope control data (==> Env) for envelope controller #0
+	case 24:
+		m_Env0.SetEnvControl(nData);
+		break;
+
+		// Envelope control data (==> Env) for envelope controller #1
+	case 25:
+		m_Env1.SetEnvControl(nData);
+		break;
+
+		// Global enable and reset (sync) controls
+	case 28:
+		{
+			// Reset (sync) bit
+			bool bSync = bool(nData & 0x02);
+			if (bSync != m_bSync)
+			{
+				// Sync all devices
+				// This amounts to telling them all to reset to a
+				// known state, which is also a state that doesn't change
+				// (i.e. no audio output, although there are some exceptions)
+				// bSync=true => all devices are sync (aka reset);
+				// bSync=false => all devices are allowed to run and generate changing output
+				m_Osc0.Sync(bSync);
+				m_Osc1.Sync(bSync);
+				m_Osc2.Sync(bSync);
+				m_Osc3.Sync(bSync);
+				m_Osc4.Sync(bSync);
+				m_Osc5.Sync(bSync);
+				m_Noise0.Sync(bSync);
+				m_Noise1.Sync(bSync);
+				m_Amp0.Sync(bSync);
+				m_Amp1.Sync(bSync);
+				m_Amp2.Sync(bSync);
+				m_Amp3.Sync(bSync);
+				m_Amp4.Sync(bSync);
+				m_Amp5.Sync(bSync);
+				m_bSync = bSync;
+			}
+
+			// Global mute bit
+			bool bOutputEnabled = bool(nData & 0x01);
+			if (bOutputEnabled != m_bOutputEnabled)
+			{
+				// unmute all amps - sound 'enabled'
+				m_Amp0.Mute(!bOutputEnabled);
+				m_Amp1.Mute(!bOutputEnabled);
+				m_Amp2.Mute(!bOutputEnabled);
+				m_Amp3.Mute(!bOutputEnabled);
+				m_Amp4.Mute(!bOutputEnabled);
+				m_Amp5.Mute(!bOutputEnabled);
+				m_bOutputEnabled = bOutputEnabled;
+			}
+		}
+		break;
+
+	default:
+		// anything else means data is being written to a register
+		// that is not used within the SAA-1099 architecture
+		// hence, we ignore it.
+	{}
+	}
+}
+
+void CSAADevice::_WriteAddress(BYTE nReg)
+{
+	m_nCurrentSaaReg = nReg & 31;
+	if (m_nCurrentSaaReg == 24)
+	{
+		m_Env0.ExternalClock();
+	}
+	else if (m_nCurrentSaaReg == 25)
+	{
+		m_Env1.ExternalClock();
+	}
+}
+
+#if 1
+BYTE CSAADevice::_ReadAddress(void)
+{
+	// Not a real hardware function of the SAA-1099, which is write-only
+	// However, this is used by SAAImpl to generate debug logs (if enabled)
+	return(m_nCurrentSaaReg);
+}
+#endif
+#if defined(DEBUG)
+BYTE CSAADevice::_ReadData(void)
+{
+	// Not a real hardware function of the SAA-1099, which is write-only
+	// This is only compiled for Debug builds
+	return(m_Reg[m_nCurrentSaaReg]);
+}
+#endif
+
+void CSAADevice::_TickAndOutputStereo(unsigned int& left_mixed, unsigned int& right_mixed)
+{
+	unsigned int temp_left, temp_right;
+	unsigned int accum_left = 0, accum_right = 0;
+	for (int i = 1 << m_nOversample; i > 0; i--)
+	{
+		m_Noise0.Tick();
+		m_Noise1.Tick();
+		m_Amp0.TickAndOutputStereo(temp_left, temp_right);
+		accum_left += temp_left;
+		accum_right += temp_right;
+		m_Amp1.TickAndOutputStereo(temp_left, temp_right);
+		accum_left += temp_left;
+		accum_right += temp_right;
+		m_Amp2.TickAndOutputStereo(temp_left, temp_right);
+		accum_left += temp_left;
+		accum_right += temp_right;
+		m_Amp3.TickAndOutputStereo(temp_left, temp_right);
+		accum_left += temp_left;
+		accum_right += temp_right;
+		m_Amp4.TickAndOutputStereo(temp_left, temp_right);
+		accum_left += temp_left;
+		accum_right += temp_right;
+		m_Amp5.TickAndOutputStereo(temp_left, temp_right);
+		accum_left += temp_left;
+		accum_right += temp_right;
+	}
+	left_mixed = accum_left;
+	right_mixed = accum_right;
+}
+
+void CSAADevice::_TickAndOutputSeparate(unsigned int& left_mixed, unsigned int& right_mixed,
+	unsigned int& left0, unsigned int& right0,
+	unsigned int& left1, unsigned int& right1,
+	unsigned int& left2, unsigned int& right2,
+	unsigned int& left3, unsigned int& right3,
+	unsigned int& left4, unsigned int& right4,
+	unsigned int& left5, unsigned int& right5
+)
+{
+	unsigned int temp_left, temp_right;
+	unsigned int accum_left = 0, accum_right = 0;
+	left0 = left1 = left2 = left3 = left4 = left5 = 0;
+	right0 = right1 = right2 = right3 = right4 = right5 = 0;
+	for (int i = 1 << m_nOversample; i > 0; i--)
+	{
+		m_Noise0.Tick();
+		m_Noise1.Tick();
+		m_Amp0.TickAndOutputStereo(temp_left, temp_right);
+		left0 += temp_left;
+		right0 += temp_right;
+		accum_left += temp_left;
+		accum_right += temp_right;
+		m_Amp1.TickAndOutputStereo(temp_left, temp_right);
+		left1 += temp_left;
+		right1 += temp_right;
+		accum_left += temp_left;
+		accum_right += temp_right;
+		m_Amp2.TickAndOutputStereo(temp_left, temp_right);
+		left2 += temp_left;
+		right2 += temp_right;
+		accum_left += temp_left;
+		accum_right += temp_right;
+		m_Amp3.TickAndOutputStereo(temp_left, temp_right);
+		left3 += temp_left;
+		right3 += temp_right;
+		accum_left += temp_left;
+		accum_right += temp_right;
+		m_Amp4.TickAndOutputStereo(temp_left, temp_right);
+		left4 += temp_left;
+		right4 += temp_right;
+		accum_left += temp_left;
+		accum_right += temp_right;
+		m_Amp5.TickAndOutputStereo(temp_left, temp_right);
+		left5 += temp_left;
+		right5 += temp_right;
+		accum_left += temp_left;
+		accum_right += temp_right;
+	}
+	left_mixed = accum_left;
+	right_mixed = accum_right;
+}
\ No newline at end of file
diff --git a/src/sound/saasound/SAADevice.h b/src/sound/saasound/SAADevice.h
new file mode 100644
index 000000000..7b697821f
--- /dev/null
+++ b/src/sound/saasound/SAADevice.h
@@ -0,0 +1,69 @@
+// Part of SAASound copyright 2020 Dave Hooper <dave@beermex.com>
+//
+// SAADevice.h: connecting the subcomponents of the SAA1099 together.
+// This class handles device inputs and outputs (clocking, data and
+// address bus, and simulated output)
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef SAADEVICE_H_INCLUDED
+#define SAADEVICE_H_INCLUDED
+
+#include "SAASound.h"
+#include "SAANoise.h"
+#include "SAAEnv.h"
+#include "SAAFreq.h"
+#include "SAAAmp.h"
+
+class CSAADevice
+{
+private:
+	int m_nCurrentSaaReg;
+	bool m_bOutputEnabled;
+	bool m_bSync;
+	bool m_bHighpass;
+	int m_nOversample;
+
+	CSAANoise m_Noise0, m_Noise1;
+	CSAAEnv m_Env0, m_Env1;
+	CSAAFreq m_Osc0, m_Osc1, m_Osc2, m_Osc3, m_Osc4, m_Osc5;
+	CSAAAmp m_Amp0, m_Amp1, m_Amp2, m_Amp3, m_Amp4, m_Amp5;
+
+	CSAANoise* Noise[2];
+	CSAAEnv* Env[2];
+	CSAAFreq* Osc[6];
+	CSAAAmp* Amp[6];
+
+#if defined(DEBUG) || defined(DEBUGSAA)
+	BYTE m_Reg[32];
+#endif
+
+public:
+	CSAADevice();
+	~CSAADevice();
+
+	void _WriteAddress(BYTE nReg);
+	void _WriteData(BYTE nData);
+#if 1
+	BYTE _ReadAddress(void);
+#endif
+#if defined(DEBUG)
+	BYTE _ReadData(void);
+#endif
+
+	void _SetClockRate(unsigned int nClockRate);
+	void _SetSampleRate(unsigned int nSampleRate);
+	void _SetOversample(unsigned int nOversample);
+	void _TickAndOutputStereo(unsigned int& left_mixed, unsigned int& right_mixed);
+	void _TickAndOutputSeparate(unsigned int& left_mixed, unsigned int& right_mixed,
+		unsigned int& left0, unsigned int& right0,
+		unsigned int& left1, unsigned int& right1,
+		unsigned int& left2, unsigned int& right2,
+		unsigned int& left3, unsigned int& right3,
+		unsigned int& left4, unsigned int& right4,
+		unsigned int& left5, unsigned int& right5
+	);
+
+};
+
+#endif //  SAADEVICE_H_INCLUDED
\ No newline at end of file
diff --git a/src/sound/saasound/SAAEnv.cpp b/src/sound/saasound/SAAEnv.cpp
new file mode 100755
index 000000000..ae8191112
--- /dev/null
+++ b/src/sound/saasound/SAAEnv.cpp
@@ -0,0 +1,380 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// SAAEnv.cpp: implementation of the CSAAEnv class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#include "SAASound.h"
+#include "types.h"
+#include "SAAEnv.h"
+
+
+//////////////////////////////////////////////////////////////////////
+// Static member initialisation
+//////////////////////////////////////////////////////////////////////
+
+const ENVDATA CSAAEnv::cs_EnvData[8] =
+{
+	{1,false,	{	{{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},					{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}},
+					{{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},					{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}}},
+	{1,true,	{	{{15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15},{15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15}},
+					{{14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14},{14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14}}}},
+	{1,false,	{	{{15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0},			{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}},
+					{{14,14,12,12,10,10,8,8,6,6,4,4,2,2,0,0},			{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}}},
+	{1,true,	{	{{15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0},			{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}},
+					{{14,14,12,12,10,10,8,8,6,6,4,4,2,2,0,0},			{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}}},
+	{2,false,	{	{{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15},			{15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0}},
+					{{0,0,2,2,4,4,6,6,8,8,10,10,12,12,14,14},			{14,14,12,12,10,10,8,8,6,6,4,4,2,2,0,0}}}},
+	{2,true,	{	{{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15},			{15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0}},
+					{{0,0,2,2,4,4,6,6,8,8,10,10,12,12,14,14},			{14,14,12,12,10,10,8,8,6,6,4,4,2,2,0,0}}}},
+	{1,false,	{	{{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15},			{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}},
+					{{0,0,2,2,4,4,6,6,8,8,10,10,12,12,14,14},			{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}}},
+	{1,true,	{	{{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15},			{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}},
+					{{0,0,2,2,4,4,6,6,8,8,10,10,12,12,14,14},			{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}}}
+};
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+CSAAEnv::CSAAEnv()
+:
+m_bEnabled(false),
+m_bNewData(false),
+m_nNextData(0),
+m_bEnvelopeEnded(true),
+m_nPhase(0),
+m_nPhasePosition(0),
+m_nResolution(1)
+{
+	// initialise itself with the value 'zero'
+	SetEnvControl(0);
+}
+
+CSAAEnv::~CSAAEnv()
+{
+	// Nothing to do
+}
+
+void CSAAEnv::InternalClock(void)
+{
+	// will only do something if envelope clock mode is set to internal
+	// and the env control is enabled
+	if (m_bEnabled && (!m_bClockExternally)) Tick();
+}
+
+void CSAAEnv::ExternalClock(void)
+{
+	// will only do something if envelope clock mode is set to external
+	// and the env control is enabled
+	if (m_bClockExternally && m_bEnabled) Tick();
+}
+
+void CSAAEnv::SetEnvControl(int nData)
+{
+	// process immediate stuff first:
+	// start with the Enabled flag.  if env is disabled,
+	// there's not much to do
+	bool bEnabled = ((nData & 0x80)==0x80);
+	if (!bEnabled && !m_bEnabled)
+		return;
+	m_bEnabled = bEnabled;
+	if (!m_bEnabled)
+	{
+		// env control was enabled, and now disabled
+		// Any subsequent env control changes are immediate.
+		m_bEnvelopeEnded = true;
+		return;
+	}
+
+	// Resolution (3bit/4bit) is also immediately processed
+	int new_resolution = ((nData & 0x10) == 0x10) ? 2 : 1;
+	// NOTE: undocumented behaviour when changing resolution mid-waveform
+	// Empirically, the following matches observations:
+	// * When ticking the env generator with 4-bit resolution, the position += 1
+	// * When ticking the env generator with 3-bit resolution, the position += 2
+	// * When changing between 4-bit resolution and 3-bit resolution
+	//   without ticking the env generator, the position is unchanged
+	//   (although, effectively, the LSB is ignored. Purely as an implementation
+	//    detail, I'm implementing this as clearing the LSB ie LSB=0; see next point)
+	// * When changing between 3-bit resolution and 4-bit resolution
+	//   without ticking the env generator, the position LSB is set to 1
+	// See test case: envext_34b
+	//
+	if (m_nResolution == 1 && new_resolution == 2)
+	{
+		// change from 4-bit to 3-bit
+		m_nPhasePosition &= 0xe;
+	}
+	else if (m_nResolution == 2 && new_resolution == 1)
+	{
+		// change from 3-bit to 4-bit
+		m_nPhasePosition |= 0x1;
+	}
+	m_nResolution = new_resolution;
+
+	// now buffered stuff: but only if it's ok to, and only if the
+	// envgenerator is not disabled. otherwise it just stays buffered until
+	// the Tick() function sets m_bEnvelopeEnded to true and realises there is
+	// already some new data waiting
+	if (m_bEnvelopeEnded)
+	{
+		SetNewEnvData(nData); // also does the SetLevels() call for us.
+		m_bNewData=false;
+	}
+	else
+	{
+		// since the 'next resolution' changes arrive unbuffered, we
+		// may need to change the current level because of this:
+		SetLevels();
+	
+		// store current new data, and set the newdata flag:
+		m_bNewData = true;
+		m_nNextData = nData;
+	}
+			
+}
+	
+int CSAAEnv::LeftLevel(void) const
+{
+	return m_nLeftLevel;
+}
+
+int CSAAEnv::RightLevel(void) const
+{
+	return m_nRightLevel;
+}
+
+inline void CSAAEnv::Tick(void)
+{
+	// if disabled, do nothing
+	if (!m_bEnabled) // m_bEnabled is set directly, not buffered, so this is ok
+	{
+		// for sanity, reset stuff:
+		m_bEnvelopeEnded = true;
+		m_nPhase = 0;
+		m_nPhasePosition = 0;
+		return;
+	}
+
+	// else : m_bEnabled
+
+
+	if (m_bEnvelopeEnded)
+	{
+		// do nothing 
+		// (specifically, don't change the values of m_bEnvelopeEnded,
+		//  m_nPhase and m_nPhasePosition, as these will still be needed
+		//  by SetLevels() should it be called again)
+		
+		return;
+	}
+
+
+	// else : !m_bEnvelopeEnded
+	// Continue playing the same envelope ... 
+	// increments the phaseposition within an envelope.
+	// also handles looping and resolution appropriately.
+	// Changes the level of the envelope accordingly
+	// through calling SetLevels() . This must be called after making
+	// any changes that will affect the output levels of the env controller!!
+	// SetLevels also handles left-right channel inverting
+
+	// increment phase position
+	m_nPhasePosition += m_nResolution;
+
+	// if this means we've gone past 16 (the end of a phase)
+	// then change phase, and if necessary, loop
+	// Refer to datasheet for meanings of (3) and (4) in following text
+	// w.r.t SAA1099 envelopes
+
+	// Note that we will always reach position (3) or (4), even if we keep toggling
+	// resolution from 4-bit to 3-bit and back, because the counter will always wrap to 0.
+	// In fact it's quite elegant:
+	// No matter how you increment and toggle and increment and toggle, the counter
+	// will at some point be either 0xe (either 4-bit mode or 3-bit mode) or 0xf (4-bit mode only).
+	// Depending on the mode, even if you change the mode, the next increment,
+	// or the one after it, will then take it to 0.
+	// 0xe + 2  (3bit mode)  => 0x0
+	// 0xe + 1  (4bit mode)  => 0xf
+	// 0xf + 1  (4bit mode)  => 0x0
+	// 0xe -> (toggle 3bit mode to 4bit mode) => 0xf
+	// 0xe -> (toggle 4bit mode to 3bit mode) => 0xe
+	// 0xf -> (toggle 4bit mode to 3bit mode) => 0xe
+	//
+	// but there is a subtlety (of course), which is that any changes at point (3)
+	// can take place immediately you hit point (3), but changes at point (4) are actually
+	// only acted upon when the counter transitions from 0xe (or 0xf) to 0x0 (which also
+	// means that, for these looping envelopes, which are the ones that have a point(4),
+	// immediately after the counter wrapping to 0x0, a write to the env data register will
+	// NOT set the waveform and will NOT reset the phase/phaseposition (even though it
+	// will still let you toggle the 4bit/3bit mode, which will change the phaseposition LSB!)
+	// See test case: envext_34c
+
+	bool bProcessNewDataIfAvailable = false;
+	if (m_nPhasePosition >= 16)
+	{
+		m_nPhase++;
+			
+		// if we should loop, then do so - and we've reached position (4)
+		// otherwise, if we shouldn't loop,
+		// then we've reached position (3) and so we say that
+		// we're ok for new data.
+		if (m_nPhase == m_nNumberOfPhases)
+		{
+			// at position (3) or (4)
+			if (!m_bLooping)
+			{
+				// position (3) only
+				// note that it seems that the sustain level is ALWAYS zero
+				// in the case of non-looping waveforms
+				m_bEnvelopeEnded = true;
+				bProcessNewDataIfAvailable = true;
+			}
+			else
+			{
+				// position (4) only
+				// note that any data already latched is ONLY acted upon
+				// at THIS point. If (after this Tick has completed) any new
+				// env data is written, it will NOT be acted upon, until
+				// we get back to position (4) again.
+				// this is why m_bEnvelopeEnded (which affects the behaviour
+				// of the SetEnvControl method) is FALSE here.
+				// See test case: envext_34c  (as noted earlier)
+				m_bEnvelopeEnded = false;
+				// set phase pointer to start of envelope for loop
+				// and reset m_nPhasePosition
+				m_nPhase=0;
+				m_nPhasePosition -= 16;
+				bProcessNewDataIfAvailable = true;
+			}
+		}
+		else // (m_nPhase < m_nNumberOfPhases)
+		{
+			// not at position (3) or (4) ... 
+			// (i.e., we're in the middle of an envelope with
+			//  more than one phase. Specifically, we're in
+			//  the middle of envelope 4 or 5 - the
+			//  triangle envelopes - but that's not important)
+
+			// any commands sent to this envelope controller
+			// will be buffered. Set the flag to indicate this.
+			m_bEnvelopeEnded = false;
+			m_nPhasePosition -= 16;
+		}
+	}
+	else // (m_nPhasePosition < 16)
+	{
+		// still within the same phase;
+		// but, importantly, we are no longer at the start of the phase ...
+		// so new data cannot be acted on immediately, and must
+		// be buffered
+		m_bEnvelopeEnded = false;
+		// Phase and PhasePosition have already been updated.
+		// SetLevels() will need to be called to actually calculate
+		// the output 'level' of this envelope controller
+	}
+
+	
+	// if we have new (buffered) data, now is the time to act on it
+	if (m_bNewData && bProcessNewDataIfAvailable)
+	{
+		m_bNewData = false;
+		SetNewEnvData(m_nNextData);
+	}
+	else
+	{
+		// ok, we didn't have any new buffered date to act on,
+		// so we just call SetLevels() to calculate the output level
+		// for whatever the current envelope is
+		SetLevels();
+	}
+
+}
+
+inline void CSAAEnv::SetLevels(void)
+{
+	// sets m_nLeftLevel 
+	// Also sets m_nRightLevel in terms of m_nLeftLevel
+	//								   and m_bInvertRightChannel
+
+	// m_nResolution: 1 means 4-bit resolution; 2 means 3-bit resolution. Resolution of envelope waveform.
+
+	// Note that this is handled 'immediately', and doesn't wait for synchronisation of
+	// the envelope waveform (this is important, see test case EnvExt_imm)
+	// It is therefore possible to switch between 4-bit and 3-bit resolution in the middle of
+	// an envelope waveform.  if you are at an 'odd' phase position, you would be able to hear
+	// the difference.  if you are at an 'even' phase position, the volume level for 4-bit
+	// and 3-bit would be the same.
+	// NOTE: additional test cases are required.
+
+	switch (m_nResolution)
+	{
+		case 1: // 4 bit res waveforms
+		default:
+			{
+				// special case: if envelope is not a looping one, and we're at the end
+				// then our level should be zero (all of the non-looping waveforms have
+				// a sustain level of zero):
+				if (m_bEnvelopeEnded && !m_bLooping)
+					m_nLeftLevel = 0;
+				else
+					m_nLeftLevel = m_pEnvData->nLevels[0][m_nPhase][m_nPhasePosition];
+
+				if (m_bInvertRightChannel)
+					m_nRightLevel = 15-m_nLeftLevel;
+				else
+					m_nRightLevel = m_nLeftLevel;
+				break;
+			}
+		case 2: // 3 bit res waveforms
+			{
+				// special case: if envelope is not a looping one, and we're at the end
+				// then our level should be zero (all of the non-looping waveforms have
+				// a sustain level of zero):
+				if (m_bEnvelopeEnded && !m_bLooping)
+					m_nLeftLevel = 0;
+				else
+					m_nLeftLevel = m_pEnvData->nLevels[1][m_nPhase][m_nPhasePosition];
+				if (m_bInvertRightChannel)
+					m_nRightLevel = 14-m_nLeftLevel;
+				else
+					m_nRightLevel = m_nLeftLevel;
+				break;
+			}
+	}
+}
+
+
+inline void CSAAEnv::SetNewEnvData(int nData)
+{
+	// loads envgenerator's registers according to the bits set
+	// in nData
+
+	m_nPhase = 0;
+	m_nPhasePosition = 0;
+	m_pEnvData = &(cs_EnvData[(nData >> 1) & 0x07]);
+	m_bInvertRightChannel = ((nData & 0x01) == 0x01);
+	m_bClockExternally = ((nData & 0x20) == 0x20);
+	m_nNumberOfPhases = m_pEnvData->nNumberOfPhases;
+	m_bLooping = m_pEnvData->bLooping;
+	m_nResolution = (((nData & 0x10)==0x10) ? 2 : 1);
+	m_bEnabled = ((nData & 0x80) == 0x80);
+	if (m_bEnabled)
+	{
+		m_bEnvelopeEnded = false;
+		// is this right?
+		// YES.  See test case EnvExt_34c (setting data multiple times
+		// when at a point (3) resets the waveform so you're no longer
+		// at a point (3).
+	}
+	else
+	{
+		// DISABLED - so set stuff accordingly
+		m_bEnvelopeEnded = true;
+		m_nPhase = 0;
+		m_nPhasePosition = 0;
+	}
+	
+	SetLevels();
+}
diff --git a/src/sound/saasound/SAAEnv.h b/src/sound/saasound/SAAEnv.h
new file mode 100755
index 000000000..131659c06
--- /dev/null
+++ b/src/sound/saasound/SAAEnv.h
@@ -0,0 +1,54 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// SAAEnv.h: interface for the CSAAEnv class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef SAAENV_H_INCLUDED
+#define SAAENV_H_INCLUDED
+
+class CSAAEnv  
+{
+private:
+	int m_nLeftLevel, m_nRightLevel;
+	ENVDATA const * m_pEnvData;
+
+	bool m_bEnabled;
+	bool m_bInvertRightChannel;
+	BYTE m_nPhase;
+	BYTE m_nPhasePosition;
+	bool m_bEnvelopeEnded;
+	char m_nPhaseAdd[2];
+	char m_nCurrentPhaseAdd;
+	bool m_bLooping;
+	char m_nNumberOfPhases;
+	char m_nResolution;
+	char m_nInitialLevel;
+	bool m_bNewData;
+	BYTE m_nNextData;
+	bool m_bClockExternally;
+	static const ENVDATA cs_EnvData[8];
+
+	void Tick(void);
+	void SetLevels(void);
+	void SetNewEnvData(int nData);
+
+public:
+	CSAAEnv();
+	~CSAAEnv();
+
+	void InternalClock(void);
+	void ExternalClock(void);
+	void SetEnvControl(int nData); // really just a BYTE
+	int LeftLevel(void) const;
+	int RightLevel(void) const;
+	bool IsActive(void) const;
+
+};
+
+inline bool CSAAEnv::IsActive(void) const
+{
+	return m_bEnabled;
+}
+
+#endif	// SAAENV_H_INCLUDED
diff --git a/src/sound/saasound/SAAFreq.cpp b/src/sound/saasound/SAAFreq.cpp
new file mode 100755
index 000000000..52cbc7a3d
--- /dev/null
+++ b/src/sound/saasound/SAAFreq.cpp
@@ -0,0 +1,280 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// SAAFreq.cpp: implementation of the CSAAFreq class.
+// only 7-bit fractional accuracy on oscillator periods. I may consider fixing that.
+//
+//////////////////////////////////////////////////////////////////////
+
+#include "SAASound.h"
+#include "types.h"
+#include "SAANoise.h"
+#include "SAAEnv.h"
+#include "SAAFreq.h"
+#include "defns.h"
+
+#ifdef SAAFREQ_FIXED_CLOCKRATE
+// 'load in' the data for the static frequency lookup table
+// precomputed for a fixed clockrate
+// See: tools/freqdat.py
+const unsigned long CSAAFreq::m_FreqTable[2048] = {
+#include "SAAFreq.dat"
+};
+#else
+unsigned long CSAAFreq::m_FreqTable[2048];
+unsigned long CSAAFreq::m_nClockRate = 0;
+#endif // SAAFREQ_FIXED_CLOCKRATE
+
+const int INITIAL_LEVEL = 1;
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+CSAAFreq::CSAAFreq(CSAANoise * const NoiseGenerator, CSAAEnv * const EnvGenerator)
+:
+m_nCounter(0), m_nCounter_low(0), m_nAdd(0),
+m_nLevel(INITIAL_LEVEL),
+m_nOversample(0), m_nCounterLimit_low(1),
+m_nCurrentOffset(0), m_nCurrentOctave(0), m_nNextOffset(0), m_nNextOctave(0),
+m_bIgnoreOffsetData(false), m_bNewData(false), 
+m_bSync(false),
+m_nSampleRate(SAMPLE_RATE_HZ),
+m_pcConnectedNoiseGenerator(NoiseGenerator),
+m_pcConnectedEnvGenerator(EnvGenerator),
+m_nConnectedMode((NoiseGenerator == NULL) ? ((EnvGenerator == NULL) ? 0 : 1) : 2)
+{
+	_SetClockRate(EXTERNAL_CLK_HZ);
+	SetAdd(); // current octave, current offset
+}
+
+CSAAFreq::~CSAAFreq()
+{
+	// Nothing to do
+}
+
+void CSAAFreq::SetFreqOffset(BYTE nOffset)
+{
+	// nOffset between 0 and 255
+
+	if (!m_bSync)
+	{
+		m_nNextOffset = nOffset;
+		m_bNewData=true;
+		if (m_nNextOctave==m_nCurrentOctave)
+		{
+			// According to Philips, if you send the SAA-1099
+			// new Octave data and then new Offset data in that
+			// order, on the next half-cycle of the current frequency
+			// generator, ONLY the octave data is acted upon.
+			// The offset data will be acted upon next time.
+
+			// ?? TEST CASE :    if you set the octave and then the offset
+			// but the octave you set it to is the same one it already was.
+			// Will this ignore the offset data?
+			// Do you get the same behaviour if you set offset THEN octave
+			// even if you set octave to the same value it was before?
+
+			m_bIgnoreOffsetData=true;
+		}
+	}
+	else
+	{
+		// updates straightaway if m_bSync
+		m_bNewData=false;
+		m_bIgnoreOffsetData = false;
+		m_nCurrentOffset = nOffset;
+		m_nNextOffset = nOffset;
+		m_nCurrentOctave = m_nNextOctave;
+		SetAdd();
+	}
+
+}
+
+void CSAAFreq::SetFreqOctave(BYTE nOctave)
+{
+	// nOctave between 0 and 7
+
+	if (!m_bSync)
+	{
+		m_nNextOctave = nOctave;
+		m_bNewData=true;
+		m_bIgnoreOffsetData = false;
+	}
+	else
+	{
+		// updates straightaway if m_bSync
+		m_bNewData=false;
+		m_bIgnoreOffsetData = false;
+		m_nCurrentOctave = nOctave;
+		m_nNextOctave = nOctave;
+		m_nCurrentOffset = m_nNextOffset;
+		SetAdd();
+	}
+}
+
+void CSAAFreq::UpdateOctaveOffsetData(void)
+{
+	// loads the buffered new octave and new offset data into the current registers
+	// and sets up the new frequency for this frequency generator (i.e. sets up m_nAdd)
+	// - called during Sync, and called when waveform half-cycle completes
+
+	// How the SAA-1099 really treats new data:
+	// if only new octave data is present,
+	// then set new period based on just the octave data
+	// Otherwise, if only new offset data is present,
+	// then set new period based on just the offset data
+	// Otherwise, if new octave data is present, and new offset data is present,
+	// and the offset data was set BEFORE the octave data,
+	// then set new period based on both the octave and offset data
+	// Else, if the offset data came AFTER the new octave data
+	// then set new period based on JUST THE OCTAVE DATA, and continue
+	// signalling the offset data as 'new', so it will be acted upon
+	// next half-cycle
+	// 
+	// Weird, I know. But that's how it works. Philips even documented as much.
+
+	if (!m_bNewData)
+	{
+		// optimise for the most common case! No new data!
+		return;
+	}
+		
+	m_nCurrentOctave=m_nNextOctave;
+	if (!m_bIgnoreOffsetData)
+	{
+		m_nCurrentOffset=m_nNextOffset;
+		m_bNewData=false;
+	}
+	m_bIgnoreOffsetData=false;
+
+	SetAdd();
+}
+
+void CSAAFreq::_SetSampleRate(unsigned int nSampleRate)
+{
+	m_nSampleRate = nSampleRate;
+}
+
+void CSAAFreq::_SetOversample(unsigned int oversample)
+{
+	// oversample is a power of 2 i.e.
+	// if oversample == 2 then 4x oversample
+	// if oversample == 6 then 64x oversample
+	if (oversample < m_nOversample)
+	{
+		m_nCounter_low <<= (m_nOversample - oversample);
+	}
+	else
+	{
+		m_nCounter_low >>= (oversample - m_nOversample);
+	}
+
+	m_nCounterLimit_low = 1<<oversample;
+	m_nOversample = oversample;
+}
+
+#ifdef SAAFREQ_FIXED_CLOCKRATE
+void CSAAFreq::_SetClockRate(int nClockRate)
+{
+	// if SAAFREQ clock rate is hardcoded, then we don't support dynamically
+	// adjusting the SAA clock rate, so this is a no-op
+}
+#else
+void CSAAFreq::_SetClockRate(int nClockRate)
+{
+	// initialise the frequency table based on the SAA clockrate
+	// Each item in m_FreqTable corresponds to the frequency calculated by
+	// the standard formula   (15625 << octave) / (511 - offset)
+	// then multiplied by 8192 (and represented as a long integer value).
+	// We are therefore using 12 bits (i.e. 2^12 = 4096) as fractional part.
+	// The reason we multiply by 8192, not 4096, is that we use this as a counter
+	// to toggle the oscillator state, so we need to count half-waves (i.e. twice
+	// the frequency)
+	//
+	// Finally, note that the standard formula corresponds to a 8MHz base clock
+	// so we rescale the final result by the ratio nClockRate/8000000
+
+	if (nClockRate != m_nClockRate)
+	{
+		m_nClockRate = nClockRate;
+		int ix = 0;
+		for (int nOctave = 0; nOctave < 8; nOctave++)
+			for (int nOffset = 0; nOffset < 256; nOffset++)
+				m_FreqTable[ix++] = (unsigned long)((8192.0 * 15625.0 * double(1 << nOctave) * (double(nClockRate) / 8000000.0)) / (511.0 - double(nOffset)));
+	}
+}
+#endif
+
+int CSAAFreq::Tick(void)
+{
+	// set to the absolute level (0 or 1)
+	if (m_bSync)
+		return 1;
+
+	m_nCounter += m_nAdd;
+	while (m_nCounter >= (m_nSampleRate<<12))
+	{
+		m_nCounter -= (m_nSampleRate<<12);
+		m_nCounter_low++;
+		if (m_nCounter_low >= m_nCounterLimit_low)
+		{
+			// period elapsed for (at least) one half-cycle of
+			// current frequency
+			m_nCounter_low = 0;
+			// flip state - from 0 to 1 or vice versa
+			m_nLevel = 1 - m_nLevel;
+
+			// trigger any connected devices
+			switch (m_nConnectedMode)
+			{
+			case 1:
+				// env trigger
+				m_pcConnectedEnvGenerator->InternalClock();
+				break;
+
+			case 2:
+				// noise trigger
+				m_pcConnectedNoiseGenerator->Trigger();
+				break;
+
+			default:
+				// do nothing
+				break;
+			}
+
+			// get new frequency (set period length m_nAdd) if new data is waiting:
+			UpdateOctaveOffsetData();
+		}
+	}
+	
+	return m_nLevel;
+}
+
+void CSAAFreq::SetAdd(void)
+{
+	// nOctave between 0 and 7; nOffset between 0 and 255
+
+	// Used to be:
+	// m_nAdd = (15625 << nOctave) / (511 - nOffset);
+	// Now just table lookup:
+	m_nAdd = m_FreqTable[m_nCurrentOctave<<8 | m_nCurrentOffset];
+}
+
+void CSAAFreq::Sync(bool bSync)
+{
+	m_bSync = bSync;
+
+	// update straightaway if m_bSync
+	if (m_bSync)
+	{
+		m_nCounter = 0;
+		m_nCounter_low = 0;
+		
+		// this seems to need to be required to make the Fred59 SPACE DEMO audio work correctly
+		m_nLevel = INITIAL_LEVEL;
+
+		m_nCurrentOctave=m_nNextOctave;
+		m_nCurrentOffset=m_nNextOffset;
+		SetAdd();
+	}
+}
diff --git a/src/sound/saasound/SAAFreq.dat b/src/sound/saasound/SAAFreq.dat
new file mode 100755
index 000000000..04fb9081a
--- /dev/null
+++ b/src/sound/saasound/SAAFreq.dat
@@ -0,0 +1,141 @@
+/*
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// Precalculated oscillator frequency period steps
+// Higher scaling for better accuracy.
+//
+// After construction, it's important to SetSampleRate before
+// trying to use the generator.
+// (Just because the CSAANoise object has a default samplerate
+//  doesn't mean you should rely on it)
+//
+//////////////////////////////////////////////////////////////////////
+*/
+ 250489 ,	 250980 ,	 251473 ,	 251969 ,	 252465 ,	 252964 ,	 253465 ,	 253968 ,	 254473 ,	 254980 ,	 255489 ,	 256000 ,	 256513 ,	 257028 ,	 257545 ,	 258065 ,	
+ 258586 ,	 259109 ,	 259635 ,	 260163 ,	 260692 ,	 261224 ,	 261759 ,	 262295 ,	 262834 ,	 263374 ,	 263918 ,	 264463 ,	 265010 ,	 265560 ,	 266112 ,	 266667 ,	
+ 267223 ,	 267782 ,	 268344 ,	 268908 ,	 269474 ,	 270042 ,	 270613 ,	 271186 ,	 271762 ,	 272340 ,	 272921 ,	 273504 ,	 274090 ,	 274678 ,	 275269 ,	 275862 ,	
+ 276458 ,	 277056 ,	 277657 ,	 278261 ,	 278867 ,	 279476 ,	 280088 ,	 280702 ,	 281319 ,	 281938 ,	 282561 ,	 283186 ,	 283814 ,	 284444 ,	 285078 ,	 285714 ,	
+ 286353 ,	 286996 ,	 287640 ,	 288288 ,	 288939 ,	 289593 ,	 290249 ,	 290909 ,	 291572 ,	 292237 ,	 292906 ,	 293578 ,	 294253 ,	 294931 ,	 295612 ,	 296296 ,	
+ 296984 ,	 297674 ,	 298368 ,	 299065 ,	 299766 ,	 300469 ,	 301176 ,	 301887 ,	 302600 ,	 303318 ,	 304038 ,	 304762 ,	 305489 ,	 306220 ,	 306954 ,	 307692 ,	
+ 308434 ,	 309179 ,	 309927 ,	 310680 ,	 311436 ,	 312195 ,	 312958 ,	 313725 ,	 314496 ,	 315271 ,	 316049 ,	 316832 ,	 317618 ,	 318408 ,	 319202 ,	 320000 ,	
+ 320802 ,	 321608 ,	 322418 ,	 323232 ,	 324051 ,	 324873 ,	 325700 ,	 326531 ,	 327366 ,	 328205 ,	 329049 ,	 329897 ,	 330749 ,	 331606 ,	 332468 ,	 333333 ,	
+ 334204 ,	 335079 ,	 335958 ,	 336842 ,	 337731 ,	 338624 ,	 339523 ,	 340426 ,	 341333 ,	 342246 ,	 343164 ,	 344086 ,	 345013 ,	 345946 ,	 346883 ,	 347826 ,	
+ 348774 ,	 349727 ,	 350685 ,	 351648 ,	 352617 ,	 353591 ,	 354571 ,	 355556 ,	 356546 ,	 357542 ,	 358543 ,	 359551 ,	 360563 ,	 361582 ,	 362606 ,	 363636 ,	
+ 364672 ,	 365714 ,	 366762 ,	 367816 ,	 368876 ,	 369942 ,	 371014 ,	 372093 ,	 373178 ,	 374269 ,	 375367 ,	 376471 ,	 377581 ,	 378698 ,	 379822 ,	 380952 ,	
+ 382090 ,	 383234 ,	 384384 ,	 385542 ,	 386707 ,	 387879 ,	 389058 ,	 390244 ,	 391437 ,	 392638 ,	 393846 ,	 395062 ,	 396285 ,	 397516 ,	 398754 ,	 400000 ,	
+ 401254 ,	 402516 ,	 403785 ,	 405063 ,	 406349 ,	 407643 ,	 408946 ,	 410256 ,	 411576 ,	 412903 ,	 414239 ,	 415584 ,	 416938 ,	 418301 ,	 419672 ,	 421053 ,	
+ 422442 ,	 423841 ,	 425249 ,	 426667 ,	 428094 ,	 429530 ,	 430976 ,	 432432 ,	 433898 ,	 435374 ,	 436860 ,	 438356 ,	 439863 ,	 441379 ,	 442907 ,	 444444 ,	
+ 445993 ,	 447552 ,	 449123 ,	 450704 ,	 452297 ,	 453901 ,	 455516 ,	 457143 ,	 458781 ,	 460432 ,	 462094 ,	 463768 ,	 465455 ,	 467153 ,	 468864 ,	 470588 ,	
+ 472325 ,	 474074 ,	 475836 ,	 477612 ,	 479401 ,	 481203 ,	 483019 ,	 484848 ,	 486692 ,	 488550 ,	 490421 ,	 492308 ,	 494208 ,	 496124 ,	 498054 ,	 500000 ,	
+ 500978 ,	 501961 ,	 502947 ,	 503937 ,	 504931 ,	 505929 ,	 506931 ,	 507937 ,	 508946 ,	 509960 ,	 510978 ,	 512000 ,	 513026 ,	 514056 ,	 515091 ,	 516129 ,	
+ 517172 ,	 518219 ,	 519270 ,	 520325 ,	 521385 ,	 522449 ,	 523517 ,	 524590 ,	 525667 ,	 526749 ,	 527835 ,	 528926 ,	 530021 ,	 531120 ,	 532225 ,	 533333 ,	
+ 534447 ,	 535565 ,	 536688 ,	 537815 ,	 538947 ,	 540084 ,	 541226 ,	 542373 ,	 543524 ,	 544681 ,	 545842 ,	 547009 ,	 548180 ,	 549356 ,	 550538 ,	 551724 ,	
+ 552916 ,	 554113 ,	 555315 ,	 556522 ,	 557734 ,	 558952 ,	 560175 ,	 561404 ,	 562637 ,	 563877 ,	 565121 ,	 566372 ,	 567627 ,	 568889 ,	 570156 ,	 571429 ,	
+ 572707 ,	 573991 ,	 575281 ,	 576577 ,	 577878 ,	 579186 ,	 580499 ,	 581818 ,	 583144 ,	 584475 ,	 585812 ,	 587156 ,	 588506 ,	 589862 ,	 591224 ,	 592593 ,	
+ 593968 ,	 595349 ,	 596737 ,	 598131 ,	 599532 ,	 600939 ,	 602353 ,	 603774 ,	 605201 ,	 606635 ,	 608076 ,	 609524 ,	 610979 ,	 612440 ,	 613909 ,	 615385 ,	
+ 616867 ,	 618357 ,	 619855 ,	 621359 ,	 622871 ,	 624390 ,	 625917 ,	 627451 ,	 628993 ,	 630542 ,	 632099 ,	 633663 ,	 635236 ,	 636816 ,	 638404 ,	 640000 ,	
+ 641604 ,	 643216 ,	 644836 ,	 646465 ,	 648101 ,	 649746 ,	 651399 ,	 653061 ,	 654731 ,	 656410 ,	 658098 ,	 659794 ,	 661499 ,	 663212 ,	 664935 ,	 666667 ,	
+ 668407 ,	 670157 ,	 671916 ,	 673684 ,	 675462 ,	 677249 ,	 679045 ,	 680851 ,	 682667 ,	 684492 ,	 686327 ,	 688172 ,	 690027 ,	 691892 ,	 693767 ,	 695652 ,	
+ 697548 ,	 699454 ,	 701370 ,	 703297 ,	 705234 ,	 707182 ,	 709141 ,	 711111 ,	 713092 ,	 715084 ,	 717087 ,	 719101 ,	 721127 ,	 723164 ,	 725212 ,	 727273 ,	
+ 729345 ,	 731429 ,	 733524 ,	 735632 ,	 737752 ,	 739884 ,	 742029 ,	 744186 ,	 746356 ,	 748538 ,	 750733 ,	 752941 ,	 755162 ,	 757396 ,	 759644 ,	 761905 ,	
+ 764179 ,	 766467 ,	 768769 ,	 771084 ,	 773414 ,	 775758 ,	 778116 ,	 780488 ,	 782875 ,	 785276 ,	 787692 ,	 790123 ,	 792570 ,	 795031 ,	 797508 ,	 800000 ,	
+ 802508 ,	 805031 ,	 807571 ,	 810127 ,	 812698 ,	 815287 ,	 817891 ,	 820513 ,	 823151 ,	 825806 ,	 828479 ,	 831169 ,	 833876 ,	 836601 ,	 839344 ,	 842105 ,	
+ 844884 ,	 847682 ,	 850498 ,	 853333 ,	 856187 ,	 859060 ,	 861953 ,	 864865 ,	 867797 ,	 870748 ,	 873720 ,	 876712 ,	 879725 ,	 882759 ,	 885813 ,	 888889 ,	
+ 891986 ,	 895105 ,	 898246 ,	 901408 ,	 904594 ,	 907801 ,	 911032 ,	 914286 ,	 917563 ,	 920863 ,	 924188 ,	 927536 ,	 930909 ,	 934307 ,	 937729 ,	 941176 ,	
+ 944649 ,	 948148 ,	 951673 ,	 955224 ,	 958801 ,	 962406 ,	 966038 ,	 969697 ,	 973384 ,	 977099 ,	 980843 ,	 984615 ,	 988417 ,	 992248 ,	 996109 ,	 1000000 ,	
+ 1001957 ,	 1003922 ,	 1005894 ,	 1007874 ,	 1009862 ,	 1011858 ,	 1013861 ,	 1015873 ,	 1017893 ,	 1019920 ,	 1021956 ,	 1024000 ,	 1026052 ,	 1028112 ,	 1030181 ,	 1032258 ,	
+ 1034343 ,	 1036437 ,	 1038540 ,	 1040650 ,	 1042770 ,	 1044898 ,	 1047035 ,	 1049180 ,	 1051335 ,	 1053498 ,	 1055670 ,	 1057851 ,	 1060041 ,	 1062241 ,	 1064449 ,	 1066667 ,	
+ 1068894 ,	 1071130 ,	 1073375 ,	 1075630 ,	 1077895 ,	 1080169 ,	 1082452 ,	 1084746 ,	 1087049 ,	 1089362 ,	 1091684 ,	 1094017 ,	 1096360 ,	 1098712 ,	 1101075 ,	 1103448 ,	
+ 1105832 ,	 1108225 ,	 1110629 ,	 1113043 ,	 1115468 ,	 1117904 ,	 1120350 ,	 1122807 ,	 1125275 ,	 1127753 ,	 1130243 ,	 1132743 ,	 1135255 ,	 1137778 ,	 1140312 ,	 1142857 ,	
+ 1145414 ,	 1147982 ,	 1150562 ,	 1153153 ,	 1155756 ,	 1158371 ,	 1160998 ,	 1163636 ,	 1166287 ,	 1168950 ,	 1171625 ,	 1174312 ,	 1177011 ,	 1179724 ,	 1182448 ,	 1185185 ,	
+ 1187935 ,	 1190698 ,	 1193473 ,	 1196262 ,	 1199063 ,	 1201878 ,	 1204706 ,	 1207547 ,	 1210402 ,	 1213270 ,	 1216152 ,	 1219048 ,	 1221957 ,	 1224880 ,	 1227818 ,	 1230769 ,	
+ 1233735 ,	 1236715 ,	 1239709 ,	 1242718 ,	 1245742 ,	 1248780 ,	 1251834 ,	 1254902 ,	 1257985 ,	 1261084 ,	 1264198 ,	 1267327 ,	 1270471 ,	 1273632 ,	 1276808 ,	 1280000 ,	
+ 1283208 ,	 1286432 ,	 1289673 ,	 1292929 ,	 1296203 ,	 1299492 ,	 1302799 ,	 1306122 ,	 1309463 ,	 1312821 ,	 1316195 ,	 1319588 ,	 1322997 ,	 1326425 ,	 1329870 ,	 1333333 ,	
+ 1336815 ,	 1340314 ,	 1343832 ,	 1347368 ,	 1350923 ,	 1354497 ,	 1358090 ,	 1361702 ,	 1365333 ,	 1368984 ,	 1372654 ,	 1376344 ,	 1380054 ,	 1383784 ,	 1387534 ,	 1391304 ,	
+ 1395095 ,	 1398907 ,	 1402740 ,	 1406593 ,	 1410468 ,	 1414365 ,	 1418283 ,	 1422222 ,	 1426184 ,	 1430168 ,	 1434174 ,	 1438202 ,	 1442254 ,	 1446328 ,	 1450425 ,	 1454545 ,	
+ 1458689 ,	 1462857 ,	 1467049 ,	 1471264 ,	 1475504 ,	 1479769 ,	 1484058 ,	 1488372 ,	 1492711 ,	 1497076 ,	 1501466 ,	 1505882 ,	 1510324 ,	 1514793 ,	 1519288 ,	 1523810 ,	
+ 1528358 ,	 1532934 ,	 1537538 ,	 1542169 ,	 1546828 ,	 1551515 ,	 1556231 ,	 1560976 ,	 1565749 ,	 1570552 ,	 1575385 ,	 1580247 ,	 1585139 ,	 1590062 ,	 1595016 ,	 1600000 ,	
+ 1605016 ,	 1610063 ,	 1615142 ,	 1620253 ,	 1625397 ,	 1630573 ,	 1635783 ,	 1641026 ,	 1646302 ,	 1651613 ,	 1656958 ,	 1662338 ,	 1667752 ,	 1673203 ,	 1678689 ,	 1684211 ,	
+ 1689769 ,	 1695364 ,	 1700997 ,	 1706667 ,	 1712375 ,	 1718121 ,	 1723906 ,	 1729730 ,	 1735593 ,	 1741497 ,	 1747440 ,	 1753425 ,	 1759450 ,	 1765517 ,	 1771626 ,	 1777778 ,	
+ 1783972 ,	 1790210 ,	 1796491 ,	 1802817 ,	 1809187 ,	 1815603 ,	 1822064 ,	 1828571 ,	 1835125 ,	 1841727 ,	 1848375 ,	 1855072 ,	 1861818 ,	 1868613 ,	 1875458 ,	 1882353 ,	
+ 1889299 ,	 1896296 ,	 1903346 ,	 1910448 ,	 1917603 ,	 1924812 ,	 1932075 ,	 1939394 ,	 1946768 ,	 1954198 ,	 1961686 ,	 1969231 ,	 1976834 ,	 1984496 ,	 1992218 ,	 2000000 ,	
+ 2003914 ,	 2007843 ,	 2011788 ,	 2015748 ,	 2019724 ,	 2023715 ,	 2027723 ,	 2031746 ,	 2035785 ,	 2039841 ,	 2043912 ,	 2048000 ,	 2052104 ,	 2056225 ,	 2060362 ,	 2064516 ,	
+ 2068687 ,	 2072874 ,	 2077079 ,	 2081301 ,	 2085540 ,	 2089796 ,	 2094070 ,	 2098361 ,	 2102669 ,	 2106996 ,	 2111340 ,	 2115702 ,	 2120083 ,	 2124481 ,	 2128898 ,	 2133333 ,	
+ 2137787 ,	 2142259 ,	 2146751 ,	 2151261 ,	 2155789 ,	 2160338 ,	 2164905 ,	 2169492 ,	 2174098 ,	 2178723 ,	 2183369 ,	 2188034 ,	 2192719 ,	 2197425 ,	 2202151 ,	 2206897 ,	
+ 2211663 ,	 2216450 ,	 2221258 ,	 2226087 ,	 2230937 ,	 2235808 ,	 2240700 ,	 2245614 ,	 2250549 ,	 2255507 ,	 2260486 ,	 2265487 ,	 2270510 ,	 2275556 ,	 2280624 ,	 2285714 ,	
+ 2290828 ,	 2295964 ,	 2301124 ,	 2306306 ,	 2311512 ,	 2316742 ,	 2321995 ,	 2327273 ,	 2332574 ,	 2337900 ,	 2343249 ,	 2348624 ,	 2354023 ,	 2359447 ,	 2364896 ,	 2370370 ,	
+ 2375870 ,	 2381395 ,	 2386946 ,	 2392523 ,	 2398126 ,	 2403756 ,	 2409412 ,	 2415094 ,	 2420804 ,	 2426540 ,	 2432304 ,	 2438095 ,	 2443914 ,	 2449761 ,	 2455635 ,	 2461538 ,	
+ 2467470 ,	 2473430 ,	 2479419 ,	 2485437 ,	 2491484 ,	 2497561 ,	 2503667 ,	 2509804 ,	 2515971 ,	 2522167 ,	 2528395 ,	 2534653 ,	 2540943 ,	 2547264 ,	 2553616 ,	 2560000 ,	
+ 2566416 ,	 2572864 ,	 2579345 ,	 2585859 ,	 2592405 ,	 2598985 ,	 2605598 ,	 2612245 ,	 2618926 ,	 2625641 ,	 2632391 ,	 2639175 ,	 2645995 ,	 2652850 ,	 2659740 ,	 2666667 ,	
+ 2673629 ,	 2680628 ,	 2687664 ,	 2694737 ,	 2701847 ,	 2708995 ,	 2716180 ,	 2723404 ,	 2730667 ,	 2737968 ,	 2745308 ,	 2752688 ,	 2760108 ,	 2767568 ,	 2775068 ,	 2782609 ,	
+ 2790191 ,	 2797814 ,	 2805479 ,	 2813187 ,	 2820937 ,	 2828729 ,	 2836565 ,	 2844444 ,	 2852368 ,	 2860335 ,	 2868347 ,	 2876404 ,	 2884507 ,	 2892655 ,	 2900850 ,	 2909091 ,	
+ 2917379 ,	 2925714 ,	 2934097 ,	 2942529 ,	 2951009 ,	 2959538 ,	 2968116 ,	 2976744 ,	 2985423 ,	 2994152 ,	 3002933 ,	 3011765 ,	 3020649 ,	 3029586 ,	 3038576 ,	 3047619 ,	
+ 3056716 ,	 3065868 ,	 3075075 ,	 3084337 ,	 3093656 ,	 3103030 ,	 3112462 ,	 3121951 ,	 3131498 ,	 3141104 ,	 3150769 ,	 3160494 ,	 3170279 ,	 3180124 ,	 3190031 ,	 3200000 ,	
+ 3210031 ,	 3220126 ,	 3230284 ,	 3240506 ,	 3250794 ,	 3261146 ,	 3271565 ,	 3282051 ,	 3292605 ,	 3303226 ,	 3313916 ,	 3324675 ,	 3335505 ,	 3346405 ,	 3357377 ,	 3368421 ,	
+ 3379538 ,	 3390728 ,	 3401993 ,	 3413333 ,	 3424749 ,	 3436242 ,	 3447811 ,	 3459459 ,	 3471186 ,	 3482993 ,	 3494881 ,	 3506849 ,	 3518900 ,	 3531034 ,	 3543253 ,	 3555556 ,	
+ 3567944 ,	 3580420 ,	 3592982 ,	 3605634 ,	 3618375 ,	 3631206 ,	 3644128 ,	 3657143 ,	 3670251 ,	 3683453 ,	 3696751 ,	 3710145 ,	 3723636 ,	 3737226 ,	 3750916 ,	 3764706 ,	
+ 3778598 ,	 3792593 ,	 3806691 ,	 3820896 ,	 3835206 ,	 3849624 ,	 3864151 ,	 3878788 ,	 3893536 ,	 3908397 ,	 3923372 ,	 3938462 ,	 3953668 ,	 3968992 ,	 3984436 ,	 4000000 ,	
+ 4007828 ,	 4015686 ,	 4023576 ,	 4031496 ,	 4039448 ,	 4047431 ,	 4055446 ,	 4063492 ,	 4071571 ,	 4079681 ,	 4087824 ,	 4096000 ,	 4104208 ,	 4112450 ,	 4120724 ,	 4129032 ,	
+ 4137374 ,	 4145749 ,	 4154158 ,	 4162602 ,	 4171079 ,	 4179592 ,	 4188139 ,	 4196721 ,	 4205339 ,	 4213992 ,	 4222680 ,	 4231405 ,	 4240166 ,	 4248963 ,	 4257796 ,	 4266667 ,	
+ 4275574 ,	 4284519 ,	 4293501 ,	 4302521 ,	 4311579 ,	 4320675 ,	 4329810 ,	 4338983 ,	 4348195 ,	 4357447 ,	 4366738 ,	 4376068 ,	 4385439 ,	 4394850 ,	 4404301 ,	 4413793 ,	
+ 4423326 ,	 4432900 ,	 4442516 ,	 4452174 ,	 4461874 ,	 4471616 ,	 4481400 ,	 4491228 ,	 4501099 ,	 4511013 ,	 4520971 ,	 4530973 ,	 4541020 ,	 4551111 ,	 4561247 ,	 4571429 ,	
+ 4581655 ,	 4591928 ,	 4602247 ,	 4612613 ,	 4623025 ,	 4633484 ,	 4643991 ,	 4654545 ,	 4665148 ,	 4675799 ,	 4686499 ,	 4697248 ,	 4708046 ,	 4718894 ,	 4729792 ,	 4740741 ,	
+ 4751740 ,	 4762791 ,	 4773893 ,	 4785047 ,	 4796253 ,	 4807512 ,	 4818824 ,	 4830189 ,	 4841608 ,	 4853081 ,	 4864608 ,	 4876190 ,	 4887828 ,	 4899522 ,	 4911271 ,	 4923077 ,	
+ 4934940 ,	 4946860 ,	 4958838 ,	 4970874 ,	 4982968 ,	 4995122 ,	 5007335 ,	 5019608 ,	 5031941 ,	 5044335 ,	 5056790 ,	 5069307 ,	 5081886 ,	 5094527 ,	 5107232 ,	 5120000 ,	
+ 5132832 ,	 5145729 ,	 5158690 ,	 5171717 ,	 5184810 ,	 5197970 ,	 5211196 ,	 5224490 ,	 5237852 ,	 5251282 ,	 5264781 ,	 5278351 ,	 5291990 ,	 5305699 ,	 5319481 ,	 5333333 ,	
+ 5347258 ,	 5361257 ,	 5375328 ,	 5389474 ,	 5403694 ,	 5417989 ,	 5432361 ,	 5446809 ,	 5461333 ,	 5475936 ,	 5490617 ,	 5505376 ,	 5520216 ,	 5535135 ,	 5550136 ,	 5565217 ,	
+ 5580381 ,	 5595628 ,	 5610959 ,	 5626374 ,	 5641873 ,	 5657459 ,	 5673130 ,	 5688889 ,	 5704735 ,	 5720670 ,	 5736695 ,	 5752809 ,	 5769014 ,	 5785311 ,	 5801700 ,	 5818182 ,	
+ 5834758 ,	 5851429 ,	 5868195 ,	 5885057 ,	 5902017 ,	 5919075 ,	 5936232 ,	 5953488 ,	 5970845 ,	 5988304 ,	 6005865 ,	 6023529 ,	 6041298 ,	 6059172 ,	 6077151 ,	 6095238 ,	
+ 6113433 ,	 6131737 ,	 6150150 ,	 6168675 ,	 6187311 ,	 6206061 ,	 6224924 ,	 6243902 ,	 6262997 ,	 6282209 ,	 6301538 ,	 6320988 ,	 6340557 ,	 6360248 ,	 6380062 ,	 6400000 ,	
+ 6420063 ,	 6440252 ,	 6460568 ,	 6481013 ,	 6501587 ,	 6522293 ,	 6543131 ,	 6564103 ,	 6585209 ,	 6606452 ,	 6627832 ,	 6649351 ,	 6671010 ,	 6692810 ,	 6714754 ,	 6736842 ,	
+ 6759076 ,	 6781457 ,	 6803987 ,	 6826667 ,	 6849498 ,	 6872483 ,	 6895623 ,	 6918919 ,	 6942373 ,	 6965986 ,	 6989761 ,	 7013699 ,	 7037801 ,	 7062069 ,	 7086505 ,	 7111111 ,	
+ 7135889 ,	 7160839 ,	 7185965 ,	 7211268 ,	 7236749 ,	 7262411 ,	 7288256 ,	 7314286 ,	 7340502 ,	 7366906 ,	 7393502 ,	 7420290 ,	 7447273 ,	 7474453 ,	 7501832 ,	 7529412 ,	
+ 7557196 ,	 7585185 ,	 7613383 ,	 7641791 ,	 7670412 ,	 7699248 ,	 7728302 ,	 7757576 ,	 7787072 ,	 7816794 ,	 7846743 ,	 7876923 ,	 7907336 ,	 7937984 ,	 7968872 ,	 8000000 ,	
+ 8015656 ,	 8031373 ,	 8047151 ,	 8062992 ,	 8078895 ,	 8094862 ,	 8110891 ,	 8126984 ,	 8143141 ,	 8159363 ,	 8175649 ,	 8192000 ,	 8208417 ,	 8224900 ,	 8241449 ,	 8258065 ,	
+ 8274747 ,	 8291498 ,	 8308316 ,	 8325203 ,	 8342159 ,	 8359184 ,	 8376278 ,	 8393443 ,	 8410678 ,	 8427984 ,	 8445361 ,	 8462810 ,	 8480331 ,	 8497925 ,	 8515593 ,	 8533333 ,	
+ 8551148 ,	 8569038 ,	 8587002 ,	 8605042 ,	 8623158 ,	 8641350 ,	 8659619 ,	 8677966 ,	 8696391 ,	 8714894 ,	 8733475 ,	 8752137 ,	 8770878 ,	 8789700 ,	 8808602 ,	 8827586 ,	
+ 8846652 ,	 8865801 ,	 8885033 ,	 8904348 ,	 8923747 ,	 8943231 ,	 8962801 ,	 8982456 ,	 9002198 ,	 9022026 ,	 9041943 ,	 9061947 ,	 9082040 ,	 9102222 ,	 9122494 ,	 9142857 ,	
+ 9163311 ,	 9183857 ,	 9204494 ,	 9225225 ,	 9246050 ,	 9266968 ,	 9287982 ,	 9309091 ,	 9330296 ,	 9351598 ,	 9372998 ,	 9394495 ,	 9416092 ,	 9437788 ,	 9459584 ,	 9481481 ,	
+ 9503480 ,	 9525581 ,	 9547786 ,	 9570093 ,	 9592506 ,	 9615023 ,	 9637647 ,	 9660377 ,	 9683215 ,	 9706161 ,	 9729216 ,	 9752381 ,	 9775656 ,	 9799043 ,	 9822542 ,	 9846154 ,	
+ 9869880 ,	 9893720 ,	 9917676 ,	 9941748 ,	 9965937 ,	 9990244 ,	 10014670 ,	 10039216 ,	 10063882 ,	 10088670 ,	 10113580 ,	 10138614 ,	 10163772 ,	 10189055 ,	 10214464 ,	 10240000 ,	
+ 10265664 ,	 10291457 ,	 10317380 ,	 10343434 ,	 10369620 ,	 10395939 ,	 10422392 ,	 10448980 ,	 10475703 ,	 10502564 ,	 10529563 ,	 10556701 ,	 10583979 ,	 10611399 ,	 10638961 ,	 10666667 ,	
+ 10694517 ,	 10722513 ,	 10750656 ,	 10778947 ,	 10807388 ,	 10835979 ,	 10864721 ,	 10893617 ,	 10922667 ,	 10951872 ,	 10981233 ,	 11010753 ,	 11040431 ,	 11070270 ,	 11100271 ,	 11130435 ,	
+ 11160763 ,	 11191257 ,	 11221918 ,	 11252747 ,	 11283747 ,	 11314917 ,	 11346260 ,	 11377778 ,	 11409471 ,	 11441341 ,	 11473389 ,	 11505618 ,	 11538028 ,	 11570621 ,	 11603399 ,	 11636364 ,	
+ 11669516 ,	 11702857 ,	 11736390 ,	 11770115 ,	 11804035 ,	 11838150 ,	 11872464 ,	 11906977 ,	 11941691 ,	 11976608 ,	 12011730 ,	 12047059 ,	 12082596 ,	 12118343 ,	 12154303 ,	 12190476 ,	
+ 12226866 ,	 12263473 ,	 12300300 ,	 12337349 ,	 12374622 ,	 12412121 ,	 12449848 ,	 12487805 ,	 12525994 ,	 12564417 ,	 12603077 ,	 12641975 ,	 12681115 ,	 12720497 ,	 12760125 ,	 12800000 ,	
+ 12840125 ,	 12880503 ,	 12921136 ,	 12962025 ,	 13003175 ,	 13044586 ,	 13086262 ,	 13128205 ,	 13170418 ,	 13212903 ,	 13255663 ,	 13298701 ,	 13342020 ,	 13385621 ,	 13429508 ,	 13473684 ,	
+ 13518152 ,	 13562914 ,	 13607973 ,	 13653333 ,	 13698997 ,	 13744966 ,	 13791246 ,	 13837838 ,	 13884746 ,	 13931973 ,	 13979522 ,	 14027397 ,	 14075601 ,	 14124138 ,	 14173010 ,	 14222222 ,	
+ 14271777 ,	 14321678 ,	 14371930 ,	 14422535 ,	 14473498 ,	 14524823 ,	 14576512 ,	 14628571 ,	 14681004 ,	 14733813 ,	 14787004 ,	 14840580 ,	 14894545 ,	 14948905 ,	 15003663 ,	 15058824 ,	
+ 15114391 ,	 15170370 ,	 15226766 ,	 15283582 ,	 15340824 ,	 15398496 ,	 15456604 ,	 15515152 ,	 15574144 ,	 15633588 ,	 15693487 ,	 15753846 ,	 15814672 ,	 15875969 ,	 15937743 ,	 16000000 ,	
+ 16031311 ,	 16062745 ,	 16094303 ,	 16125984 ,	 16157791 ,	 16189723 ,	 16221782 ,	 16253968 ,	 16286282 ,	 16318725 ,	 16351297 ,	 16384000 ,	 16416834 ,	 16449799 ,	 16482897 ,	 16516129 ,	
+ 16549495 ,	 16582996 ,	 16616633 ,	 16650407 ,	 16684318 ,	 16718367 ,	 16752556 ,	 16786885 ,	 16821355 ,	 16855967 ,	 16890722 ,	 16925620 ,	 16960663 ,	 16995851 ,	 17031185 ,	 17066667 ,	
+ 17102296 ,	 17138075 ,	 17174004 ,	 17210084 ,	 17246316 ,	 17282700 ,	 17319239 ,	 17355932 ,	 17392781 ,	 17429787 ,	 17466951 ,	 17504274 ,	 17541756 ,	 17579399 ,	 17617204 ,	 17655172 ,	
+ 17693305 ,	 17731602 ,	 17770065 ,	 17808696 ,	 17847495 ,	 17886463 ,	 17925602 ,	 17964912 ,	 18004396 ,	 18044053 ,	 18083885 ,	 18123894 ,	 18164080 ,	 18204444 ,	 18244989 ,	 18285714 ,	
+ 18326622 ,	 18367713 ,	 18408989 ,	 18450450 ,	 18492099 ,	 18533937 ,	 18575964 ,	 18618182 ,	 18660592 ,	 18703196 ,	 18745995 ,	 18788991 ,	 18832184 ,	 18875576 ,	 18919169 ,	 18962963 ,	
+ 19006961 ,	 19051163 ,	 19095571 ,	 19140187 ,	 19185012 ,	 19230047 ,	 19275294 ,	 19320755 ,	 19366430 ,	 19412322 ,	 19458432 ,	 19504762 ,	 19551313 ,	 19598086 ,	 19645084 ,	 19692308 ,	
+ 19739759 ,	 19787440 ,	 19835351 ,	 19883495 ,	 19931873 ,	 19980488 ,	 20029340 ,	 20078431 ,	 20127764 ,	 20177340 ,	 20227160 ,	 20277228 ,	 20327543 ,	 20378109 ,	 20428928 ,	 20480000 ,	
+ 20531328 ,	 20582915 ,	 20634761 ,	 20686869 ,	 20739241 ,	 20791878 ,	 20844784 ,	 20897959 ,	 20951407 ,	 21005128 ,	 21059126 ,	 21113402 ,	 21167959 ,	 21222798 ,	 21277922 ,	 21333333 ,	
+ 21389034 ,	 21445026 ,	 21501312 ,	 21557895 ,	 21614776 ,	 21671958 ,	 21729443 ,	 21787234 ,	 21845333 ,	 21903743 ,	 21962466 ,	 22021505 ,	 22080863 ,	 22140541 ,	 22200542 ,	 22260870 ,	
+ 22321526 ,	 22382514 ,	 22443836 ,	 22505495 ,	 22567493 ,	 22629834 ,	 22692521 ,	 22755556 ,	 22818942 ,	 22882682 ,	 22946779 ,	 23011236 ,	 23076056 ,	 23141243 ,	 23206799 ,	 23272727 ,	
+ 23339031 ,	 23405714 ,	 23472779 ,	 23540230 ,	 23608069 ,	 23676301 ,	 23744928 ,	 23813953 ,	 23883382 ,	 23953216 ,	 24023460 ,	 24094118 ,	 24165192 ,	 24236686 ,	 24308605 ,	 24380952 ,	
+ 24453731 ,	 24526946 ,	 24600601 ,	 24674699 ,	 24749245 ,	 24824242 ,	 24899696 ,	 24975610 ,	 25051988 ,	 25128834 ,	 25206154 ,	 25283951 ,	 25362229 ,	 25440994 ,	 25520249 ,	 25600000 ,	
+ 25680251 ,	 25761006 ,	 25842271 ,	 25924051 ,	 26006349 ,	 26089172 ,	 26172524 ,	 26256410 ,	 26340836 ,	 26425806 ,	 26511327 ,	 26597403 ,	 26684039 ,	 26771242 ,	 26859016 ,	 26947368 ,	
+ 27036304 ,	 27125828 ,	 27215947 ,	 27306667 ,	 27397993 ,	 27489933 ,	 27582492 ,	 27675676 ,	 27769492 ,	 27863946 ,	 27959044 ,	 28054795 ,	 28151203 ,	 28248276 ,	 28346021 ,	 28444444 ,	
+ 28543554 ,	 28643357 ,	 28743860 ,	 28845070 ,	 28946996 ,	 29049645 ,	 29153025 ,	 29257143 ,	 29362007 ,	 29467626 ,	 29574007 ,	 29681159 ,	 29789091 ,	 29897810 ,	 30007326 ,	 30117647 ,	
+ 30228782 ,	 30340741 ,	 30453532 ,	 30567164 ,	 30681648 ,	 30796992 ,	 30913208 ,	 31030303 ,	 31148289 ,	 31267176 ,	 31386973 ,	 31507692 ,	 31629344 ,	 31751938 ,	 31875486 ,	 32000000 ,	
+ 32062622 ,	 32125490 ,	 32188605 ,	 32251969 ,	 32315582 ,	 32379447 ,	 32443564 ,	 32507937 ,	 32572565 ,	 32637450 ,	 32702595 ,	 32768000 ,	 32833667 ,	 32899598 ,	 32965795 ,	 33032258 ,	
+ 33098990 ,	 33165992 ,	 33233266 ,	 33300813 ,	 33368635 ,	 33436735 ,	 33505112 ,	 33573770 ,	 33642710 ,	 33711934 ,	 33781443 ,	 33851240 ,	 33921325 ,	 33991701 ,	 34062370 ,	 34133333 ,	
+ 34204593 ,	 34276151 ,	 34348008 ,	 34420168 ,	 34492632 ,	 34565401 ,	 34638478 ,	 34711864 ,	 34785563 ,	 34859574 ,	 34933902 ,	 35008547 ,	 35083512 ,	 35158798 ,	 35234409 ,	 35310345 ,	
+ 35386609 ,	 35463203 ,	 35540130 ,	 35617391 ,	 35694989 ,	 35772926 ,	 35851204 ,	 35929825 ,	 36008791 ,	 36088106 ,	 36167770 ,	 36247788 ,	 36328160 ,	 36408889 ,	 36489978 ,	 36571429 ,	
+ 36653244 ,	 36735426 ,	 36817978 ,	 36900901 ,	 36984199 ,	 37067873 ,	 37151927 ,	 37236364 ,	 37321185 ,	 37406393 ,	 37491991 ,	 37577982 ,	 37664368 ,	 37751152 ,	 37838337 ,	 37925926 ,	
+ 38013921 ,	 38102326 ,	 38191142 ,	 38280374 ,	 38370023 ,	 38460094 ,	 38550588 ,	 38641509 ,	 38732861 ,	 38824645 ,	 38916865 ,	 39009524 ,	 39102625 ,	 39196172 ,	 39290168 ,	 39384615 ,	
+ 39479518 ,	 39574879 ,	 39670702 ,	 39766990 ,	 39863747 ,	 39960976 ,	 40058680 ,	 40156863 ,	 40255528 ,	 40354680 ,	 40454321 ,	 40554455 ,	 40655087 ,	 40756219 ,	 40857855 ,	 40960000 ,	
+ 41062657 ,	 41165829 ,	 41269521 ,	 41373737 ,	 41478481 ,	 41583756 ,	 41689567 ,	 41795918 ,	 41902813 ,	 42010256 ,	 42118252 ,	 42226804 ,	 42335917 ,	 42445596 ,	 42555844 ,	 42666667 ,	
+ 42778068 ,	 42890052 ,	 43002625 ,	 43115789 ,	 43229551 ,	 43343915 ,	 43458886 ,	 43574468 ,	 43690667 ,	 43807487 ,	 43924933 ,	 44043011 ,	 44161725 ,	 44281081 ,	 44401084 ,	 44521739 ,	
+ 44643052 ,	 44765027 ,	 44887671 ,	 45010989 ,	 45134986 ,	 45259669 ,	 45385042 ,	 45511111 ,	 45637883 ,	 45765363 ,	 45893557 ,	 46022472 ,	 46152113 ,	 46282486 ,	 46413598 ,	 46545455 ,	
+ 46678063 ,	 46811429 ,	 46945559 ,	 47080460 ,	 47216138 ,	 47352601 ,	 47489855 ,	 47627907 ,	 47766764 ,	 47906433 ,	 48046921 ,	 48188235 ,	 48330383 ,	 48473373 ,	 48617211 ,	 48761905 ,	
+ 48907463 ,	 49053892 ,	 49201201 ,	 49349398 ,	 49498489 ,	 49648485 ,	 49799392 ,	 49951220 ,	 50103976 ,	 50257669 ,	 50412308 ,	 50567901 ,	 50724458 ,	 50881988 ,	 51040498 ,	 51200000 ,	
+ 51360502 ,	 51522013 ,	 51684543 ,	 51848101 ,	 52012698 ,	 52178344 ,	 52345048 ,	 52512821 ,	 52681672 ,	 52851613 ,	 53022654 ,	 53194805 ,	 53368078 ,	 53542484 ,	 53718033 ,	 53894737 ,	
+ 54072607 ,	 54251656 ,	 54431894 ,	 54613333 ,	 54795987 ,	 54979866 ,	 55164983 ,	 55351351 ,	 55538983 ,	 55727891 ,	 55918089 ,	 56109589 ,	 56302405 ,	 56496552 ,	 56692042 ,	 56888889 ,	
+ 57087108 ,	 57286713 ,	 57487719 ,	 57690141 ,	 57893993 ,	 58099291 ,	 58306050 ,	 58514286 ,	 58724014 ,	 58935252 ,	 59148014 ,	 59362319 ,	 59578182 ,	 59795620 ,	 60014652 ,	 60235294 ,	
+ 60457565 ,	 60681481 ,	 60907063 ,	 61134328 ,	 61363296 ,	 61593985 ,	 61826415 ,	 62060606 ,	 62296578 ,	 62534351 ,	 62773946 ,	 63015385 ,	 63258687 ,	 63503876 ,	 63750973 ,	 64000000 
diff --git a/src/sound/saasound/SAAFreq.h b/src/sound/saasound/SAAFreq.h
new file mode 100755
index 000000000..478754621
--- /dev/null
+++ b/src/sound/saasound/SAAFreq.h
@@ -0,0 +1,72 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// SAAFreq.h: interface for the CSAAFreq class.
+// Note about Samplerates: 0=44100, 1=22050; 2=11025
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef SAAFREQ_H_INCLUDE
+#define SAAFREQ_H_INCLUDE
+
+#include "defns.h"
+
+class CSAAFreq  
+{
+private:
+#ifdef SAAFREQ_FIXED_CLOCKRATE
+	// 'load in' the data for the static frequency lookup table
+	// precomputed for a fixed clockrate
+	// See: tools/freqdat.py
+	const static unsigned long m_FreqTable[2048];
+#else
+	// we'll calculate the frequency lookup table at runtime.
+	static unsigned long m_FreqTable[2048];
+	static unsigned long m_nClockRate;
+#endif
+
+	unsigned long m_nCounter;
+	unsigned long m_nAdd;
+	unsigned long m_nCounter_low;
+	unsigned int m_nOversample;
+	unsigned long m_nCounterLimit_low;
+	int m_nLevel;
+
+	int m_nCurrentOffset;
+	int m_nCurrentOctave;
+	int m_nNextOffset;
+	int m_nNextOctave;
+	bool m_bIgnoreOffsetData;
+	bool m_bNewData;
+	bool m_bSync;
+
+	unsigned long m_nSampleRate;
+	CSAANoise * const m_pcConnectedNoiseGenerator;
+	CSAAEnv * const m_pcConnectedEnvGenerator;
+	const int m_nConnectedMode; // 0 = nothing; 1 = envgenerator; 2 = noisegenerator
+
+	void UpdateOctaveOffsetData(void);
+	void SetAdd(void);
+
+public:
+	CSAAFreq(CSAANoise * const pcNoiseGenerator, CSAAEnv * const pcEnvGenerator);
+	~CSAAFreq();
+	void SetFreqOffset(BYTE nOffset);
+	void SetFreqOctave(BYTE nOctave);
+	void _SetSampleRate(unsigned int nSampleRate);
+	void _SetOversample(unsigned int oversample);
+	void _SetClockRate(int nClockRate);
+	void Sync(bool bSync);
+	int Tick(void);
+	int Level(void) const;
+
+};
+
+inline int CSAAFreq::Level(void) const
+{
+	if (m_bSync)
+		return 1;
+
+	return m_nLevel;
+}
+
+#endif	// SAAFREQ_H_INCLUDE
diff --git a/src/sound/saasound/SAAImpl.cpp b/src/sound/saasound/SAAImpl.cpp
new file mode 100644
index 000000000..8545d3849
--- /dev/null
+++ b/src/sound/saasound/SAAImpl.cpp
@@ -0,0 +1,487 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// SAAImpl.cpp: implementation of the CSAASound class.
+// the bones of the 'virtual SAA-1099' emulation
+//
+// the actual sound generation is carried out in the other classes;
+// this class provides the output stage and the external interface only
+//
+//////////////////////////////////////////////////////////////////////
+
+#include "SAASound.h"
+
+#include "types.h"
+#include "SAAImpl.h"
+#include "defns.h"
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+CSAASoundInternal::CSAASoundInternal()
+	:
+m_nClockRate(EXTERNAL_CLK_HZ),
+m_bHighpass(false),
+m_nSampleRate(SAMPLE_RATE_HZ),
+m_nOversample(DEFAULT_OVERSAMPLE),
+m_uParam(0),
+m_uParamRate(0),
+#if defined(DEBUGSAA) || defined(USE_CONFIG_FILE)
+m_nDebugSample(0),
+#endif
+m_chip()
+{
+#ifdef USE_CONFIG_FILE
+	m_Config.ReadConfig();
+#endif
+
+#if defined(DEBUGSAA)
+	m_dbgfile.open(_T(DEBUG_SAA_REGISTER_LOG), std::ios_base::out);
+	m_pcmfile.open(_T(DEBUG_SAA_PCM_LOG), std::ios_base::out | std::ios_base::binary);
+#elif defined(USE_CONFIG_FILE)
+	if (m_Config.m_bGenerateRegisterLogs)
+		m_dbgfile.open(m_Config.m_strRegisterLogPath, std::ios_base::out);
+	if (m_Config.m_bGeneratePcmLogs)
+		m_pcmfile.open(m_Config.m_strPcmOutputPath, std::ios_base::out | std::ios_base::binary);
+
+	if (m_Config.m_bGeneratePcmLogs && m_Config.m_bGeneratePcmSeparateChannels)
+	{
+		for (int i = 0; i < 6; i++)
+		{
+			m_channel_pcmfile[i].open(m_Config.getChannelPcmOutputPath(i), std::ios_base::out | std::ios_base::binary);
+		}
+	}
+
+
+#endif
+	// set parameters
+	// TODO support defaults and overrides from config file
+	// m_chip.SetSoundParameters(SAAP_FILTER | SAAP_11025 | SAAP_8BIT | SAAP_MONO);
+	// reset the virtual SAA
+	// m_chip.Clear();
+
+	m_chip._SetClockRate(m_nClockRate);
+	m_chip._SetOversample(m_nOversample);
+}
+
+CSAASoundInternal::~CSAASoundInternal()
+{
+	//
+}
+
+//////////////////////////////////////////////////////////////////////
+// CSAASound members
+//////////////////////////////////////////////////////////////////////
+
+void CSAASoundInternal::SetClockRate(unsigned int nClockRate)
+{
+	m_nClockRate = nClockRate;
+	m_chip._SetClockRate(m_nClockRate);
+}
+
+void CSAASoundInternal::Clear(void)
+{
+	// reinitialises virtual SAA:
+	// sets reg 28 to 0x02; - sync and disabled
+	// sets regs 00-31 (except 28) to 0x00;
+	// sets reg 28 to 0x00;
+	// sets current reg to 0
+	WriteAddressData(28,2);
+	for (int i=31; i>=0; i--)
+	{
+		if (i!=28) WriteAddressData(i,0);
+	}
+	WriteAddressData(28,0);
+	WriteAddress(0);
+}
+
+void CSAASoundInternal::WriteData(BYTE nData)
+{
+	// originated from an OUT 255,d call
+	m_chip._WriteData(nData);
+#if defined(DEBUGSAA) || defined(USE_CONFIG_FILE)
+#ifdef USE_CONFIG_FILE
+	if (m_Config.m_bGenerateRegisterLogs)
+	{
+#endif
+		m_dbgfile << m_nDebugSample << " " << (int)m_chip._ReadAddress() << ":" << (int)nData << std::endl;
+#ifdef USE_CONFIG_FILE
+	}
+#endif
+#endif
+}
+
+void CSAASoundInternal::WriteAddress(BYTE nReg)
+{
+	// originated from an OUT 511,r call
+	m_chip._WriteAddress(nReg);
+#if defined(DEBUGSAA) || defined(USE_CONFIG_FILE)
+#ifdef USE_CONFIG_FILE
+	if (m_Config.m_bGenerateRegisterLogs)
+	{
+#endif
+		m_dbgfile << m_nDebugSample << " " << (int)nReg << ":";
+		if (nReg==24)
+		{
+			m_dbgfile << "<!ENVO!>";
+		}
+		else if (nReg==25)
+		{
+			m_dbgfile << "<!ENV1!>";
+		}
+		m_dbgfile << std::endl;
+#ifdef USE_CONFIG_FILE
+	}
+#endif
+#endif
+}
+
+void CSAASoundInternal::WriteAddressData(BYTE nReg, BYTE nData)
+{
+	// performs WriteAddress(nReg) followed by WriteData(nData)
+	m_chip._WriteAddress(nReg);
+	m_chip._WriteData(nData);
+}
+
+#if 1
+BYTE CSAASoundInternal::ReadAddress(void)
+{
+	// Not a real hardware function of the SAA-1099, which is write-only
+	return(m_chip._ReadAddress());
+}
+#else
+BYTE CSAASoundInternal::ReadAddress(void)
+{
+	// Not a real hardware function of the SAA-1099, which is write-only
+	return(0);
+}
+#endif
+
+void CSAASoundInternal::SetSoundParameters(SAAPARAM uParam)
+{
+	// set samplerate properties from uParam (deprecated but still supported)
+	unsigned int nSampleRate = m_nSampleRate;
+	switch (uParam & SAAP_MASK_SAMPLERATE)
+	{
+	case SAAP_44100:
+		nSampleRate = 44100;
+		m_uParamRate = (m_uParamRate & ~SAAP_MASK_SAMPLERATE) | SAAP_44100;
+		break;
+	case SAAP_22050:
+		nSampleRate = 22050;
+		m_uParamRate = (m_uParamRate & ~SAAP_MASK_SAMPLERATE) | SAAP_22050;
+		break;
+	case SAAP_11025:
+		nSampleRate = 11025;
+		m_uParamRate = (m_uParamRate & ~SAAP_MASK_SAMPLERATE) | SAAP_11025;
+		break;
+	case 0:// change nothing!
+	default:
+		break;
+	}
+	
+	if (nSampleRate != m_nSampleRate)
+	{
+		m_nSampleRate = nSampleRate;
+		m_chip._SetSampleRate(m_nSampleRate);
+	}
+
+	// set filter properties from uParam
+	m_uParam = (m_uParam & ~SAAP_MASK_FILTER) | (uParam & SAAP_MASK_FILTER);
+	 
+	m_bHighpass=true;
+}
+
+void CSAASoundInternal::SetSampleRate(unsigned int nSampleRate)
+{
+	if (nSampleRate != m_nSampleRate)
+	{
+		m_nSampleRate = nSampleRate;
+		m_chip._SetSampleRate(m_nSampleRate);
+	}
+}
+
+void CSAASoundInternal::SetOversample(unsigned int nOversample)
+{
+	if (nOversample != m_nOversample)
+	{
+		m_nOversample = nOversample;
+		m_chip._SetOversample(m_nOversample);
+	}
+}
+
+SAAPARAM CSAASoundInternal::GetCurrentSoundParameters(void)
+{
+	return m_uParam | m_uParamRate;
+}
+
+unsigned short CSAASoundInternal::GetCurrentBytesPerSample(void)
+{
+	// 16 bit stereo => 4 bytes per sample
+	return 4;
+}
+
+/*static*/ unsigned short CSAASound::GetBytesPerSample(SAAPARAM uParam)
+{
+	// 16 bit stereo => 4 bytes per sample
+	switch (uParam & (SAAP_MASK_CHANNELS | SAAP_MASK_BITDEPTH))
+	{
+		case SAAP_STEREO | SAAP_16BIT:
+			return 4;
+		default:
+			return 0;
+	}
+}
+
+unsigned long CSAASoundInternal::GetCurrentSampleRate(void)
+{
+	return CSAASound::GetSampleRate(m_uParamRate);
+}
+
+/*static*/ unsigned long CSAASound::GetSampleRate(SAAPARAM uParam) // static member function
+{
+	switch (uParam & SAAP_MASK_SAMPLERATE)
+	{
+		case SAAP_11025:
+			return 11025;
+		case SAAP_22050:
+			return 22050;
+		case SAAP_44100:
+			return 44100;
+		default:
+			return 0;
+	}
+}
+
+#if defined(USE_CONFIG_FILE) || (defined(DEFAULT_BOOST) && DEFAULT_BOOST>1)
+#define DO_BOOST
+#endif
+
+void scale_for_output(unsigned int left_input, unsigned int right_input,
+	double oversample_scalar, bool highpass, double boost,
+	double& filterout_z1_left, double& filterout_z1_right,
+	BYTE* &pBuffer)
+{
+	double float_left = (double)left_input;
+	double float_right = (double)right_input;
+	float_left /= oversample_scalar;
+	float_right /= oversample_scalar;
+
+	// scale output into good range
+	float_left *= DEFAULT_UNBOOSTED_MULTIPLIER;
+	float_right *= DEFAULT_UNBOOSTED_MULTIPLIER;
+
+	if (highpass)
+	{
+		/* cutoff = 5 Hz (say)
+			const double b1 = exp(-2.0 * M_PI * (Fc/Fs))
+			const double a0 = 1.0 - b1;
+		*/
+		const double b1 = 0.99928787;
+		const double a0 = 1.0 - b1;
+
+		filterout_z1_left = float_left * a0 + filterout_z1_left * b1;
+		filterout_z1_right = float_right * a0 + filterout_z1_right * b1;
+		float_left -= filterout_z1_left;
+		float_right -= filterout_z1_right;
+	}
+
+	// multiply by boost, if defined
+#if defined(DO_BOOST)
+	float_left *= boost;
+	float_right *= boost;
+#endif
+	// convert to 16-bit signed range with hard clipping
+	signed short left_output = (signed short)(float_left > 32767 ? 32767 : float_left < -32768 ? -32768 : float_left);
+	signed short right_output = (signed short)(float_right > 32767 ? 32767 : float_right < -32768 ? -32768 : float_right);
+
+	*pBuffer++ = left_output & 0x00ff;
+	*pBuffer++ = (left_output >> 8) & 0x00ff;
+	*pBuffer++ = right_output & 0x00ff;
+	*pBuffer++ = (right_output >> 8) & 0x00ff;
+}
+
+void CSAASoundInternal::GenerateMany(BYTE* pBuffer, unsigned long nSamples)
+{
+	unsigned int left_mixed, right_mixed;
+	static double filterout_z1_left_mixed = 0, filterout_z1_right_mixed = 0;
+
+#if defined(DEBUGSAA) || defined(USE_CONFIG_FILE)
+	BYTE* pBufferStart = pBuffer;
+	unsigned long nTotalSamples = nSamples;
+#endif
+
+#if defined(DO_BOOST)
+#if defined(USE_CONFIG_FILE)
+	double nBoost = m_Config.m_nBoost;
+#else
+	double nBoost = DEFAULT_BOOST;
+#endif
+#else
+	double nBoost = 1.0;
+#endif
+
+	double oversample = double(1 << m_nOversample);
+
+#if defined(USE_CONFIG_FILE)
+	static double filterout_z1_left_0 = 0, filterout_z1_right_0 = 0;
+	static double filterout_z1_left_1 = 0, filterout_z1_right_1 = 0;
+	static double filterout_z1_left_2 = 0, filterout_z1_right_2 = 0;
+	static double filterout_z1_left_3 = 0, filterout_z1_right_3 = 0;
+	static double filterout_z1_left_4 = 0, filterout_z1_right_4 = 0;
+	static double filterout_z1_left_5 = 0, filterout_z1_right_5 = 0;
+
+	if (m_Config.m_bGeneratePcmLogs && m_Config.m_bGeneratePcmSeparateChannels)
+	{
+		unsigned int left0, right0, left1, right1, left2, right2, left3, right3, left4, right4, left5, right5;
+		BYTE* pChannelBufferPtr[6] = { m_pChannelBuffer[0], m_pChannelBuffer[1], m_pChannelBuffer[2], m_pChannelBuffer[3], m_pChannelBuffer[4], m_pChannelBuffer[5] };
+
+		while (nSamples--)
+		{
+			m_chip._TickAndOutputSeparate(left_mixed, right_mixed,
+				left0, right0,
+				left1, right1,
+				left2, right2,
+				left3, right3,
+				left4, right4,
+				left5, right5);
+			scale_for_output(left_mixed, right_mixed, oversample, m_bHighpass, nBoost, filterout_z1_left_mixed, filterout_z1_right_mixed, pBuffer);
+
+			// and the separate channels
+			scale_for_output(left0, right0, oversample, m_bHighpass, nBoost, filterout_z1_left_0, filterout_z1_right_0, pChannelBufferPtr[0]);
+			scale_for_output(left1, right1, oversample, m_bHighpass, nBoost, filterout_z1_left_1, filterout_z1_right_1, pChannelBufferPtr[1]);
+			scale_for_output(left2, right2, oversample, m_bHighpass, nBoost, filterout_z1_left_2, filterout_z1_right_2, pChannelBufferPtr[2]);
+			scale_for_output(left3, right3, oversample, m_bHighpass, nBoost, filterout_z1_left_3, filterout_z1_right_3, pChannelBufferPtr[3]);
+			scale_for_output(left4, right4, oversample, m_bHighpass, nBoost, filterout_z1_left_4, filterout_z1_right_4, pChannelBufferPtr[4]);
+			scale_for_output(left5, right5, oversample, m_bHighpass, nBoost, filterout_z1_left_5, filterout_z1_right_5, pChannelBufferPtr[5]);
+
+			// flush channel output PCM buffers when full
+			if (pChannelBufferPtr[0] >= m_pChannelBuffer[0] + CHANNEL_BUFFER_SIZE)
+			{
+				for (int i = 0; i < 6; i++)
+				{
+					m_channel_pcmfile[i].write((const char*)m_pChannelBuffer[i], CHANNEL_BUFFER_SIZE);
+					pChannelBufferPtr[i] = m_pChannelBuffer[i];
+				}
+			}
+		}
+		// flush remaining channel PCM output data
+		if (pChannelBufferPtr[0] >= m_pChannelBuffer[0])
+		{
+			for (int i = 0; i < 6; i++)
+			{
+				m_channel_pcmfile[i].write((const char*)m_pChannelBuffer[i], pChannelBufferPtr[i]-m_pChannelBuffer[i]);
+			}
+		}
+	}
+	else
+	{
+#endif
+		while (nSamples--)
+		{
+			m_chip._TickAndOutputStereo(left_mixed, right_mixed);
+			scale_for_output(left_mixed, right_mixed, oversample, m_bHighpass, nBoost, filterout_z1_left_mixed, filterout_z1_right_mixed, pBuffer);
+		}
+
+#if defined(USE_CONFIG_FILE)
+	}
+#endif
+
+#if defined(DEBUGSAA) || defined(USE_CONFIG_FILE)
+#ifdef USE_CONFIG_FILE
+	if (m_Config.m_bGeneratePcmLogs)
+	{
+#endif
+		m_pcmfile.write((const char *)pBufferStart, nTotalSamples * (unsigned long)GetCurrentBytesPerSample());
+		m_nDebugSample += nTotalSamples;
+#ifdef USE_CONFIG_FILE
+	}
+#endif
+
+#endif
+}
+
+///////////////////////////////////////////////////////
+
+LPCSAASOUND SAAAPI CreateCSAASound(void)
+{
+	return (new CSAASoundInternal);
+}
+
+void SAAAPI DestroyCSAASound(LPCSAASOUND object)
+{
+	delete (object);
+}
+
+
+/* thoughts on lowpass filtering as part of oversampling.
+I tried this and really it didn't seem to make a lot of (audible) difference.
+
+// lowpass oversample filter adds complexity and not particularly audibly better than simple averaging.
+// use_lowpass_oversample_filter_average_output adds an additional averaging step to the output of the oversample
+// filter.  this seems critical, because without this, the raw output of the lowpass filter is full of aliases
+// If use_lowpass_oversample_filter is False, then the _average_output flag is ignored.
+// Default, use_lowpass_oversample_filter is False, it sounds just fine really.
+
+//#define USE_LOWPASS_OVERSAMPLE_FILTER
+#undef USE_LOWPASS_OVERSAMPLE_FILTER
+//#define USE_LOWPASS_OVERSAMPLE_FILTER_AVERAGE_OUTPUT
+#undef USE_LOWPASS_OVERSAMPLE_FILTER_AVERAGE_OUTPUT
+
+#ifdef USE_LOWPASS_OVERSAMPLE_FILTER
+static double oversample_lp_filterout_z1_left_stages[10] = { 0,0,0,0,0,0,0,0,0,0 };
+static double oversample_lp_filterout_z1_right_stages[10] = { 0,0,0,0,0,0,0,0,0,0 };
+double averaged_filterout_left = 0.0, averaged_filterout_right = 0.0;
+const int nStages = 10;
+for (int i = 0; i < 1 << m_nOversample; i++)
+{
+	Noise[0]->Tick();
+	Noise[1]->Tick();
+	f_left = f_right = 0;
+	for (int c = 0; c < 6; c++)
+	{
+		Amp[c]->TickAndOutputStereo(temp_left, temp_right);
+		f_left += (double)temp_left;
+		f_right += (double)temp_right;
+	}
+	// apply lowpass here.
+	// HACK: ASSUME m_nOversample is 64 (I was experimenting only using the 64x oversample anyway)
+	// therefore Fs = 44100*64
+	// let's set Fc = 10kHz
+	// so Fc/Fs = 0.00354308390022675736961451247166
+	// const double b1 = exp(-2.0 * M_PI * (Fc/Fs))
+	// const double a0 = 1.0 - b1;
+	// const double b1 = 0.9779841137335348363722276130195;
+	const double b1 = 0.977;
+	const double a0 = 1.0 - b1;
+
+	oversample_lp_filterout_z1_left_stages[0] = f_left * a0 + oversample_lp_filterout_z1_left_stages[0] * b1;
+	for (int stage = 1; stage < nStages; stage++)
+		oversample_lp_filterout_z1_left_stages[stage] = oversample_lp_filterout_z1_left_stages[stage - 1] * a0 + oversample_lp_filterout_z1_left_stages[stage] * b1;
+	oversample_lp_filterout_z1_right_stages[0] = f_right * a0 + oversample_lp_filterout_z1_right_stages[0] * b1;
+	for (int stage = 1; stage < nStages; stage++)
+		oversample_lp_filterout_z1_right_stages[stage] = oversample_lp_filterout_z1_right_stages[stage - 1] * a0 + oversample_lp_filterout_z1_right_stages[stage] * b1;
+
+#ifdef USE_LOWPASS_OVERSAMPLE_FILTER_AVERAGE_OUTPUT
+	averaged_filterout_left += oversample_lp_filterout_4z1_left;
+	averaged_filterout_right += oversample_lp_filterout_4z1_right;
+#endif
+}
+
+// by the end of this loop we will have computed the oversample lowpass filter m_nOversample times
+// and yielded exactly ONE sample output.
+#ifdef USE_LOWPASS_OVERSAMPLE_FILTER_AVERAGE_OUTPUT
+f_left = averaged_filterout_left / (1 << m_nOversample);
+f_right = averaged_filterout_right / (1 << m_nOversample);
+#else
+f_left = oversample_lp_filterout_z1_left_stages[nStages - 1];
+f_right = oversample_lp_filterout_z1_right_stages[nStages - 1];
+#endif
+
+#else
+	// do the simple 1/N averaging which is easier and sounds good enough
+
+#endif
+
+*/
+
diff --git a/src/sound/saasound/SAAImpl.h b/src/sound/saasound/SAAImpl.h
new file mode 100755
index 000000000..61fa79c58
--- /dev/null
+++ b/src/sound/saasound/SAAImpl.h
@@ -0,0 +1,75 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// This is the internal implementation (header file) of the SAASound object.
+// This is done so that the external interface to the object always stays the same
+// (SAASound.h) even though the internal object can change
+// .. Meaning future releases don't require relinking everyone elses code against
+//    the updated saasound stuff
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef SAAIMPL_H_INCLUDED
+#define SAAIMPL_H_INCLUDED
+
+#include "SAASound.h"
+#include "SAADevice.h"
+#ifdef USE_CONFIG_FILE
+#include "SAAConfig.h"
+#endif
+
+#if defined(DEBUGSAA) || defined(USE_CONFIG_FILE)
+#include <ios>
+#include <iostream>
+#include <fstream>
+
+#if defined(USE_CONFIG_FILE)
+const int CHANNEL_BUFFER_SIZE=1024;
+#endif
+#endif
+
+class CSAASoundInternal : public CSAASound
+{
+private:
+	CSAADevice m_chip;
+	int m_uParam, m_uParamRate;
+	unsigned int m_nClockRate; 
+	unsigned int m_nSampleRate;
+	unsigned int m_nOversample;
+	bool m_bHighpass;
+#ifdef USE_CONFIG_FILE
+	SAAConfig m_Config;
+#endif
+#if defined(DEBUGSAA) || defined(USE_CONFIG_FILE)
+	unsigned long m_nDebugSample;
+	std::ofstream m_dbgfile, m_pcmfile;
+#if defined(USE_CONFIG_FILE)
+	std::ofstream m_channel_pcmfile[6];
+	BYTE m_pChannelBuffer[6][CHANNEL_BUFFER_SIZE];
+#endif
+#endif
+
+public:
+	CSAASoundInternal();
+	~CSAASoundInternal();
+
+	void SetClockRate(unsigned int nClockRate);
+	void SetSampleRate(unsigned int nClockRate);
+	void SetOversample(unsigned int nOversample);
+	void SetSoundParameters(SAAPARAM uParam);
+	void WriteAddress(BYTE nReg);
+	void WriteData(BYTE nData);
+	void WriteAddressData(BYTE nReg, BYTE nData);
+	BYTE ReadAddress(void);
+	void Clear(void);
+
+	SAAPARAM GetCurrentSoundParameters(void);
+	unsigned long GetCurrentSampleRate(void);
+	static unsigned long GetSampleRate(SAAPARAM uParam);
+	unsigned short GetCurrentBytesPerSample(void);
+	static unsigned short GetBytesPerSample(SAAPARAM uParam);
+
+	void GenerateMany(BYTE * pBuffer, unsigned long nSamples);
+
+};
+
+#endif // SAAIMPL_H_INCLUDED
diff --git a/src/sound/saasound/SAANoise.cpp b/src/sound/saasound/SAANoise.cpp
new file mode 100755
index 000000000..895a5a103
--- /dev/null
+++ b/src/sound/saasound/SAANoise.cpp
@@ -0,0 +1,180 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// SAANoise.cpp: implementation of the CSAANoise class.
+// One noise generator
+//
+// After construction, it's important to SetSampleRate before
+// trying to use the generator.
+// (Just because the CSAANoise object has a default samplerate
+//  doesn't mean you should rely on it)
+//
+//////////////////////////////////////////////////////////////////////
+
+#include "SAASound.h"
+
+#include "types.h"
+#include "SAANoise.h"
+#include "defns.h"
+
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+CSAANoise::CSAANoise()
+:
+m_nCounter(0),
+m_nCounter_low(0),
+m_nCounterLimit_low(1),
+m_nOversample(0),
+m_bSync(false),
+m_nSampleRate(SAMPLE_RATE_HZ),
+m_nSourceMode(0),
+m_nRand(1)
+{
+	_SetClockRate(EXTERNAL_CLK_HZ);
+	m_nAdd = m_nAddBase;
+}
+
+CSAANoise::CSAANoise(unsigned long seed)
+:
+m_nCounter(0),
+m_nCounter_low(0),
+m_nCounterLimit_low(1),
+m_nOversample(0),
+m_bSync(false),
+m_nSampleRate(SAMPLE_RATE_HZ),
+m_nSourceMode(0),
+m_nRand(seed)
+{
+	_SetClockRate(EXTERNAL_CLK_HZ);
+	m_nAdd = m_nAddBase;
+}
+
+CSAANoise::~CSAANoise()
+{
+	// Nothing to do
+}
+
+void CSAANoise::_SetClockRate(int nClockRate)
+{
+	// at 8MHz the clock rate is 31.250kHZ
+	// This is simply the clock rate divided by 256 i.e. 2^8
+	// We then shift this by 2^12 (like the Freq) for better
+	// period accuracy.  So that's the same as shifting by (12-8)
+	m_nAddBase = nClockRate << (12 - 8);
+}
+
+void CSAANoise::Seed(unsigned long seed)
+{
+	m_nRand = seed;
+}
+
+void CSAANoise::SetSource(int nSource)
+{
+	m_nSourceMode = nSource;
+	m_nAdd = m_nAddBase >> m_nSourceMode;
+}
+
+void CSAANoise::Trigger(void)
+{
+	// Trigger only does anything useful when we're
+	// clocking from the frequency generator - i.e
+	// if bUseFreqGen = true (i.e. SourceMode = 3)
+	
+	// So if we're clocking from the noise generator
+	// clock (ie, SourceMode = 0, 1 or 2) then do nothing
+
+//	No point actually checking m_bSync here ... because if sync is true,
+//	then frequency generators won't actually be generating Trigger pulses
+//	so we wouldn't even get here!
+	// EXCEPT - cool edge case:  if sync is set, then actually the Noise Generator
+	// is triggered on EVERY CLOCK PULSE (i.e. 8MHz noise).  So indeed it is correct
+	// to not check for sync here.  NEEDS TEST CASE.
+
+	if (m_nSourceMode == 3)
+	{
+		ChangeLevel();
+	}
+}
+
+void CSAANoise::Tick(void)
+{
+	// Tick only does anything useful when we're
+	// clocking from the noise generator clock
+	// (ie, SourceMode = 0, 1 or 2)
+	
+	// So, if SourceMode = 3 (ie, we're clocking from a
+	// frequency generator ==> bUseFreqGen = true)
+	// then do nothing
+	if ( (!m_bSync) && (m_nSourceMode!=3) )
+	{
+		m_nCounter += m_nAdd;
+		while (m_nCounter >= (m_nSampleRate<<12))
+		{
+			m_nCounter -= (m_nSampleRate<<12);
+			m_nCounter_low++;
+			if (m_nCounter_low >= m_nCounterLimit_low)
+			{
+				m_nCounter_low = 0;
+				ChangeLevel();
+			}
+		}
+	}
+}
+
+void CSAANoise::Sync(bool bSync)
+{
+	if (bSync)
+	{
+		m_nCounter = 0;
+		m_nCounter_low = 0;
+	}
+	m_bSync = bSync;
+}
+
+
+void CSAANoise::_SetSampleRate(int nSampleRate)
+{
+	m_nSampleRate = nSampleRate;
+}
+
+
+void CSAANoise::_SetOversample(unsigned int oversample)
+{
+	// oversample is a power of 2 i.e.
+	// if oversample == 2 then 4x oversample
+	// if oversample == 6 then 64x oversample
+	if (oversample < m_nOversample)
+	{
+		m_nCounter_low <<= (m_nOversample - oversample);
+	}
+	else
+	{
+		m_nCounter_low >>= (oversample - m_nOversample);
+	}
+
+	m_nCounterLimit_low = 1<<oversample;
+	m_nOversample = oversample;
+}
+
+inline void CSAANoise::ChangeLevel(void)
+{
+	/*
+	https://www.vogons.org/viewtopic.php?f=9&t=51695
+	SAA1099P noise generator as documented by Jepael
+	18-bit Galois LFSR
+	Feedback polynomial = x^18 + x^11 + x^1
+	Period = 2^18-1 = 262143 bits
+	Verified to match recorded noise from my SAA1099P
+	*/
+
+	if (m_nRand & 1)
+	{
+		m_nRand = (m_nRand >> 1) ^ 0x20400;
+	}
+	else
+	{
+		m_nRand >>= 1;
+	}
+}
diff --git a/src/sound/saasound/SAANoise.h b/src/sound/saasound/SAANoise.h
new file mode 100755
index 000000000..61a65dee8
--- /dev/null
+++ b/src/sound/saasound/SAANoise.h
@@ -0,0 +1,54 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// SAANoise.h: interface for the CSAANoise class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef SAANOISE_H_INCLUDED
+#define SAANOISE_H_INCLUDED
+
+class CSAANoise  
+{
+private:
+	unsigned long m_nCounter;
+	unsigned long m_nAdd;
+	unsigned long m_nCounter_low;
+	unsigned int m_nOversample;
+	unsigned long m_nCounterLimit_low;
+	bool m_bSync; // see description of "SYNC" bit of register 28
+	unsigned long m_nSampleRate; // = 44100 when RateMode=0, for example
+	int m_nSourceMode;
+	unsigned long m_nAddBase; // nAdd for 31.25 kHz noise at 44.1 kHz samplerate
+
+	// pseudo-random number generator
+	unsigned long m_nRand;
+
+	void ChangeLevel(void);
+	
+
+public:
+	CSAANoise();
+	CSAANoise(unsigned long seed);
+	~CSAANoise();
+
+	void SetSource(int nSource);
+	void Trigger(void);
+	void _SetSampleRate(int nSampleRate);
+	void _SetOversample(unsigned int oversample);
+	void _SetClockRate(int nClockRate);
+	void Seed(unsigned long seed);
+
+	void Tick(void);
+	int Level(void) const;
+	void Sync(bool bSync);
+
+};
+
+inline int CSAANoise::Level(void) const
+{
+	// returns 0 or 1
+	return (m_nRand & 0x00000001);
+}
+
+
+#endif	// SAANOISE_H_INCLUDED
diff --git a/src/sound/saasound/SAASndC.cpp b/src/sound/saasound/SAASndC.cpp
new file mode 100755
index 000000000..9af0d76e7
--- /dev/null
+++ b/src/sound/saasound/SAASndC.cpp
@@ -0,0 +1,100 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// Thanks to this file (and associated header file) you can now
+// use CSAASound from within a standard 'C' program
+//
+//////////////////////////////////////////////////////////////////////
+
+#include "SAASound.h"
+#include "types.h"
+#include "SAAEnv.h"
+#include "SAANoise.h"
+#include "SAAFreq.h"
+#include "SAAAmp.h"
+#include "SAASound.h"
+#include "SAAImpl.h"
+
+SAASND SAAAPI newSAASND(void)
+{
+	return (SAASND)(new CSAASoundInternal());
+}
+
+void SAAAPI deleteSAASND(SAASND object)
+{
+	delete (LPCSAASOUND)(object);
+}
+
+void SAAAPI SAASNDSetClockRate(SAASND object, unsigned int nClockRate)
+{
+	((LPCSAASOUND)(object))->SetClockRate(nClockRate);
+}
+
+void SAAAPI SAASNDSetSoundParameters(SAASND object, SAAPARAM uParam)
+{
+	((LPCSAASOUND)(object))->SetSoundParameters(uParam);
+}
+
+void SAAAPI SAASNDWriteAddress(SAASND object, BYTE nReg)
+{
+	((LPCSAASOUND)(object))->WriteAddress(nReg);
+}
+
+void SAAAPI SAASNDWriteData(SAASND object, BYTE nData)
+{
+	((LPCSAASOUND)(object))->WriteData(nData);
+}
+
+void SAAAPI SAASNDWriteAddressData(SAASND object, BYTE nReg, BYTE nData)
+{
+	((LPCSAASOUND)(object))->WriteAddressData(nReg, nData);
+}
+
+void SAAAPI SAASNDClear(SAASND object)
+{
+	((LPCSAASOUND)(object))->Clear();
+}
+
+SAAPARAM SAAAPI SAASNDGetCurrentSoundParameters(SAASND object)
+{
+	return ((LPCSAASOUND)(object))->GetCurrentSoundParameters();
+}
+
+unsigned short SAAAPI SAASNDGetCurrentBytesPerSample(SAASND object)
+{
+	return ((LPCSAASOUND)(object))->GetCurrentBytesPerSample();
+}
+
+unsigned short SAAAPI SAASNDGetBytesPerSample(SAAPARAM uParam)
+{
+	return CSAASound::GetBytesPerSample(uParam);
+}
+
+unsigned long SAAAPI SAASNDGetCurrentSampleRate(SAASND object)
+{
+	return ((LPCSAASOUND)(object))->GetCurrentSampleRate();
+}
+
+unsigned long SAAAPI SAASNDGetSampleRate(SAAPARAM uParam)
+{
+	return CSAASound::GetSampleRate(uParam);
+}
+
+void SAAAPI SAASNDGenerateMany(SAASND object, BYTE * pBuffer, unsigned long nSamples)
+{
+	((LPCSAASOUND)(object))->GenerateMany(pBuffer, nSamples);
+}
+
+void SAAAPI SAASNDSetSampleRate(SAASND object, unsigned int nSampleRate)
+{
+	return ((LPCSAASOUND)(object))->SetSampleRate(nSampleRate);
+}
+
+void SAAAPI SAASNDSetOversample(SAASND object, unsigned int nOversample)
+{
+	return ((LPCSAASOUND)(object))->SetOversample(nOversample);
+}
+
+BYTE SAAAPI SAASNDReadAddress(SAASND object)
+{
+	return ((LPCSAASOUND)(object))->ReadAddress();
+}
diff --git a/src/sound/saasound/SAASndC.h b/src/sound/saasound/SAASndC.h
new file mode 100644
index 000000000..c6fd65765
--- /dev/null
+++ b/src/sound/saasound/SAASndC.h
@@ -0,0 +1,102 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// **********
+// * PUBLIC *
+// **********
+//
+// SAASndC.h: "C-style" interface for the CSAASound class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef SAASNDC_H_INCLUDED
+#define SAASNDC_H_INCLUDED
+
+#ifdef _MSC_VER
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+#endif
+
+#ifndef SAASOUND_H_INCLUDED
+
+// Parameters for use with SetSoundParameters, for example,
+// SetSoundParameters(SAAP_NOFILTER | SAAP_44100 | SAAP_16BIT | SAAP_STEREO);
+#define SAAP_FILTER_HIGHPASS_SIMPLE 0x00000400
+#define SAAP_FILTER_OVERSAMPLE64x 0x00000300
+#define SAAP_FILTER_OVERSAMPLE2x 0x00000200
+#define SAAP_FILTER SAAP_FILTER_OVERSAMPLE2x
+#define SAAP_NOFILTER 0x00000100
+#define SAAP_44100 0x00000030
+#define SAAP_22050 0x00000020
+#define SAAP_11025 0x00000010
+#define SAAP_16BIT 0x0000000c
+#define SAAP_8BIT 0x00000004
+#define SAAP_STEREO 0x00000003
+#define SAAP_MONO 0x00000001
+
+// Bitmasks for use with GetCurrentSoundParameters, for example,
+// unsigned long CurrentSampleRateParameter = GetCurrentSoundParameters()
+#define SAAP_MASK_FILTER 0x00000f00
+#define SAAP_MASK_FILTER_HIGHPASS 0x00000c00
+#define SAAP_MASK_FILTER_OVERSAMPLE 0x00000300
+#define SAAP_MASK_SAMPLERATE 0x000000030
+#define SAAP_MASK_BITDEPTH 0x0000000c
+#define SAAP_MASK_CHANNELS 0x00000003
+
+typedef unsigned long SAAPARAM;
+
+
+#ifndef BYTE
+#define BYTE unsigned char
+#endif
+
+#ifdef WIN32
+#ifndef WINAPI
+#define WINAPI __stdcall
+#endif
+#define EXTAPI __declspec(dllexport) WINAPI
+#else // Win32
+#ifndef WINAPI
+#define WINAPI /**/
+#endif
+#define EXTAPI /**/
+#endif // Win32
+
+#endif // SAASOUND_H_INCLUDED
+
+typedef void * SAASND;
+
+// the following are implemented as calls, etc, to a class.
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+SAASND EXTAPI newSAASND(void);
+void EXTAPI deleteSAASND(SAASND object);
+
+void EXTAPI SAASNDSetSoundParameters(SAASND object, SAAPARAM uParam);
+void EXTAPI SAASNDWriteAddress(SAASND object, BYTE nReg);
+void EXTAPI SAASNDWriteData(SAASND object, BYTE nData);
+void EXTAPI SAASNDWriteAddressData(SAASND object, BYTE nReg, BYTE nData);
+void EXTAPI SAASNDClear(SAASND object);
+BYTE EXTAPI SAASNDReadAddress(SAASND object);
+
+SAAPARAM EXTAPI SAASNDGetCurrentSoundParameters(SAASND object);
+unsigned short EXTAPI SAASNDGetCurrentBytesPerSample(SAASND object);
+unsigned short EXTAPI SAASNDGetBytesPerSample(SAAPARAM uParam);
+unsigned long EXTAPI SAASNDGetCurrentSampleRate(SAASND object);
+unsigned long EXTAPI SAASNDGetSampleRate(SAAPARAM uParam);
+
+void EXTAPI SAASNDGenerateMany(SAASND object, BYTE * pBuffer, unsigned long nSamples);
+
+void EXTAPI SAASNDSetClockRate(SAASND object, unsigned int nClockRate);
+void EXTAPI SAASNDSetSampleRate(SAASND object, unsigned int nSampleRate);
+void EXTAPI SAASNDSetOversample(SAASND object, unsigned int nOversample);
+
+
+#ifdef __cplusplus
+}; // extern "C"
+#endif
+
+#endif	// SAASNDC_H_INCLUDED
diff --git a/src/sound/saasound/SAASound.cpp b/src/sound/saasound/SAASound.cpp
new file mode 100755
index 000000000..c5e33d862
--- /dev/null
+++ b/src/sound/saasound/SAASound.cpp
@@ -0,0 +1,13 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// SAASound.cpp - dummy function
+//
+//////////////////////////////////////////////////////////////////////
+
+#include <stdio.h>
+
+// Provide something so the compiler doesn't optimise us out of existance
+int SomeFunction ()
+{
+	return 42;
+}
diff --git a/src/sound/saasound/SAASound.h b/src/sound/saasound/SAASound.h
new file mode 100644
index 000000000..a5e9265ac
--- /dev/null
+++ b/src/sound/saasound/SAASound.h
@@ -0,0 +1,130 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// SAASound.h: interface for the CSAASound class.
+//
+// This corresponds to the public (exported) DLL interface, so all
+// APIs and client factory methods belong here.
+//
+// Compatibility notes : the intention is for this to be fully backwards
+// compatible across minor and patch versions.  Any backwards breaking changes
+// should be reflected as a major version increment.  New functionality can be added
+// in minor versions so long as backwards compatiblity is maintained
+// 
+// Version 3.3.0 (4th Dec 2018)
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef SAASOUND_H_INCLUDED
+#define SAASOUND_H_INCLUDED
+
+// define this if you want to output diagnostic text and PCM files
+//#define DEBUGSAA
+
+// Parameters for use with SetSoundParameters, for example,
+// SetSoundParameters(SAAP_NOFILTER | SAAP_44100 | SAA_16BIT | SAA_STEREO);
+// SAAP_FILTER_HIGHPASS_SIMPLE can be ORd with SAAP_FILTER_OVERSAMPLE64x/2x
+#define SAAP_FILTER_HIGHPASS_SIMPLE 0x00000400
+#define SAAP_FILTER_OVERSAMPLE64x 0x00000300
+#define SAAP_FILTER_OVERSAMPLE2x 0x00000200
+#define SAAP_FILTER SAAP_FILTER_OVERSAMPLE2x
+#define SAAP_NOFILTER 0x00000100
+#define SAAP_44100 0x00000030
+#define SAAP_22050 0x00000020
+#define SAAP_11025 0x00000010
+#define SAAP_16BIT 0x0000000c
+#define SAAP_8BIT 0x00000004
+#define SAAP_STEREO 0x00000003
+#define SAAP_MONO 0x00000001
+
+// Bitmasks for use with GetCurrentSoundParameters, for example,
+// unsigned long CurrentSampleRateParameter = GetCurrentSoundParameters()
+#define SAAP_MASK_FILTER 0x00000f00
+#define SAAP_MASK_FILTER_HIGHPASS 0x00000c00
+#define SAAP_MASK_FILTER_OVERSAMPLE 0x00000300
+#define SAAP_MASK_SAMPLERATE 0x000000030
+#define SAAP_MASK_BITDEPTH 0x0000000c
+#define SAAP_MASK_CHANNELS 0x00000003
+
+typedef unsigned long SAAPARAM;
+
+
+#ifndef BYTE
+#define BYTE unsigned char
+#endif
+
+#ifdef _WIN32
+#define SAAAPI _stdcall
+#else
+#define SAAAPI
+#endif
+
+
+#ifdef __cplusplus
+
+class CSAASound
+{
+public:
+	virtual ~CSAASound() { }
+
+	virtual void SetSoundParameters (SAAPARAM uParam) = 0;
+	virtual void WriteAddress (BYTE nReg) = 0;
+	virtual void WriteData (BYTE nData) = 0;
+	virtual void WriteAddressData (BYTE nReg, BYTE nData) = 0;
+	virtual void Clear () = 0;
+	virtual BYTE ReadAddress () = 0;
+
+	virtual SAAPARAM GetCurrentSoundParameters () = 0;
+	virtual unsigned long GetCurrentSampleRate () = 0;
+	static unsigned long GetSampleRate (SAAPARAM uParam);
+	virtual unsigned short GetCurrentBytesPerSample () = 0;
+	static unsigned short GetBytesPerSample (SAAPARAM uParam);
+
+	virtual void GenerateMany (BYTE * pBuffer, unsigned long nSamples) = 0;
+
+	virtual void SetClockRate(unsigned int nClockRate) = 0;
+	virtual void SetSampleRate(unsigned int nSampleRate) = 0;
+	virtual void SetOversample(unsigned int nOversample) = 0;
+};
+
+typedef class CSAASound * LPCSAASOUND;
+
+LPCSAASOUND SAAAPI CreateCSAASound(void);
+void SAAAPI DestroyCSAASound(LPCSAASOUND object);
+
+#endif	// __cplusplus
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void * SAASND;
+
+// "C-style" interface for the CSAASound class
+SAASND SAAAPI newSAASND(void);
+void SAAAPI deleteSAASND(SAASND object);
+
+void SAAAPI SAASNDSetSoundParameters(SAASND object, SAAPARAM uParam);
+void SAAAPI SAASNDWriteAddress(SAASND object, BYTE nReg);
+void SAAAPI SAASNDWriteData(SAASND object, BYTE nData);
+void SAAAPI SAASNDWriteAddressData(SAASND object, BYTE nReg, BYTE nData);
+void SAAAPI SAASNDClear(SAASND object);
+
+SAAPARAM SAAAPI SAASNDGetCurrentSoundParameters(SAASND object);
+unsigned short SAAAPI SAASNDGetCurrentBytesPerSample(SAASND object);
+unsigned short SAAAPI SAASNDGetBytesPerSample(SAAPARAM uParam);
+unsigned long SAAAPI SAASNDGetCurrentSampleRate(SAASND object);
+unsigned long SAAAPI SAASNDGetSampleRate(SAAPARAM uParam);
+
+void SAAAPI SAASNDGenerateMany(SAASND object, BYTE * pBuffer, unsigned long nSamples);
+void SAAAPI SAASNDSetClockRate(SAASND object, unsigned int nClockRate);
+void SAAAPI SAASNDSetSampleRate(SAASND object, unsigned int nSampleRate);
+void SAAAPI SAASNDSetOversample(SAASND object, unsigned int nOversample);
+
+BYTE SAAAPI SAASNDReadAddress(SAASND object);
+
+#ifdef __cplusplus
+}; // extern "C"
+#endif
+
+#endif	// SAASOUND_H_INCLUDED
diff --git a/src/sound/saasound/defns.h b/src/sound/saasound/defns.h
new file mode 100644
index 000000000..e81d1c819
--- /dev/null
+++ b/src/sound/saasound/defns.h
@@ -0,0 +1,59 @@
+// Part of SAASound copyright 2020 Dave Hooper <dave@beermex.com>
+//
+// defns.h: compile-time configuration parameters
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef DEFNS_H_INCLUDED
+#define DEFNS_H_INCLUDED
+
+#define HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
+// using CMAKE
+#include "saasound_cmake_config.h"
+#else
+
+// initial default SAA1099 crystal clock rate in HZ (can be changed subsequently by calling SetClockRate)
+#define EXTERNAL_CLK_HZ 8000000
+
+// define SAAFREQ_FIXED_CLOCKRATE if the above external clock rate is the only supported clock rate
+// i.e. only support a single compile-time clock rate (=> this also prevents using the SetClockRate method)
+#undef SAAFREQ_FIXED_CLOCKRATE
+// #define SAAFREQ_FIXED_CLOCKRATE
+
+// initial default sample rate (audio samplerate)
+#define SAMPLE_RATE_HZ 44100
+
+// initial default oversample (audio quality) recommend 0<=oversample<=6
+#define DEFAULT_OVERSAMPLE 6
+
+// Whether to dump out a log of all register and value changes and raw output pcm
+//#define DEBUGSAA
+#undef DEBUGSAA
+
+// the (default) names of the register output and pcm output log files.
+// If you're using a config file, you can change these (or, if you enable
+// debugging via the config file settings, but leave the filenames unspecified,
+// it will use these defaults)
+#define DEBUG_SAA_REGISTER_LOG "debugsaa.txt"
+#define DEBUG_SAA_PCM_LOG  "debugsaa.pcm"
+// Whether to include support for these debug logs via config file (only making
+// sense if USE_CONFIG_FILE is also defined)
+
+// Whether to support a startup configuration file that is parsed at load time
+// #undef USE_CONFIG_FILE
+#define USE_CONFIG_FILE
+
+// and if so, what is its location
+#ifdef USE_CONFIG_FILE
+#define CONFIG_FILE_PATH "SAASound.cfg"
+#endif // USE_CONFIG_FILE
+
+#define DEFAULT_UNBOOSTED_MULTIPLIER 11.35
+
+#define DEFAULT_BOOST 1
+
+
+#endif // HAVE_CONFIG_H
+
+#endif //  DEFNS_H_INCLUDED
diff --git a/src/sound/saasound/resource.h b/src/sound/saasound/resource.h
new file mode 100755
index 000000000..0b893bf3a
--- /dev/null
+++ b/src/sound/saasound/resource.h
@@ -0,0 +1,15 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by SAASound.rc
+//
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/src/sound/saasound/saasound_cmake_config.h b/src/sound/saasound/saasound_cmake_config.h
new file mode 100644
index 000000000..da914a71b
--- /dev/null
+++ b/src/sound/saasound/saasound_cmake_config.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#define EXTERNAL_CLK_HZ 7159090
+/* #undef SAAFREQ_FIXED_CLOCKRATE */
+#define SAMPLE_RATE_HZ 44100
+#define DEFAULT_OVERSAMPLE 6
+#define DEFAULT_UNBOOSTED_MULTIPLIER 11.3
+#define DEFAULT_BOOST 1
+/* #undef DEBUGSAA */
+#define DEBUG_SAA_REGISTER_LOG "debugsaa.txt"
+#define DEBUG_SAA_PCM_LOG "debugsaa.pcm"
+
+/* #undef USE_CONFIG_FILE */
+#define CONFIG_FILE_PATH "SAASound.cfg"
diff --git a/src/sound/saasound/types.h b/src/sound/saasound/types.h
new file mode 100755
index 000000000..4eb62f485
--- /dev/null
+++ b/src/sound/saasound/types.h
@@ -0,0 +1,34 @@
+// Part of SAASound copyright 1998-2018 Dave Hooper <dave@beermex.com>
+//
+// handy typedefs
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef TYPES_H_INCLUDED
+#define TYPES_H_INCLUDED
+
+#if  defined(__i386__) || defined(WIN32) || \
+    (defined(__alpha__) || defined(__alpha)) || \
+     defined(__arm__) || \
+    (defined(__mips__) && defined(__MIPSEL__))
+#else
+#define __BIG_ENDIAN
+#endif
+
+
+#ifndef NULL
+#define NULL	0
+#endif
+
+typedef struct
+{
+	int nNumberOfPhases;
+	bool bLooping;
+	int nLevels[2][2][16]; // [Resolution][Phase][Withinphase]
+} ENVDATA;
+
+#ifdef WIN32
+extern "C" void _stdcall OutputDebugStringA (char*);
+#endif
+
+#endif
diff --git a/src/sound/snd_cms.c b/src/sound/snd_cms.c
index 66dff80f3..60165365d 100644
--- a/src/sound/snd_cms.c
+++ b/src/sound/snd_cms.c
@@ -8,6 +8,7 @@
 #include <86box/86box.h>
 #include <86box/device.h>
 #include <86box/io.h>
+#include "saasound/SAASound.h"
 #include <86box/snd_cms.h>
 #include <86box/sound.h>
 #include <86box/plat_unused.h>
@@ -15,62 +16,13 @@
 void
 cms_update(cms_t *cms)
 {
-    for (; cms->pos < sound_pos_global; cms->pos++) {
-        int16_t out_l = 0;
-        int16_t out_r = 0;
-
-        for (uint8_t c = 0; c < 4; c++) {
-            switch (cms->noisetype[c >> 1][c & 1]) {
-                case 0:
-                    cms->noisefreq[c >> 1][c & 1] = MASTER_CLOCK / 256;
-                    break;
-                case 1:
-                    cms->noisefreq[c >> 1][c & 1] = MASTER_CLOCK / 512;
-                    break;
-                case 2:
-                    cms->noisefreq[c >> 1][c & 1] = MASTER_CLOCK / 1024;
-                    break;
-                case 3:
-                    cms->noisefreq[c >> 1][c & 1] = cms->freq[c >> 1][(c & 1) * 3];
-                    break;
-
-                default:
-                    break;
-            }
-        }
-        for (uint8_t c = 0; c < 2; c++) {
-            if (cms->regs[c][0x1C] & 1) {
-                for (uint8_t d = 0; d < 6; d++) {
-                    if (cms->regs[c][0x14] & (1 << d)) {
-                        if (cms->stat[c][d])
-                            out_l += (cms->vol[c][d][0] * 90);
-                        if (cms->stat[c][d])
-                            out_r += (cms->vol[c][d][1] * 90);
-                        cms->count[c][d] += cms->freq[c][d];
-                        if (cms->count[c][d] >= 24000) {
-                            cms->count[c][d] -= 24000;
-                            cms->stat[c][d] ^= 1;
-                        }
-                    } else if (cms->regs[c][0x15] & (1 << d)) {
-                        if (cms->noise[c][d / 3] & 1)
-                            out_l += (cms->vol[c][d][0] * 90);
-                        if (cms->noise[c][d / 3] & 1)
-                            out_r += (cms->vol[c][d][0] * 90);
-                    }
-                }
-                for (uint8_t d = 0; d < 2; d++) {
-                    cms->noisecount[c][d] += cms->noisefreq[c][d];
-                    while (cms->noisecount[c][d] >= 24000) {
-                        cms->noisecount[c][d] -= 24000;
-                        cms->noise[c][d] <<= 1;
-                        if (!(((cms->noise[c][d] & 0x4000) >> 8) ^ (cms->noise[c][d] & 0x40)))
-                            cms->noise[c][d] |= 1;
-                    }
-                }
-            }
-        }
-        cms->buffer[cms->pos << 1]       = out_l;
-        cms->buffer[(cms->pos << 1) + 1] = out_r;
+    if (cms->pos < wavetable_pos_global) {
+        SAASNDGenerateMany(cms->saasound, (unsigned char*)&cms->buffer[cms->pos], wavetable_pos_global - cms->pos);
+        cms->pos = wavetable_pos_global;
+    }
+    if (cms->pos2 < wavetable_pos_global) {
+        SAASNDGenerateMany(cms->saasound2, (unsigned char*)&cms->buffer2[cms->pos2], wavetable_pos_global - cms->pos2);
+        cms->pos2 = wavetable_pos_global;
     }
 }
 
@@ -87,6 +39,19 @@ cms_get_buffer(int32_t *buffer, int len, void *priv)
     cms->pos = 0;
 }
 
+void
+cms_get_buffer_2(int32_t *buffer, int len, void *priv)
+{
+    cms_t *cms = (cms_t *) priv;
+
+    cms_update(cms);
+
+    for (int c = 0; c < len * 2; c++)
+        buffer[c] += cms->buffer2[c];
+
+    cms->pos2 = 0;
+}
+
 void
 cms_write(uint16_t addr, uint8_t val, void *priv)
 {
@@ -96,54 +61,19 @@ cms_write(uint16_t addr, uint8_t val, void *priv)
 
     switch (addr & 0xf) {
         case 0x1: /* SAA #1 Register Select Port */
-            cms->addrs[0] = val & 31;
+            SAASNDWriteAddress(cms->saasound, val & 31);
             break;
         case 0x3: /* SAA #2 Register Select Port */
-            cms->addrs[1] = val & 31;
+            SAASNDWriteAddress(cms->saasound2, val & 31);
             break;
 
         case 0x0: /* SAA #1 Data Port */
+            cms_update(cms);
+            SAASNDWriteData(cms->saasound, val);
+            break;
         case 0x2: /* SAA #2 Data Port */
             cms_update(cms);
-            cms->regs[chip][cms->addrs[chip] & 31] = val;
-            switch (cms->addrs[chip] & 31) {
-                case 0x00:
-                case 0x01:
-                case 0x02: /*Volume*/
-                case 0x03:
-                case 0x04:
-                case 0x05:
-                    voice                    = cms->addrs[chip] & 7;
-                    cms->vol[chip][voice][0] = val & 0xf;
-                    cms->vol[chip][voice][1] = val >> 4;
-                    break;
-                case 0x08:
-                case 0x09:
-                case 0x0A: /*Frequency*/
-                case 0x0B:
-                case 0x0C:
-                case 0x0D:
-                    voice                   = cms->addrs[chip] & 7;
-                    cms->latch[chip][voice] = (cms->latch[chip][voice] & 0x700) | val;
-                    cms->freq[chip][voice]  = (MASTER_CLOCK / 512 << (cms->latch[chip][voice] >> 8)) / (511 - (cms->latch[chip][voice] & 255));
-                    break;
-                case 0x10:
-                case 0x11:
-                case 0x12: /*Octave*/
-                    voice                       = (cms->addrs[chip] & 3) << 1;
-                    cms->latch[chip][voice]     = (cms->latch[chip][voice] & 0xFF) | ((val & 7) << 8);
-                    cms->latch[chip][voice + 1] = (cms->latch[chip][voice + 1] & 0xFF) | ((val & 0x70) << 4);
-                    cms->freq[chip][voice]      = (MASTER_CLOCK / 512 << (cms->latch[chip][voice] >> 8)) / (511 - (cms->latch[chip][voice] & 255));
-                    cms->freq[chip][voice + 1]  = (MASTER_CLOCK / 512 << (cms->latch[chip][voice + 1] >> 8)) / (511 - (cms->latch[chip][voice + 1] & 255));
-                    break;
-                case 0x16: /*Noise*/
-                    cms->noisetype[chip][0] = val & 3;
-                    cms->noisetype[chip][1] = (val >> 4) & 3;
-                    break;
-
-                default:
-                    break;
-            }
+            SAASNDWriteData(cms->saasound2, val);
             break;
 
         case 0x6: /* GameBlaster Write Port */
@@ -163,9 +93,9 @@ cms_read(uint16_t addr, void *priv)
 
     switch (addr & 0xf) {
         case 0x1: /* SAA #1 Register Select Port */
-            return cms->addrs[0];
+            return SAASNDReadAddress(cms->saasound);
         case 0x3: /* SAA #2 Register Select Port */
-            return cms->addrs[1];
+            return SAASNDReadAddress(cms->saasound2);
         case 0x4: /* GameBlaster Read port (Always returns 0x7F) */
             return 0x7f;
         case 0xa: /* GameBlaster Read Port */
@@ -185,7 +115,12 @@ cms_init(UNUSED(const device_t *info))
 
     uint16_t addr = device_get_config_hex16("base");
     io_sethandler(addr, 0x0010, cms_read, NULL, NULL, cms_write, NULL, NULL, cms);
-    sound_add_handler(cms_get_buffer, cms);
+    cms->saasound = newSAASND();
+    SAASNDSetSoundParameters(cms->saasound, SAAP_44100 | SAAP_16BIT | SAAP_NOFILTER | SAAP_STEREO);
+    cms->saasound2 = newSAASND();
+    SAASNDSetSoundParameters(cms->saasound2, SAAP_44100 | SAAP_16BIT | SAAP_NOFILTER | SAAP_STEREO);
+    wavetable_add_handler(cms_get_buffer, cms);
+    wavetable_add_handler(cms_get_buffer_2, cms);
     return cms;
 }
 
@@ -194,6 +129,9 @@ cms_close(void *priv)
 {
     cms_t *cms = (cms_t *) priv;
 
+    deleteSAASND(cms->saasound);
+    deleteSAASND(cms->saasound2);
+
     free(cms);
 }
 

From b644016d1e0a7a917637c2fadcf8d8056d09b4ab Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Tue, 1 Apr 2025 23:11:09 +0600
Subject: [PATCH 54/59] Port Sound Blaster 1.x/2.x SAA1099 emulation to
 SAASound

---
 src/sound/snd_sb.c | 65 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 16 deletions(-)

diff --git a/src/sound/snd_sb.c b/src/sound/snd_sb.c
index e89946486..4a17fe20b 100644
--- a/src/sound/snd_sb.c
+++ b/src/sound/snd_sb.c
@@ -41,6 +41,7 @@
 #include <86box/sound.h>
 #include "cpu.h"
 #include <86box/timer.h>
+#include "saasound/SAASound.h"
 #include <86box/snd_sb.h>
 #include <86box/plat_unused.h>
 
@@ -145,6 +146,42 @@ sb_log(const char *fmt, ...)
 #    define sb_log(fmt, ...)
 #endif
 
+void
+sb_cms_get_buffer(int32_t *buffer, int len, void *priv)
+{
+    sb_t *sb = (sb_t *) priv;
+
+    cms_update(&sb->cms);
+
+    for (int c = 0; c < len * 2; c++) {
+        if (sb->mixer_enabled) {
+            buffer[c] += sb->cms.buffer[c] * sb->mixer_sb2.fm;
+        }
+        else
+            buffer[c] += sb->cms.buffer[c];
+    }
+
+    sb->cms.pos = 0;
+}
+
+void
+sb_cms_get_buffer_2(int32_t *buffer, int len, void *priv)
+{
+    sb_t *sb = (sb_t *) priv;
+
+    cms_update(&sb->cms);
+
+    for (int c = 0; c < len * 2; c++) {
+        if (sb->mixer_enabled) {
+            buffer[c] += sb->cms.buffer2[c] * sb->mixer_sb2.fm;
+        }
+        else
+            buffer[c] += sb->cms.buffer2[c];
+    }
+
+    sb->cms.pos2 = 0;
+}
+
 /* SB 1, 1.5, MCV, and 2 do not have a mixer, so signal is hardwired. */
 static void
 sb_get_buffer_sb2(int32_t *buffer, int len, void *priv)
@@ -155,23 +192,10 @@ sb_get_buffer_sb2(int32_t *buffer, int len, void *priv)
 
     sb_dsp_update(&sb->dsp);
 
-    if (sb->cms_enabled)
-        cms_update(&sb->cms);
-
     for (int c = 0; c < len * 2; c += 2) {
         double out_l = 0.0;
         double out_r = 0.0;
 
-        if (sb->cms_enabled) {
-            out_l += sb->cms.buffer[c];
-            out_r += sb->cms.buffer[c + 1];
-        }
-
-        if (sb->cms_enabled && sb->mixer_enabled) {
-            out_l *= mixer->fm;
-            out_r *= mixer->fm;
-        }
-
         /* TODO: Recording: I assume it has direct mic and line in like SB2.
                  It is unclear from the docs if it has a filter, but it probably does. */
         /* TODO: Recording: Mic and line In with AGC. */
@@ -192,9 +216,6 @@ sb_get_buffer_sb2(int32_t *buffer, int len, void *priv)
     }
 
     sb->dsp.pos = 0;
-
-    if (sb->cms_enabled)
-        sb->cms.pos = 0;
 }
 
 static void
@@ -2890,6 +2911,13 @@ sb_init(UNUSED(const device_t *info))
                       cms_read, NULL, NULL,
                       cms_write, NULL, NULL,
                       &sb->cms);
+
+        sb->cms.saasound = newSAASND();
+        SAASNDSetSoundParameters(sb->cms.saasound, SAAP_44100 | SAAP_16BIT | SAAP_NOFILTER | SAAP_STEREO);
+        sb->cms.saasound2 = newSAASND();
+        SAASNDSetSoundParameters(sb->cms.saasound2, SAAP_44100 | SAAP_16BIT | SAAP_NOFILTER | SAAP_STEREO);
+        wavetable_add_handler(sb_cms_get_buffer, sb);
+        wavetable_add_handler(sb_cms_get_buffer_2, sb);
     }
 
     if (mixer_addr > 0x000) {
@@ -4044,6 +4072,11 @@ sb_close(void *priv)
     sb_t *sb = (sb_t *) priv;
     sb_dsp_close(&sb->dsp);
 
+    if (sb->cms_enabled) {
+        deleteSAASND(sb->cms.saasound);
+        deleteSAASND(sb->cms.saasound2);
+    }
+
     free(sb);
 }
 

From ee71952e02a272422cfe39cd00265c2cfc7d23f2 Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Wed, 2 Apr 2025 00:33:24 +0600
Subject: [PATCH 55/59] Don't attempt altering window position if fullscreen

---
 src/qt/qt_mainwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp
index b3d0d9fa9..4c04ce76e 100644
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -803,7 +803,7 @@ MainWindow::resizeEvent(QResizeEvent *event)
 {
     //qDebug() << pos().x() + event->size().width();
     //qDebug() << pos().y() + event->size().height();
-    if (vid_resize == 1)
+    if (vid_resize == 1 || video_fullscreen)
         return;
 
     int newX = pos().x();

From 5e61b78b782dfaf8b4139c598deecc40ad412cd8 Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Wed, 2 Apr 2025 01:10:21 +0600
Subject: [PATCH 56/59] Make sure that floppy icons and options do not appear
 if there's no floppy controller available

---
 src/floppy/fdc.c            | 6 ++++++
 src/qt/qt_machinestatus.cpp | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c
index 51c3aa24a..e656e639c 100644
--- a/src/floppy/fdc.c
+++ b/src/floppy/fdc.c
@@ -79,6 +79,8 @@ int floppyrate[4];
 
 int fdc_current[FDC_MAX] = { 0, 0 };
 
+volatile int fdcinited = 0;
+
 #ifdef ENABLE_FDC_LOG
 int fdc_do_log = ENABLE_FDC_LOG;
 
@@ -2337,6 +2339,8 @@ fdc_close(void *priv)
 
     fifo_close(fdc->fifo_p);
 
+    fdcinited = 0;
+
     free(fdc);
 }
 
@@ -2382,6 +2386,8 @@ fdc_init(const device_t *info)
 
     fdc_reset(fdc);
 
+    fdcinited = 1;
+
     return fdc;
 }
 
diff --git a/src/qt/qt_machinestatus.cpp b/src/qt/qt_machinestatus.cpp
index d555be360..aba7fc1d4 100644
--- a/src/qt/qt_machinestatus.cpp
+++ b/src/qt/qt_machinestatus.cpp
@@ -40,6 +40,8 @@ extern "C" {
 #include <86box/ui.h>
 #include <86box/machine_status.h>
 #include <86box/config.h>
+
+extern volatile int fdcinited;
 };
 
 #include <QIcon>
@@ -303,6 +305,9 @@ MachineStatus::hasSCSI()
 void
 MachineStatus::iterateFDD(const std::function<void(int)> &cb)
 {
+    if (!fdcinited)
+        return;
+
     for (int i = 0; i < FDD_NUM; ++i) {
         if (fdd_get_type(i) != 0) {
             cb(i);

From 2a8e4d5a68cfc04debdfad855df2331a1d61d15a Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 2 Apr 2025 08:34:34 +0200
Subject: [PATCH 57/59] PCI and ACPI - when resetting all devices, also reset
 (ie. zero) all of the emulated RAM as well, fixes Windows 2000 after soft
 reset on later machines such as the ASUS P2B-LS.

---
 src/acpi.c              |  4 +++-
 src/include/86box/mem.h |  1 +
 src/mem/mem.c           | 13 +++++++++++++
 src/pci.c               |  2 ++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/acpi.c b/src/acpi.c
index ccd51ebca..963f26ae6 100644
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -1025,8 +1025,10 @@ acpi_reg_write_common_regs(UNUSED(int size), uint16_t addr, uint8_t val, void *p
                         nvr_reg_write(0x000f, 0xff, dev->nvr);
                     }
 
-                    if (sus_typ & SUS_RESET_PCI)
+                    if (sus_typ & SUS_RESET_PCI) {
                         device_reset_all(DEVICE_PCI);
+                        mem_zero();
+                    }
 
                     if (sus_typ & SUS_RESET_CPU)
                         cpu_alt_reset = 0;
diff --git a/src/include/86box/mem.h b/src/include/86box/mem.h
index 81b46b2fa..f8d0f659a 100644
--- a/src/include/86box/mem.h
+++ b/src/include/86box/mem.h
@@ -459,6 +459,7 @@ extern void mem_a20_recalc(void);
 
 extern void mem_init(void);
 extern void mem_close(void);
+extern void mem_zero(void);
 extern void mem_reset(void);
 extern void mem_remap_top_ex(int kb, uint32_t start);
 extern void mem_remap_top_ex_nomid(int kb, uint32_t start);
diff --git a/src/mem/mem.c b/src/mem/mem.c
index 074b44bda..c4d11300b 100644
--- a/src/mem/mem.c
+++ b/src/mem/mem.c
@@ -2792,6 +2792,17 @@ mem_init_ram_mapping(mem_mapping_t *mapping, uint32_t base, uint32_t size)
     mem_add_ram_mapping(mapping, base, size);
 }
 
+void
+mem_zero(void)
+{
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
+    if (mem_size > 1048576)
+        memset(ram2, 0x00, ram2_size + 16);
+#endif
+
+    memset(ram, 0x00, ram_size + 16);
+}
+
 /* Reset the memory state. */
 void
 mem_reset(void)
@@ -2867,8 +2878,10 @@ mem_reset(void)
             return;
         }
         memset(ram, 0x00, ram_size + 16);
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
         if (mem_size > 1048576)
             ram2 = &(ram[1 << 30]);
+#endif
     }
 
     /*
diff --git a/src/pci.c b/src/pci.c
index ab585c456..c2e4ca237 100644
--- a/src/pci.c
+++ b/src/pci.c
@@ -419,6 +419,8 @@ pci_trc_reset(uint8_t val)
         mem_a20_recalc();
 
         flushmmucache();
+
+        mem_zero();
     }
 
 #ifdef USE_DYNAREC

From de04870db26175dfd065a5708d85a337ca07aad4 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 2 Apr 2025 08:58:16 +0200
Subject: [PATCH 58/59] CMS/SAA: Fix warnings.

---
 src/sound/saasound/SAADevice.cpp |  2 +-
 src/sound/saasound/SAAEnv.cpp    |  8 ++++----
 src/sound/saasound/SAAFreq.cpp   | 17 ++++++++++++-----
 src/sound/saasound/SAAImpl.cpp   | 14 ++++++++------
 src/sound/saasound/SAANoise.cpp  |  4 ++--
 src/sound/snd_cms.c              |  2 --
 6 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/sound/saasound/SAADevice.cpp b/src/sound/saasound/SAADevice.cpp
index 306aa477a..718b05a95 100644
--- a/src/sound/saasound/SAADevice.cpp
+++ b/src/sound/saasound/SAADevice.cpp
@@ -107,7 +107,7 @@ void CSAADevice::_SetSampleRate(unsigned int nSampleRate)
 
 void CSAADevice::_SetOversample(unsigned int nOversample)
 {
-	if (nOversample != m_nOversample)
+	if (((int) nOversample) != m_nOversample)
 	{
 		m_nOversample = nOversample;
 		m_Osc0._SetOversample(nOversample);
diff --git a/src/sound/saasound/SAAEnv.cpp b/src/sound/saasound/SAAEnv.cpp
index ae8191112..049f51f96 100755
--- a/src/sound/saasound/SAAEnv.cpp
+++ b/src/sound/saasound/SAAEnv.cpp
@@ -40,12 +40,12 @@ const ENVDATA CSAAEnv::cs_EnvData[8] =
 CSAAEnv::CSAAEnv()
 :
 m_bEnabled(false),
-m_bNewData(false),
-m_nNextData(0),
-m_bEnvelopeEnded(true),
 m_nPhase(0),
 m_nPhasePosition(0),
-m_nResolution(1)
+m_bEnvelopeEnded(true),
+m_nResolution(1),
+m_bNewData(false),
+m_nNextData(0)
 {
 	// initialise itself with the value 'zero'
 	SetEnvControl(0);
diff --git a/src/sound/saasound/SAAFreq.cpp b/src/sound/saasound/SAAFreq.cpp
index 52cbc7a3d..61a04f6ad 100755
--- a/src/sound/saasound/SAAFreq.cpp
+++ b/src/sound/saasound/SAAFreq.cpp
@@ -32,11 +32,18 @@ const int INITIAL_LEVEL = 1;
 
 CSAAFreq::CSAAFreq(CSAANoise * const NoiseGenerator, CSAAEnv * const EnvGenerator)
 :
-m_nCounter(0), m_nCounter_low(0), m_nAdd(0),
+m_nCounter(0),
+m_nAdd(0),
+m_nCounter_low(0),
+m_nOversample(0),
+m_nCounterLimit_low(1),
 m_nLevel(INITIAL_LEVEL),
-m_nOversample(0), m_nCounterLimit_low(1),
-m_nCurrentOffset(0), m_nCurrentOctave(0), m_nNextOffset(0), m_nNextOctave(0),
-m_bIgnoreOffsetData(false), m_bNewData(false), 
+m_nCurrentOffset(0),
+m_nCurrentOctave(0),
+m_nNextOffset(0),
+m_nNextOctave(0),
+m_bIgnoreOffsetData(false),
+m_bNewData(false), 
 m_bSync(false),
 m_nSampleRate(SAMPLE_RATE_HZ),
 m_pcConnectedNoiseGenerator(NoiseGenerator),
@@ -194,7 +201,7 @@ void CSAAFreq::_SetClockRate(int nClockRate)
 	// Finally, note that the standard formula corresponds to a 8MHz base clock
 	// so we rescale the final result by the ratio nClockRate/8000000
 
-	if (nClockRate != m_nClockRate)
+	if (((unsigned long) nClockRate) != m_nClockRate)
 	{
 		m_nClockRate = nClockRate;
 		int ix = 0;
diff --git a/src/sound/saasound/SAAImpl.cpp b/src/sound/saasound/SAAImpl.cpp
index 8545d3849..f136eefc6 100644
--- a/src/sound/saasound/SAAImpl.cpp
+++ b/src/sound/saasound/SAAImpl.cpp
@@ -20,16 +20,18 @@
 
 CSAASoundInternal::CSAASoundInternal()
 	:
-m_nClockRate(EXTERNAL_CLK_HZ),
-m_bHighpass(false),
-m_nSampleRate(SAMPLE_RATE_HZ),
-m_nOversample(DEFAULT_OVERSAMPLE),
+m_chip(),
 m_uParam(0),
 m_uParamRate(0),
+m_nClockRate(EXTERNAL_CLK_HZ),
+m_nSampleRate(SAMPLE_RATE_HZ),
+m_nOversample(DEFAULT_OVERSAMPLE),
 #if defined(DEBUGSAA) || defined(USE_CONFIG_FILE)
-m_nDebugSample(0),
+m_bHighpass(false),
+m_nDebugSample(0)
+#else
+m_bHighpass(false)
 #endif
-m_chip()
 {
 #ifdef USE_CONFIG_FILE
 	m_Config.ReadConfig();
diff --git a/src/sound/saasound/SAANoise.cpp b/src/sound/saasound/SAANoise.cpp
index 895a5a103..1cf3458dd 100755
--- a/src/sound/saasound/SAANoise.cpp
+++ b/src/sound/saasound/SAANoise.cpp
@@ -25,8 +25,8 @@ CSAANoise::CSAANoise()
 :
 m_nCounter(0),
 m_nCounter_low(0),
-m_nCounterLimit_low(1),
 m_nOversample(0),
+m_nCounterLimit_low(1),
 m_bSync(false),
 m_nSampleRate(SAMPLE_RATE_HZ),
 m_nSourceMode(0),
@@ -40,8 +40,8 @@ CSAANoise::CSAANoise(unsigned long seed)
 :
 m_nCounter(0),
 m_nCounter_low(0),
-m_nCounterLimit_low(1),
 m_nOversample(0),
+m_nCounterLimit_low(1),
 m_bSync(false),
 m_nSampleRate(SAMPLE_RATE_HZ),
 m_nSourceMode(0),
diff --git a/src/sound/snd_cms.c b/src/sound/snd_cms.c
index 60165365d..c6591b1fc 100644
--- a/src/sound/snd_cms.c
+++ b/src/sound/snd_cms.c
@@ -56,8 +56,6 @@ void
 cms_write(uint16_t addr, uint8_t val, void *priv)
 {
     cms_t *cms = (cms_t *) priv;
-    int    voice;
-    int    chip = (addr & 2) >> 1;
 
     switch (addr & 0xf) {
         case 0x1: /* SAA #1 Register Select Port */

From 420a08ee2c8755dc1ba6785cbd5e31247aac1c1f Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 2 Apr 2025 17:18:44 +0200
Subject: [PATCH 59/59] mem.c: Do not initialize the > 1 GB mapping on 64-bit
 binaries where it is not necessary.

---
 src/mem/mem.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/mem/mem.c b/src/mem/mem.c
index c4d11300b..8c2cfd6cc 100644
--- a/src/mem/mem.c
+++ b/src/mem/mem.c
@@ -2976,6 +2976,7 @@ mem_reset(void)
         else if (cpu_16bitbus && is6117 && mem_size > 65408)
             mem_init_ram_mapping(&ram_high_mapping, 0x100000, (65408 - 1024) * 1024);
         else {
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
             if (mem_size > 1048576) {
                 mem_init_ram_mapping(&ram_high_mapping, 0x100000, (1048576 - 1024) * 1024);
 
@@ -2988,6 +2989,9 @@ mem_reset(void)
                                 ram2, MEM_MAPPING_INTERNAL, NULL);
             } else
                 mem_init_ram_mapping(&ram_high_mapping, 0x100000, (mem_size - 1024) * 1024);
+#else
+            mem_init_ram_mapping(&ram_high_mapping, 0x100000, (mem_size - 1024) * 1024);
+#endif
         }
     }