From 921af7000ee0849375dcbcf30b32f719d6b5a59c Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Sun, 6 Nov 2022 18:54:39 -0500
Subject: [PATCH 1/2] Various bits from M&K

---
 src/video/vid_et4000.c |  2 +-
 src/video/vid_svga.c   | 28 +++++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/video/vid_et4000.c b/src/video/vid_et4000.c
index 930468fbf..9fd02cdd3 100644
--- a/src/video/vid_et4000.c
+++ b/src/video/vid_et4000.c
@@ -726,7 +726,7 @@ et4000_init(const device_t *info)
                       et4000_kasan_recalctimings, et4000_in, et4000_out,
                       NULL, NULL);
             io_sethandler(0x03c0, 32,
-                          et4000_in, NULL, NULL, et4000_out, NULL, NULL, dev);
+                          et4000k_in, NULL, NULL, et4000k_out, NULL, NULL, dev);
             io_sethandler(0x0250, 8,
                           et4000_kasan_in, NULL, NULL, et4000_kasan_out, NULL, NULL, dev);
             io_sethandler(0x0258, 2,
diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index e542ddd91..6d00125f5 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -20,11 +20,13 @@
  *          Copyright 2016-2019 Miran Grca.
  */
 #include <inttypes.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdint.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <wchar.h>
+#define HAVE_STDARG_H
 #include <86box/86box.h>
 #include "cpu.h"
 #include <86box/device.h>
@@ -54,6 +56,24 @@ uint8_t svga_rotate[8][256];
 static svga_t *svga_pri;
 int            vga_on, ibm8514_on;
 
+#ifdef ENABLE_SVGA_LOG
+int svga_do_log = ENABLE_SVGA_LOG;
+
+static void
+svga_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (svga_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define svga_log(fmt, ...)
+#endif
+
 svga_t
     *
     svga_get_pri()
@@ -235,7 +255,7 @@ svga_out(uint16_t addr, uint8_t val, void *p)
                     break;
                 case 6:
                     if ((svga->gdcreg[6] & 0xc) != (val & 0xc)) {
-                        switch (val & 0xC) {
+                        switch (val & 0xc) {
                             case 0x0: /*128k at A0000*/
                                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x20000);
                                 svga->banked_mask = 0xffff;
@@ -363,7 +383,9 @@ svga_in(uint16_t addr, void *p)
                 svga->cgastat &= ~0x30;
             else
                 svga->cgastat ^= 0x30;
+
             ret = svga->cgastat;
+
             break;
     }
 
@@ -453,7 +475,7 @@ svga_recalctimings(svga_t *svga)
     svga->render     = svga_render_blank;
     if (!svga->scrblank && (svga->crtc[0x17] & 0x80) && svga->attr_palette_enable) {
         if (!(svga->gdcreg[6] & 1) && !(svga->attrregs[0x10] & 1)) { /*Text mode*/
-            if (svga->seqregs[1] & 8) /*40 column*/ {
+            if (svga->seqregs[1] & 8) { /*40 column*/
                 svga->render = svga_render_text_40;
                 svga->hdisp *= (svga->seqregs[1] & 1) ? 16 : 18;
                 /* Character clock is off by 1 now in 40-line modes, on all cards. */

From 253ca29746bcb26b41aada0f3bc4c3b52adfb609 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Sun, 6 Nov 2022 18:55:55 -0500
Subject: [PATCH 2/2] Fix compile error

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

diff --git a/src/video/vid_voodoo_banshee_blitter.c b/src/video/vid_voodoo_banshee_blitter.c
index ed1b57e63..ef3b3bc1b 100644
--- a/src/video/vid_voodoo_banshee_blitter.c
+++ b/src/video/vid_voodoo_banshee_blitter.c
@@ -109,7 +109,7 @@ bansheeblt_log(const char *fmt, ...)
     }
 }
 #else
-#    define banshee_log(fmt, ...)
+#    define bansheeblt_log(fmt, ...)
 #endif
 
 static int