From f18da85438dd1c0c6aaa7125cf55ebe1716c264a Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Sun, 20 Feb 2022 19:11:58 -0500
Subject: [PATCH] A few lconsistency changes form M&K branch

---
 src/CMakeLists.txt         |  2 +-
 src/include/86box/device.h | 22 +++++++++++-----------
 src/video/vid_et4000.c     |  2 +-
 src/video/vid_oak_oti.c    |  7 +++++--
 src/video/vid_svga.c       |  1 +
 src/win/Makefile.mingw     |  1 +
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 674346065..8f1465d1e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -201,7 +201,7 @@ add_subdirectory(scsi)
 add_subdirectory(sound)
 add_subdirectory(video)
 if (APPLE)
-	add_subdirectory(mac)
+    add_subdirectory(mac)
 endif()
 
 if (QT)
diff --git a/src/include/86box/device.h b/src/include/86box/device.h
index f3f3261f6..8c71a6ee3 100644
--- a/src/include/86box/device.h
+++ b/src/include/86box/device.h
@@ -40,17 +40,17 @@
 # define EMU_DEVICE_H
 
 
-#define CONFIG_STRING		0
-#define CONFIG_INT		1
-#define CONFIG_BINARY		2
-#define CONFIG_SELECTION	3
-#define CONFIG_MIDI_OUT		4
-#define CONFIG_FNAME		5
-#define CONFIG_SPINNER		6
-#define CONFIG_HEX16		7
-#define CONFIG_HEX20		8
-#define CONFIG_MAC		9
-#define CONFIG_MIDI_IN  10
+#define CONFIG_STRING		 0
+#define CONFIG_INT			 1
+#define CONFIG_BINARY		 2
+#define CONFIG_SELECTION	 3
+#define CONFIG_MIDI_OUT		 4
+#define CONFIG_FNAME		 5
+#define CONFIG_SPINNER		 6
+#define CONFIG_HEX16		 7
+#define CONFIG_HEX20		 8
+#define CONFIG_MAC			 9
+#define CONFIG_MIDI_IN		10
 
 
 enum {
diff --git a/src/video/vid_et4000.c b/src/video/vid_et4000.c
index f8ac03948..0254a8509 100644
--- a/src/video/vid_et4000.c
+++ b/src/video/vid_et4000.c
@@ -54,7 +54,7 @@
 #include <86box/vid_svga_render.h>
 
 
-#define BIOS_ROM_PATH		"roms/video/et4000/ET4000.BIN"
+#define BIOS_ROM_PATH			"roms/video/et4000/ET4000.BIN"
 #define KOREAN_BIOS_ROM_PATH 	"roms/video/et4000/tgkorvga.bin"
 #define KOREAN_FONT_ROM_PATH 	"roms/video/et4000/tg_ksc5601.rom"
 #define KASAN_BIOS_ROM_PATH 	"roms/video/et4000/et4000_kasan16.bin"
diff --git a/src/video/vid_oak_oti.c b/src/video/vid_oak_oti.c
index 5cc6f4bd5..0902d33ee 100644
--- a/src/video/vid_oak_oti.c
+++ b/src/video/vid_oak_oti.c
@@ -30,11 +30,11 @@
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
 
-#define BIOS_037C_PATH		"roms/video/oti/bios.bin"
+#define BIOS_037C_PATH			"roms/video/oti/bios.bin"
 #define BIOS_067_AMA932J_PATH	"roms/machines/ama932j/OTI067.BIN"
 #define BIOS_067_M300_08_PATH	"roms/machines/m30008/EVC_BIOS.ROM"
 #define BIOS_067_M300_15_PATH	"roms/machines/m30015/EVC_BIOS.ROM"
-#define BIOS_077_PATH		"roms/video/oti/oti077.vbi"
+#define BIOS_077_PATH			"roms/video/oti/oti077.vbi"
 
 
 enum {
@@ -476,18 +476,21 @@ oti037c_available(void)
     return(rom_present(BIOS_037C_PATH));
 }
 
+
 static int
 oti067_ama932j_available(void)
 {
     return(rom_present(BIOS_067_AMA932J_PATH));
 }
 
+
 static int
 oti067_077_available(void)
 {
     return(rom_present(BIOS_077_PATH));
 }
 
+
 static int
 oti067_m300_available(void)
 {
diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index 22fc22f48..9640b5540 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -783,6 +783,7 @@ svga_poll(void *p)
 				svga->ma = svga->maback = ((svga->crtc[5] & 0x60) >> 5);
 			svga->ma = (svga->ma << 2);
 			svga->maback = (svga->maback << 2);
+
 			svga->sc = 0;
 			if (svga->attrregs[0x10] & 0x20) {
 				svga->scrollcache = 0;
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 380fa658d..6c5b92114 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -1,4 +1,5 @@
 #
+#
 # 86Box		A hypervisor and IBM PC system emulator that specializes in
 #		running old operating systems and software designed for IBM
 #		PC systems and compatibles from 1981 through fairly recent