diff --git a/src/acpi.c b/src/acpi.c
index 81ba781ab..157e3cadd 100644
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -1723,6 +1723,7 @@ acpi_init(const device_t *info)
             dev->suspend_types[2] = SUS_SUSPEND | SUS_NVR | SUS_RESET_CPU | SUS_RESET_PCI;
             dev->suspend_types[3] = SUS_SUSPEND;
             dev->suspend_types[5] = SUS_POWER_OFF; /* undocumented, used for S4/S5 by ASUS P5A ACPI table */
+            dev->suspend_types[7] = SUS_POWER_OFF; /* undocumented, used for S5 by Gigabyte GA-5AX ACPI table */
             break;
 
         case VEN_VIA:
diff --git a/src/chipset/umc_8886.c b/src/chipset/umc_8886.c
index c612e1974..ded9c7e56 100644
--- a/src/chipset/umc_8886.c
+++ b/src/chipset/umc_8886.c
@@ -202,7 +202,7 @@ umc_8886_write(int func, int addr, uint8_t val, void *priv)
                     case 0x56:
                         dev->pci_conf_sb[func][addr] = val;
 
-                        switch (val & 2) {
+                        switch (val & 3) {
                             case 0:
                                 cpu_set_isa_pci_div(3);
                                 break;
diff --git a/src/include/86box/vid_8514a.h b/src/include/86box/vid_8514a.h
index 7cc6a0ee3..b2932c725 100644
--- a/src/include/86box/vid_8514a.h
+++ b/src/include/86box/vid_8514a.h
@@ -31,9 +31,13 @@ typedef struct ibm8514_t {
     uint32_t vram_mask;
 
     PALETTE   vgapal;
-    uint8_t   dac_mask, dac_status;
+    uint8_t   dac_mask;
+    uint8_t   dac_status;
     uint32_t *map8;
-    int       dac_addr, dac_pos, dac_r, dac_g;
+    int       dac_addr;
+    int       dac_pos;
+    int       dac_r;
+    int       dac_g;
     int       internal_pitch;
 
     struct {
@@ -143,7 +147,7 @@ typedef struct ibm8514_t {
 
     uint8_t *vram;
     uint8_t *changedvram;
-    uint8_t linedbl;
+    uint8_t  linedbl;
 
     uint8_t data_available;
     uint8_t data_available2;
diff --git a/src/include/86box/vid_cga.h b/src/include/86box/vid_cga.h
index 414460acc..f49fc73cc 100644
--- a/src/include/86box/vid_cga.h
+++ b/src/include/86box/vid_cga.h
@@ -69,12 +69,12 @@ typedef struct cga_t {
 } cga_t;
 
 void    cga_init(cga_t *cga);
-void    cga_out(uint16_t addr, uint8_t val, void *p);
-uint8_t cga_in(uint16_t addr, void *p);
-void    cga_write(uint32_t addr, uint8_t val, void *p);
-uint8_t cga_read(uint32_t addr, void *p);
+void    cga_out(uint16_t addr, uint8_t val, void *priv);
+uint8_t cga_in(uint16_t addr, void *priv);
+void    cga_write(uint32_t addr, uint8_t val, void *priv);
+uint8_t cga_read(uint32_t addr, void *priv);
 void    cga_recalctimings(cga_t *cga);
-void    cga_poll(void *p);
+void    cga_poll(void *priv);
 
 #ifdef EMU_DEVICE_H
 extern const device_config_t cga_config[];
diff --git a/src/include/86box/vid_cga_comp.h b/src/include/86box/vid_cga_comp.h
index 3c7916034..291145291 100644
--- a/src/include/86box/vid_cga_comp.h
+++ b/src/include/86box/vid_cga_comp.h
@@ -21,13 +21,11 @@
 #ifndef VIDEO_CGA_COMP_H
 #define VIDEO_CGA_COMP_H
 
-#define Bit8u  uint8_t
-#define Bit32u uint32_t
-#define Bitu   unsigned int
-#define bool   uint8_t
+#define Bitu unsigned int
+#define bool uint8_t
 
 void    update_cga16_color(uint8_t cgamode);
 void    cga_comp_init(int revision);
-Bit32u *Composite_Process(uint8_t cgamode, Bit8u border, Bit32u blocks /*, bool doublewidth*/, Bit32u *TempLine);
+Bit32u *Composite_Process(uint8_t cgamode, uint8_t border, uint32_t blocks /*, bool doublewidth*/, uint32_t *TempLine);
 
 #endif /*VIDEO_CGA_COMP_H*/
diff --git a/src/include/86box/vid_ega_render_remap.h b/src/include/86box/vid_ega_render_remap.h
index 37f6904db..b01bb2b0e 100644
--- a/src/include/86box/vid_ega_render_remap.h
+++ b/src/include/86box/vid_ega_render_remap.h
@@ -85,7 +85,7 @@ ega_recalc_remap_func(ega_t *ega)
         func_nr = VAR_DWORD_MODE;
     else if (ega->crtc[0x17] & 0x40)
         func_nr = VAR_BYTE_MODE;
-    else if ((ega->crtc[0x17] & 0x20) && ega->vram_limit > 64*1024)
+    else if ((ega->crtc[0x17] & 0x20) && ega->vram_limit > 64 * 1024)
         func_nr = VAR_WORD_MODE_MA15;
     else
         func_nr = VAR_WORD_MODE_MA13;
diff --git a/src/include/86box/vid_mda.h b/src/include/86box/vid_mda.h
index 37a4f6b21..ea98bef61 100644
--- a/src/include/86box/vid_mda.h
+++ b/src/include/86box/vid_mda.h
@@ -52,12 +52,12 @@ typedef struct mda_t {
 
 void    mda_init(mda_t *mda);
 void    mda_setcol(int chr, int blink, int fg, uint8_t cga_ink);
-void    mda_out(uint16_t addr, uint8_t val, void *p);
-uint8_t mda_in(uint16_t addr, void *p);
-void    mda_write(uint32_t addr, uint8_t val, void *p);
-uint8_t mda_read(uint32_t addr, void *p);
+void    mda_out(uint16_t addr, uint8_t val, void *priv);
+uint8_t mda_in(uint16_t addr, void *priv);
+void    mda_write(uint32_t addr, uint8_t val, void *priv);
+uint8_t mda_read(uint32_t addr, void *priv);
 void    mda_recalctimings(mda_t *mda);
-void    mda_poll(void *p);
+void    mda_poll(void *priv);
 
 #ifdef EMU_DEVICE_H
 extern const device_t mda_device;
diff --git a/src/include/86box/vid_svga.h b/src/include/86box/vid_svga.h
index 2fc877f16..ab8144a77 100644
--- a/src/include/86box/vid_svga.h
+++ b/src/include/86box/vid_svga.h
@@ -31,7 +31,7 @@
 #    define FLAG_NOSKEW       16
 #    define FLAG_ADDR_BY16    32
 #    define FLAG_RAMDAC_SHIFT 64
-#    define FLAG_ATI      	  128
+#    define FLAG_ATI          128
 #    define FLAG_S3_911_16BIT 256
 #    define FLAG_512K_MASK    512
 struct monitor_t;
@@ -144,24 +144,24 @@ typedef struct svga_t {
       For the example memory map, decode_mask would be 4MB-1 (4MB address space), vram_max would be 2MB
       (present video memory only responds to first 2MB), vram_mask would be 1MB-1 (video memory wraps at 1MB)
     */
-    uint32_t decode_mask;
-    uint32_t vram_max;
-    uint32_t vram_mask;
-    uint32_t charseta;
-    uint32_t charsetb;
-    uint32_t adv_flags;
-    uint32_t ma_latch;
-    uint32_t ca_adj;
-    uint32_t ma;
-    uint32_t maback;
-    uint32_t write_bank;
-    uint32_t read_bank;
-    uint32_t extra_banks[2];
-    uint32_t banked_mask;
-    uint32_t ca;
-    uint32_t overscan_color;
+    uint32_t  decode_mask;
+    uint32_t  vram_max;
+    uint32_t  vram_mask;
+    uint32_t  charseta;
+    uint32_t  charsetb;
+    uint32_t  adv_flags;
+    uint32_t  ma_latch;
+    uint32_t  ca_adj;
+    uint32_t  ma;
+    uint32_t  maback;
+    uint32_t  write_bank;
+    uint32_t  read_bank;
+    uint32_t  extra_banks[2];
+    uint32_t  banked_mask;
+    uint32_t  ca;
+    uint32_t  overscan_color;
     uint32_t *map8;
-    uint32_t pallook[512];
+    uint32_t  pallook[512];
 
     PALETTE vgapal;
 
@@ -183,8 +183,8 @@ typedef struct svga_t {
     void (*render)(struct svga_t *svga);
     void (*recalctimings_ex)(struct svga_t *svga);
 
-    void (*video_out)(uint16_t addr, uint8_t val, void *p);
-    uint8_t (*video_in)(uint16_t addr, void *p);
+    void (*video_out)(uint16_t addr, uint8_t val, void *priv);
+    uint8_t (*video_in)(uint16_t addr, void *priv);
 
     void (*hwcursor_draw)(struct svga_t *svga, int displine);
 
@@ -195,7 +195,7 @@ typedef struct svga_t {
     void (*vblank_start)(struct svga_t *svga);
 
     void (*ven_write)(struct svga_t *svga, uint8_t val, uint32_t addr);
-    float (*getclock)(int clock, void *p);
+    float (*getclock)(int clock, void *priv);
 
     /* Called when VC=R18 and friends. If this returns zero then MA resetting
        is skipped. Matrox Mystique in Power mode reuses this counter for
@@ -205,17 +205,17 @@ typedef struct svga_t {
     /*Called at the start of vertical sync*/
     void (*vsync_callback)(struct svga_t *svga);
 
-    uint32_t (*translate_address)(uint32_t addr, void *p);
+    uint32_t (*translate_address)(uint32_t addr, void *priv);
     /*If set then another device is driving the monitor output and the SVGA
       card should not attempt to display anything */
     int   override;
     void *priv;
 
-    uint8_t crtc[256];
-    uint8_t gdcreg[256];
-    uint8_t attrregs[32];
-    uint8_t seqregs[256];
-    uint8_t egapal[16];
+    uint8_t  crtc[256];
+    uint8_t  gdcreg[256];
+    uint8_t  attrregs[32];
+    uint8_t  seqregs[256];
+    uint8_t  egapal[16];
     uint8_t *vram;
     uint8_t *changedvram;
 
@@ -266,55 +266,55 @@ typedef struct svga_t {
     uint8_t monitor_index;
 
     /* Pointer to monitor */
-    monitor_t* monitor;
+    monitor_t *monitor;
 } svga_t;
 
 extern int vga_on;
 extern int ibm8514_on;
 
-extern void ibm8514_poll(ibm8514_t *dev, svga_t *svga);
-extern void ibm8514_recalctimings(svga_t *svga);
-extern uint8_t ibm8514_ramdac_in(uint16_t port, void *p);
-extern void ibm8514_ramdac_out(uint16_t port, uint8_t val, void *p);
-extern int ibm8514_cpu_src(svga_t *svga);
-extern int ibm8514_cpu_dest(svga_t *svga);
-extern void ibm8514_accel_out_pixtrans(svga_t *svga, uint16_t port, uint16_t val, int len);
-extern void ibm8514_short_stroke_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, svga_t *svga, uint8_t ssv, int len);
-extern void ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, svga_t *svga, int len);
+extern void    ibm8514_poll(ibm8514_t *dev, svga_t *svga);
+extern void    ibm8514_recalctimings(svga_t *svga);
+extern uint8_t ibm8514_ramdac_in(uint16_t port, void *priv);
+extern void    ibm8514_ramdac_out(uint16_t port, uint8_t val, void *priv);
+extern int     ibm8514_cpu_src(svga_t *svga);
+extern int     ibm8514_cpu_dest(svga_t *svga);
+extern void    ibm8514_accel_out_pixtrans(svga_t *svga, uint16_t port, uint16_t val, int len);
+extern void    ibm8514_short_stroke_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, svga_t *svga, uint8_t ssv, int len);
+extern void    ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, svga_t *svga, int len);
 
 extern void xga_poll(xga_t *xga, svga_t *svga);
 extern void xga_recalctimings(svga_t *svga);
 
-extern int  svga_init(const device_t *info, svga_t *svga, void *p, int memsize,
+extern int  svga_init(const device_t *info, svga_t *svga, void *priv, int memsize,
                       void (*recalctimings_ex)(struct svga_t *svga),
-                      uint8_t (*video_in)(uint16_t addr, void *p),
-                      void (*video_out)(uint16_t addr, uint8_t val, void *p),
+                      uint8_t (*video_in)(uint16_t addr, void *priv),
+                      void (*video_out)(uint16_t addr, uint8_t val, void *priv),
                       void (*hwcursor_draw)(struct svga_t *svga, int displine),
                       void (*overlay_draw)(struct svga_t *svga, int displine));
 extern void svga_recalctimings(svga_t *svga);
 extern void svga_close(svga_t *svga);
 
-uint8_t  svga_read(uint32_t addr, void *p);
-uint16_t svga_readw(uint32_t addr, void *p);
-uint32_t svga_readl(uint32_t addr, void *p);
-void     svga_write(uint32_t addr, uint8_t val, void *p);
-void     svga_writew(uint32_t addr, uint16_t val, void *p);
-void     svga_writel(uint32_t addr, uint32_t val, void *p);
-uint8_t  svga_read_linear(uint32_t addr, void *p);
-uint8_t  svga_readb_linear(uint32_t addr, void *p);
-uint16_t svga_readw_linear(uint32_t addr, void *p);
-uint32_t svga_readl_linear(uint32_t addr, void *p);
-void     svga_write_linear(uint32_t addr, uint8_t val, void *p);
-void     svga_writeb_linear(uint32_t addr, uint8_t val, void *p);
-void     svga_writew_linear(uint32_t addr, uint16_t val, void *p);
-void     svga_writel_linear(uint32_t addr, uint32_t val, void *p);
+uint8_t  svga_read(uint32_t addr, void *priv);
+uint16_t svga_readw(uint32_t addr, void *priv);
+uint32_t svga_readl(uint32_t addr, void *priv);
+void     svga_write(uint32_t addr, uint8_t val, void *priv);
+void     svga_writew(uint32_t addr, uint16_t val, void *priv);
+void     svga_writel(uint32_t addr, uint32_t val, void *priv);
+uint8_t  svga_read_linear(uint32_t addr, void *priv);
+uint8_t  svga_readb_linear(uint32_t addr, void *priv);
+uint16_t svga_readw_linear(uint32_t addr, void *priv);
+uint32_t svga_readl_linear(uint32_t addr, void *priv);
+void     svga_write_linear(uint32_t addr, uint8_t val, void *priv);
+void     svga_writeb_linear(uint32_t addr, uint8_t val, void *priv);
+void     svga_writew_linear(uint32_t addr, uint16_t val, void *priv);
+void     svga_writel_linear(uint32_t addr, uint32_t val, void *priv);
 
-void svga_add_status_info(char *s, int max_len, void *p);
+void svga_add_status_info(char *s, int max_len, void *priv);
 
 extern uint8_t svga_rotate[8][256];
 
-void    svga_out(uint16_t addr, uint8_t val, void *p);
-uint8_t svga_in(uint16_t addr, void *p);
+void    svga_out(uint16_t addr, uint8_t val, void *priv);
+uint8_t svga_in(uint16_t addr, void *priv);
 
 svga_t *svga_get_pri(void);
 void    svga_set_override(svga_t *svga, int val);
@@ -334,65 +334,65 @@ enum {
 
 /* We need a way to add a device with a pointer to a parent device so it can attach itself to it, and
    possibly also a second ATi 68860 RAM DAC type that auto-sets SVGA render on RAM DAC render change. */
-extern void    ati68860_ramdac_out(uint16_t addr, uint8_t val, void *p, svga_t *svga);
-extern uint8_t ati68860_ramdac_in(uint16_t addr, void *p, svga_t *svga);
-extern void    ati68860_set_ramdac_type(void *p, int type);
-extern void    ati68860_ramdac_set_render(void *p, svga_t *svga);
-extern void    ati68860_ramdac_set_pallook(void *p, int i, uint32_t col);
+extern void    ati68860_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga);
+extern uint8_t ati68860_ramdac_in(uint16_t addr, void *priv, svga_t *svga);
+extern void    ati68860_set_ramdac_type(void *priv, int type);
+extern void    ati68860_ramdac_set_render(void *priv, svga_t *svga);
+extern void    ati68860_ramdac_set_pallook(void *priv, int i, uint32_t col);
 extern void    ati68860_hwcursor_draw(svga_t *svga, int displine);
 
-extern void    att49x_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *p, svga_t *svga);
-extern uint8_t att49x_ramdac_in(uint16_t addr, int rs2, void *p, svga_t *svga);
+extern void    att49x_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv, svga_t *svga);
+extern uint8_t att49x_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga);
 
-extern void    att498_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *p, svga_t *svga);
-extern uint8_t att498_ramdac_in(uint16_t addr, int rs2, void *p, svga_t *svga);
-extern float   av9194_getclock(int clock, void *p);
+extern void    att498_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv, svga_t *svga);
+extern uint8_t att498_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga);
+extern float   av9194_getclock(int clock, void *priv);
 
-extern void    bt48x_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *p, svga_t *svga);
-extern uint8_t bt48x_ramdac_in(uint16_t addr, int rs2, int rs3, void *p, svga_t *svga);
-extern void    bt48x_recalctimings(void *p, svga_t *svga);
+extern void    bt48x_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *priv, svga_t *svga);
+extern uint8_t bt48x_ramdac_in(uint16_t addr, int rs2, int rs3, void *priv, svga_t *svga);
+extern void    bt48x_recalctimings(void *priv, svga_t *svga);
 extern void    bt48x_hwcursor_draw(svga_t *svga, int displine);
 
-extern void    ibm_rgb528_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *p, svga_t *svga);
-extern uint8_t ibm_rgb528_ramdac_in(uint16_t addr, int rs2, void *p, svga_t *svga);
-extern void    ibm_rgb528_recalctimings(void *p, svga_t *svga);
+extern void    ibm_rgb528_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv, svga_t *svga);
+extern uint8_t ibm_rgb528_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga);
+extern void    ibm_rgb528_recalctimings(void *priv, svga_t *svga);
 extern void    ibm_rgb528_hwcursor_draw(svga_t *svga, int displine);
 
-extern void  icd2061_write(void *p, int val);
-extern float icd2061_getclock(int clock, void *p);
+extern void  icd2061_write(void *priv, int val);
+extern float icd2061_getclock(int clock, void *priv);
 
 /* The code is the same, the #define's are so that the correct name can be used. */
 #    define ics9161_write    icd2061_write
 #    define ics9161_getclock icd2061_getclock
 
-extern float ics2494_getclock(int clock, void *p);
+extern float ics2494_getclock(int clock, void *priv);
 
-extern void   ics2595_write(void *p, int strobe, int dat);
-extern double ics2595_getclock(void *p);
-extern void   ics2595_setclock(void *p, double clock);
+extern void   ics2595_write(void *priv, int strobe, int dat);
+extern double ics2595_getclock(void *priv);
+extern void   ics2595_setclock(void *priv, double clock);
 
-extern void    sc1148x_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *p, svga_t *svga);
-extern uint8_t sc1148x_ramdac_in(uint16_t addr, int rs2, void *p, svga_t *svga);
+extern void    sc1148x_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv, svga_t *svga);
+extern uint8_t sc1148x_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga);
 
-extern void    sc1502x_ramdac_out(uint16_t addr, uint8_t val, void *p, svga_t *svga);
-extern uint8_t sc1502x_ramdac_in(uint16_t addr, void *p, svga_t *svga);
+extern void    sc1502x_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga);
+extern uint8_t sc1502x_ramdac_in(uint16_t addr, void *priv, svga_t *svga);
 
-extern void    sdac_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *p, svga_t *svga);
-extern uint8_t sdac_ramdac_in(uint16_t addr, int rs2, void *p, svga_t *svga);
-extern float   sdac_getclock(int clock, void *p);
+extern void    sdac_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv, svga_t *svga);
+extern uint8_t sdac_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga);
+extern float   sdac_getclock(int clock, void *priv);
 
-extern void    stg_ramdac_out(uint16_t addr, uint8_t val, void *p, svga_t *svga);
-extern uint8_t stg_ramdac_in(uint16_t addr, void *p, svga_t *svga);
-extern float   stg_getclock(int clock, void *p);
+extern void    stg_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga);
+extern uint8_t stg_ramdac_in(uint16_t addr, void *priv, svga_t *svga);
+extern float   stg_getclock(int clock, void *priv);
 
-extern void    tkd8001_ramdac_out(uint16_t addr, uint8_t val, void *p, svga_t *svga);
-extern uint8_t tkd8001_ramdac_in(uint16_t addr, void *p, svga_t *svga);
+extern void    tkd8001_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga);
+extern uint8_t tkd8001_ramdac_in(uint16_t addr, void *priv, svga_t *svga);
 
-extern void    tvp3026_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *p, svga_t *svga);
-extern uint8_t tvp3026_ramdac_in(uint16_t addr, int rs2, int rs3, void *p, svga_t *svga);
-extern void    tvp3026_recalctimings(void *p, svga_t *svga);
+extern void    tvp3026_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *priv, svga_t *svga);
+extern uint8_t tvp3026_ramdac_in(uint16_t addr, int rs2, int rs3, void *priv, svga_t *svga);
+extern void    tvp3026_recalctimings(void *priv, svga_t *svga);
 extern void    tvp3026_hwcursor_draw(svga_t *svga, int displine);
-extern float   tvp3026_getclock(int clock, void *p);
+extern float   tvp3026_getclock(int clock, void *priv);
 
 #    ifdef EMU_DEVICE_H
 extern const device_t ati68860_ramdac_device;
diff --git a/src/include/86box/vid_vga.h b/src/include/86box/vid_vga.h
index 08a1a2591..bc552b285 100644
--- a/src/include/86box/vid_vga.h
+++ b/src/include/86box/vid_vga.h
@@ -30,7 +30,7 @@ typedef struct vga_t {
 
 static video_timings_t timing_vga = { VIDEO_ISA, 8, 16, 32, 8, 16, 32 };
 
-void    vga_out(uint16_t addr, uint8_t val, void *p);
-uint8_t vga_in(uint16_t addr, void *p);
+void    vga_out(uint16_t addr, uint8_t val, void *priv);
+uint8_t vga_in(uint16_t addr, void *priv);
 
 #endif /*VIDEO_VGA_H*/
diff --git a/src/include/86box/vid_xga.h b/src/include/86box/vid_xga.h
index 4401c507d..b022aff28 100644
--- a/src/include/86box/vid_xga.h
+++ b/src/include/86box/vid_xga.h
@@ -20,7 +20,7 @@
 
 #include <86box/rom.h>
 
-typedef struct {
+typedef struct xga_hwcursor_t {
     int      ena;
     int      x;
     int      y;
@@ -36,12 +36,15 @@ typedef struct xga_t {
     mem_mapping_t  linear_mapping;
     mem_mapping_t  video_mapping;
     rom_t          bios_rom;
-    rom_t		   vga_bios_rom;
-    xga_hwcursor_t hwcursor, hwcursor_latch;
+    rom_t          vga_bios_rom;
+    xga_hwcursor_t hwcursor;
+    xga_hwcursor_t hwcursor_latch;
     PALETTE        extpal;
 
-    uint8_t test, atest[2], testpixel;
-    ;
+    uint8_t test;
+    uint8_t atest[2];
+    uint8_t testpixel;
+
     uint8_t  pos_regs[8];
     uint8_t  disp_addr;
     uint8_t  cfg_reg;
@@ -54,34 +57,44 @@ typedef struct xga_t {
     uint8_t  regs_idx;
     uint8_t  hwc_hotspot_x;
     uint8_t  hwc_hotspot_y;
-    uint8_t  disp_cntl_1, disp_cntl_2;
-    uint8_t  clk_sel_1, clk_sel_2;
+    uint8_t  disp_cntl_1;
+    uint8_t  disp_cntl_2;
+    uint8_t  clk_sel_1;
+    uint8_t  clk_sel_2;
     uint8_t  hwc_control;
     uint8_t  bus_arb;
     uint8_t  isa_pos_enable;
     uint8_t  hwcursor_oddeven;
     uint8_t  cfg_reg_instance;
     uint8_t  rowcount;
-    uint8_t  pal_idx, pal_idx_prefetch;
+    uint8_t  pal_idx;
+    uint8_t  pal_idx_prefetch;
     uint8_t  pal_seq;
     uint8_t  pal_mask;
-    uint8_t  pal_r, pal_r_prefetch;
-    uint8_t  pal_g, pal_g_prefetch;
-    uint8_t  pal_b, pal_b_prefetch;
+    uint8_t  pal_r;
+    uint8_t  pal_r_prefetch;
+    uint8_t  pal_g;
+    uint8_t  pal_g_prefetch;
+    uint8_t  pal_b;
+    uint8_t  pal_b_prefetch;
     uint8_t  sprite_data[1024];
     uint8_t  scrollcache;
     uint8_t  border_color;
     uint8_t  direct_color;
     uint8_t  dma_channel;
-    uint8_t  instance_isa, instance_num, ext_mem_addr;
-    uint8_t *vram, *changedvram;
+    uint8_t  instance_isa;
+    uint8_t  instance_num;
+    uint8_t  ext_mem_addr;
+    uint8_t *vram;
+    uint8_t *changedvram;
 
     int16_t hwc_pos_x;
     int16_t hwc_pos_y;
 
     uint16_t pos_idx;
     uint16_t htotal;
-    uint16_t sprite_idx, sprite_idx_prefetch;
+    uint16_t sprite_idx;
+    uint16_t sprite_idx_prefetch;
     uint16_t hdisp;
     uint16_t vtotal;
     uint16_t vdispend;
@@ -89,41 +102,74 @@ typedef struct xga_t {
     uint16_t vsyncstart;
     uint16_t linecmp;
     uint16_t pix_map_width;
-    uint16_t sprite_pal_addr_idx, old_pal_addr_idx;
+    uint16_t sprite_pal_addr_idx;
+    uint16_t old_pal_addr_idx;
     uint16_t sprite_pal_addr_idx_prefetch;
 
-    int v_total, dispend, v_syncstart, split, v_blankstart,
-        h_disp, h_disp_old, h_total, h_disp_time, rowoffset,
-        dispon, h_disp_on, vc, sc, linepos, oddeven, firstline, lastline,
-        firstline_draw, lastline_draw, displine, fullchange, interlace,
-        char_width, hwcursor_on;
-    int pal_pos, pal_pos_prefetch;
+    int v_total;
+    int dispend;
+    int v_syncstart;
+    int split;
+    int v_blankstart;
+    int h_disp;
+    int h_disp_old;
+    int h_total;
+    int h_disp_time;
+    int rowoffset;
+    int dispon;
+    int h_disp_on;
+    int vc;
+    int sc;
+    int linepos;
+    int oddeven;
+    int firstline;
+    int lastline;
+    int firstline_draw;
+    int lastline_draw;
+    int displine;
+    int fullchange;
+    int interlace;
+    int char_width;
+    int hwcursor_on;
+    int pal_pos;
+    int pal_pos_prefetch;
     int on;
-    int op_mode_reset, linear_endian_reverse;
-    int sprite_pos, sprite_pos_prefetch, cursor_data_on;
-    int pal_test, a5_test;
-    int type, bus;
+    int op_mode_reset;
+    int linear_endian_reverse;
+    int sprite_pos;
+    int sprite_pos_prefetch;
+    int cursor_data_on;
+    int pal_test;
+    int a5_test;
+    int type;
+    int bus;
 
-    uint32_t linear_base, linear_size, banked_mask;
+    uint32_t linear_base;
+    uint32_t linear_size;
+    uint32_t banked_mask;
     uint32_t base_addr_1mb;
-    uint32_t hwc_color0, hwc_color1;
+    uint32_t hwc_color0;
+    uint32_t hwc_color1;
     uint32_t disp_start_addr;
     uint32_t ma_latch;
     uint32_t vram_size;
     uint32_t vram_mask;
     uint32_t rom_addr;
-    uint32_t ma, maback;
+    uint32_t ma;
+    uint32_t maback;
     uint32_t extpallook[256];
-    uint32_t read_bank, write_bank;
+    uint32_t read_bank;
+    uint32_t write_bank;
     uint32_t px_map_base;
 
-    uint64_t dispontime, dispofftime;
+    uint64_t dispontime;
+    uint64_t dispofftime;
 
-    struct
-    {
+    struct {
         uint8_t control;
         uint8_t px_map_idx;
-        uint8_t frgd_mix, bkgd_mix;
+        uint8_t frgd_mix;
+        uint8_t bkgd_mix;
         uint8_t cc_cond;
         uint8_t octant;
         uint8_t draw_mode;
@@ -134,15 +180,19 @@ typedef struct xga_t {
         uint8_t short_stroke_vector4;
 
         int16_t bres_err_term;
-        int16_t bres_k1, bres_k2;
+        int16_t bres_k1;
+        int16_t bres_k2;
 
         uint16_t blt_width;
         uint16_t blt_height;
         uint16_t mask_map_origin_x_off;
         uint16_t mask_map_origin_y_off;
-        uint16_t src_map_x, src_map_y;
-        uint16_t dst_map_x, dst_map_y;
-        uint16_t pat_map_x, pat_map_y;
+        uint16_t src_map_x;
+        uint16_t src_map_y;
+        uint16_t dst_map_x;
+        uint16_t dst_map_y;
+        uint16_t pat_map_x;
+        uint16_t pat_map_y;
 
         int ssv_state;
         int pat_src;
@@ -150,7 +200,14 @@ typedef struct xga_t {
         int dst_map;
         int bkgd_src;
         int fore_src;
-        int x, y, sx, sy, dx, dy, px, py;
+        int x;
+        int y;
+        int sx;
+        int sy;
+        int dx;
+        int dy;
+        int px;
+        int py;
         int pattern;
         int command_len;
 
@@ -158,7 +215,8 @@ typedef struct xga_t {
         uint32_t color_cmp;
         uint32_t carry_chain;
         uint32_t plane_mask;
-        uint32_t frgd_color, bkgd_color;
+        uint32_t frgd_color;
+        uint32_t bkgd_color;
         uint32_t command;
         uint32_t dir_cmd;
 
diff --git a/src/qt/languages/zh-TW.po b/src/qt/languages/zh-TW.po
index cb414ce92..94b0a7553 100644
--- a/src/qt/languages/zh-TW.po
+++ b/src/qt/languages/zh-TW.po
@@ -182,7 +182,7 @@ msgid "Take s&creenshot\tCtrl+F11"
 msgstr "擷圖(&C)\tCtrl+F11"
 
 msgid "&Preferences..."
-msgstr "首選項(&P)..."
+msgstr "偏好設定(&P)..."
 
 msgid "Enable &Discord integration"
 msgstr "啟用 Discord 整合(&D)"
@@ -278,7 +278,7 @@ msgid "&Remove shader"
 msgstr "移除著色器(&R)"
 
 msgid "Preferences"
-msgstr "首選項"
+msgstr "偏好設定"
 
 msgid "Sound Gain"
 msgstr "音量增益"
@@ -407,16 +407,16 @@ msgid "Joystick 4..."
 msgstr "搖桿 4..."
 
 msgid "Sound card 1:"
-msgstr "音訊卡 1:"
+msgstr "音效卡 1:"
 
 msgid "Sound card 2:"
-msgstr "音訊卡 2:"
+msgstr "音效卡 2:"
 
 msgid "Sound card 3:"
-msgstr "音訊卡 3:"
+msgstr "音效卡 3:"
 
 msgid "Sound card 4:"
-msgstr "音訊卡 4:"
+msgstr "音效卡 4:"
 
 msgid "MIDI Out Device:"
 msgstr "MIDI 輸出裝置:"
@@ -557,7 +557,7 @@ msgid "Heads:"
 msgstr "磁頭(H):"
 
 msgid "Cylinders:"
-msgstr "柱面(C):"
+msgstr "磁柱(C):"
 
 msgid "Size (MB):"
 msgstr "大小 (MB):"
diff --git a/src/sound/snd_audiopci.c b/src/sound/snd_audiopci.c
index b2fe90ca0..fb156a205 100644
--- a/src/sound/snd_audiopci.c
+++ b/src/sound/snd_audiopci.c
@@ -325,21 +325,15 @@ es1371_reset(void *priv)
 
     /* Interrupt/Chip Select Control Register, Address 00H
        Addressable as byte, word, longword */
-    dev->int_ctrl = 0xfc0f0000;
+    dev->int_ctrl = 0xfcff0000;
 
     /* Interrupt/Chip Select Control Register, Address 00H
        Addressable as longword only */
-    /* Bit 13 is supposed to be always 1 on ES1371, and one of the GPIO interrupt
-       flags on ES1373. The 5.12.01 WDM driver only initializes its GPIO interrupt
-       handler on chip revisions which support this feature (1371 >= 0x04 and 5880
-       all), but calls it anyway during interrupt servicing regardless of revision,
-       crashing on ES1371 as soon as an interrupt arrives while that bit is set.
-       Pending hardware research because actual early ES1371 cards are rare. */
-    dev->int_status = 0x7fffdec0;
+    dev->int_status = 0x7ffffec0;
 
     /* UART Status Register, Address 09H
        Addressable as byte only */
-    dev->uart_status = 0x00;
+    dev->uart_status = 0xff;
 
     /* UART Control Register, Address 09H
        Addressable as byte only */
@@ -347,15 +341,15 @@ es1371_reset(void *priv)
 
     /* UART Reserved Register, Address 0AH
        Addressable as byte only */
-    dev->uart_res = 0x00;
+    dev->uart_res = 0xff;
 
     /* Memory Page Register, Address 0CH
        Addressable as byte, word, longword */
-    dev->mem_page = 0x00;
+    dev->mem_page = 0xf0; /* FIXME: hardware reads 0xfffffff0 */
 
     /* Sample Rate Converter Interface Register, Address 10H
        Addressable as longword only */
-    dev->sr_cir = 0x00000000;
+    dev->sr_cir = 0x00470000;
 
     /* CODEC Write Register, Address 14H
        Addressable as longword only */
@@ -363,7 +357,7 @@ es1371_reset(void *priv)
 
     /* Legacy Control/Status Register, Address 18H
        Addressable as byte, word, longword */
-    dev->legacy_ctrl = 0x0000f800;
+    dev->legacy_ctrl = 0x0000f801;
 
     /* Serial Interface Control Register, Address 20H
        Addressable as byte, word, longword */
@@ -371,17 +365,17 @@ es1371_reset(void *priv)
 
     /* DAC1 Channel Sample Count Register, Address 24H
        Addressable as word, longword */
-    dev->dac[0].samp_ct      = 0x00000000;
+    dev->dac[0].samp_ct      = 0x00000000; /* FIXME: hardware reads 0x00010000 */
     dev->dac[0].curr_samp_ct = 0x00000000;
 
     /* DAC2 Channel Sample Count Register, Address 28H
        Addressable as word, longword */
-    dev->dac[1].samp_ct      = 0x00000000;
+    dev->dac[1].samp_ct      = 0x00000000; /* FIXME: hardware reads 0x00010000 */
     dev->dac[1].curr_samp_ct = 0x00000000;
 
     /* ADC Channel Sample Count Register, Address 2CH
        Addressable as word, longword */
-    dev->adc.samp_ct      = 0x00000000;
+    dev->adc.samp_ct      = 0x00000000; /* FIXME: hardware reads 0x00010000 */
     dev->adc.curr_samp_ct = 0x00000000;
 
     /* DAC1 Frame Register 1, Address 30H, Memory Page 1100b
@@ -1632,7 +1626,7 @@ es1371_pci_read(int func, int addr, void *priv)
             return 0x00;
 
         case 0x08:
-            return 0x02; /* Revision ID - 0x02 is supposed to be early Ensoniq-branded ES1371 but unconfirmed */
+            return 0x02; /* Revision ID - 0x02 is actual Ensoniq-branded ES1371 */
         case 0x09:
             return 0x00; /* Multimedia audio device */
         case 0x0a:
diff --git a/src/video/vid_8514a.c b/src/video/vid_8514a.c
index 05b00b942..b4719a539 100644
--- a/src/video/vid_8514a.c
+++ b/src/video/vid_8514a.c
@@ -212,7 +212,7 @@ int ibm8514_has_vga = 0;
 int
 ibm8514_cpu_src(svga_t *svga)
 {
-    ibm8514_t *dev = &svga->dev8514;
+    const ibm8514_t *dev = &svga->dev8514;
 
     if (!(dev->accel.cmd & 0x100))
         return 0;
@@ -226,7 +226,7 @@ ibm8514_cpu_src(svga_t *svga)
 int
 ibm8514_cpu_dest(svga_t *svga)
 {
-    ibm8514_t *dev = &svga->dev8514;
+    const ibm8514_t *dev = &svga->dev8514;
 
     if (!(dev->accel.cmd & 0x100))
         return 0;
@@ -240,16 +240,16 @@ ibm8514_cpu_dest(svga_t *svga)
 void
 ibm8514_accel_out_pixtrans(svga_t *svga, UNUSED(uint16_t port), uint16_t val, int len)
 {
-    ibm8514_t *dev = &svga->dev8514;
-    uint8_t  nibble    = 0;
-    uint32_t pixelxfer = 0;
-    uint32_t monoxfer = 0xffffffff;
-    int      pixcnt   = 0;
-    int      pixcntl  = (dev->accel.multifunc[0x0a] >> 6) & 3;
-    int      frgd_mix = (dev->accel.frgd_mix >> 5) & 3;
-    int      bkgd_mix = (dev->accel.bkgd_mix >> 5) & 3;
-    int      cmd      = dev->accel.cmd >> 13;
-    int      and3     = dev->accel.cur_x & 3;
+    ibm8514_t *dev       = &svga->dev8514;
+    uint8_t    nibble    = 0;
+    uint32_t   pixelxfer = 0;
+    uint32_t   monoxfer  = 0xffffffff;
+    int        pixcnt    = 0;
+    int        pixcntl   = (dev->accel.multifunc[0x0a] >> 6) & 3;
+    int        frgd_mix  = (dev->accel.frgd_mix >> 5) & 3;
+    int        bkgd_mix  = (dev->accel.bkgd_mix >> 5) & 3;
+    int        cmd       = dev->accel.cmd >> 13;
+    int        and3      = dev->accel.cur_x & 3;
 
     if (dev->accel.cmd & 0x100) {
         if (len != 1) {
@@ -537,7 +537,7 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
             if (len != 1)
                 dev->test = val;
 #ifdef FALLTHROUGH_ANNOTATION
-                [[fallthrough]];
+            [[fallthrough]];
 #endif
         case 0xd2e8:
             if (len == 1)
@@ -981,8 +981,8 @@ ibm8514_accel_out(uint16_t port, uint32_t val, svga_t *svga, int len)
                 if (!val)
                     break;
                 dev->accel.advfunc_cntl = val & 7;
-                ibm8514_on = (dev->accel.advfunc_cntl & 1);
-                vga_on = !ibm8514_on;
+                ibm8514_on              = (dev->accel.advfunc_cntl & 1);
+                vga_on                  = !ibm8514_on;
                 ibm8514_log("IBM 8514/A: VGA ON = %i, val = %02x\n", vga_on, val);
                 svga_recalctimings(svga);
                 break;
@@ -1013,8 +1013,8 @@ ibm8514_accel_in(uint16_t port, svga_t *svga, int len)
     ibm8514_t *dev  = &svga->dev8514;
     uint32_t   temp = 0;
     int        cmd;
-    int vpos = dev->displine + svga->y_add;
-    int vblankend = svga->vblankstart + svga->crtc[0x16];
+    int        vpos      = dev->displine + svga->y_add;
+    int        vblankend = svga->vblankstart + svga->crtc[0x16];
 
     switch (port) {
         case 0x2e8:
@@ -1024,7 +1024,7 @@ ibm8514_accel_in(uint16_t port, svga_t *svga, int len)
                 if (vpos >= svga->vblankstart || vpos <= vblankend)
                     temp |= 2;
             } else {
-                 if (vpos >= svga->vblankstart && vpos <= vblankend)
+                if (vpos >= svga->vblankstart && vpos <= vblankend)
                     temp |= 2;
             }
             break;
@@ -1059,7 +1059,7 @@ ibm8514_accel_in(uint16_t port, svga_t *svga, int len)
                 if (vpos >= svga->vblankstart || vpos <= vblankend)
                     dev->subsys_stat |= 1;
             } else {
-                 if (vpos >= svga->vblankstart && vpos <= vblankend)
+                if (vpos >= svga->vblankstart && vpos <= vblankend)
                     dev->subsys_stat |= 1;
             }
             if (len != 1) {
@@ -1140,6 +1140,7 @@ static uint8_t
 ibm8514_accel_inb(uint16_t port, void *priv)
 {
     svga_t *svga = (svga_t *) priv;
+
     return ibm8514_accel_in(port, svga, 1);
 }
 
@@ -1147,6 +1148,7 @@ static uint16_t
 ibm8514_accel_inw(uint16_t port, void *priv)
 {
     svga_t *svga = (svga_t *) priv;
+
     return ibm8514_accel_in(port, svga, 2);
 }
 
@@ -1171,8 +1173,8 @@ ibm8514_short_stroke_start(int count, int cpu_input, uint32_t mix_dat, uint32_t
 void
 ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, svga_t *svga, UNUSED(int len))
 {
-    ibm8514_t *dev = &svga->dev8514;
-    uint16_t  *vram_w = (uint16_t *)svga->vram;
+    ibm8514_t *dev     = &svga->dev8514;
+    uint16_t  *vram_w  = (uint16_t *) svga->vram;
     uint16_t   src_dat = 0;
     uint16_t   dest_dat;
     uint16_t   old_dest_dat;
@@ -1181,7 +1183,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
     uint16_t   clip_b          = dev->accel.multifunc[3];
     uint16_t   clip_r          = dev->accel.multifunc[4];
     int        pixcntl         = (dev->accel.multifunc[0x0a] >> 6) & 3;
-    uint16_t   mix_mask       = ((svga->bpp == 8) || (svga->bpp == 24)) ? 0x80 : 0x8000;
+    uint16_t   mix_mask        = ((svga->bpp == 8) || (svga->bpp == 24)) ? 0x80 : 0x8000;
     uint16_t   compare         = dev->accel.color_cmp;
     int        compare_mode    = dev->accel.multifunc[0x0a] & 0x38;
     int        cmd             = dev->accel.cmd >> 13;
@@ -1340,9 +1342,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                         READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
 
                         if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
-							old_dest_dat = dest_dat;
+                            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);
+                            dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
 
                             if (dev->accel.ssv_draw) {
                                 if ((dev->accel.cmd & 4) && dev->accel.ssv_len) {
@@ -2021,10 +2023,10 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                     dev->accel.cy |= ~0x5ff;
 
                 if (dev->local && dev->accel.ge_offset && (svga->bpp == 24))
-                    dev->accel.dest       = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
+                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
                 else
-                    dev->accel.dest       = dev->accel.cy * dev->pitch;
-                   
+                    dev->accel.dest = dev->accel.cy * dev->pitch;
+
                 dev->accel.fill_state = 0;
 
                 if (cmd == 4)
@@ -2071,7 +2073,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                     } else {
                         if (!(dev->accel.cmd & 0x40) && (frgd_mix == 2) && (bkgd_mix == 2) && (pixcntl == 0) && (cmd == 2)) {
                             if (!(dev->accel.sx & 1)) {
-                                dev->accel.output      = 1;
+                                dev->accel.output = 1;
                                 if (dev->local && dev->accel.ge_offset && (svga->bpp == 24))
                                     dev->accel.newdest_out = (dev->accel.ge_offset << 2) + ((dev->accel.cy + 1) * dev->pitch);
                                 else
@@ -2349,9 +2351,9 @@ rect_fill_pix:
                                     dev->accel.cy--;
 
                                 if (dev->local && dev->accel.ge_offset && (svga->bpp == 24))
-                                    dev->accel.dest       = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
                                 else
-                                    dev->accel.dest       = dev->accel.cy * dev->pitch;
+                                    dev->accel.dest = dev->accel.cy * dev->pitch;
 
                                 dev->accel.sy--;
                                 return;
@@ -2441,9 +2443,9 @@ rect_fill_pix:
                                     dev->accel.cy--;
 
                                 if (dev->local && dev->accel.ge_offset && (svga->bpp == 24))
-                                    dev->accel.dest       = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
+                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
                                 else
-                                    dev->accel.dest       = dev->accel.cy * dev->pitch;
+                                    dev->accel.dest = dev->accel.cy * dev->pitch;
 
                                 dev->accel.sy--;
                                 return;
@@ -2975,15 +2977,15 @@ rect_fill:
 
         case 5: /*Draw Polygon Boundary Line*/
             if (!cpu_input) {
-                dev->accel.cx    = dev->accel.cur_x;
-                dev->accel.cy    = dev->accel.cur_y;
+                dev->accel.cx = dev->accel.cur_x;
+                dev->accel.cy = dev->accel.cur_y;
                 if (dev->accel.cur_x >= 0x600)
                     dev->accel.cx |= ~0x5ff;
 
                 if (dev->accel.cur_y >= 0x600)
                     dev->accel.cy |= ~0x5ff;
                 dev->accel.oldcy = dev->accel.cy;
-                dev->accel.sy = 0;
+                dev->accel.sy    = 0;
 
                 if (ibm8514_cpu_src(svga)) {
                     dev->data_available  = 0;
@@ -3259,7 +3261,7 @@ bitblt_pix:
                                     dev->accel.cy--;
                                 }
 
-                                dev->accel.src = dev->accel.cy * dev->pitch;
+                                dev->accel.src  = dev->accel.cy * dev->pitch;
                                 dev->accel.dest = dev->accel.dy * dev->pitch;
                                 dev->accel.sy--;
                                 return;
@@ -3626,8 +3628,8 @@ bitblt:
                             int64_t cx;
                             int64_t dx;
 
-                            cx = (int64_t)dev->accel.cx;
-                            dx = (int64_t)dev->accel.dx;
+                            cx = (int64_t) dev->accel.cx;
+                            dx = (int64_t) dev->accel.dx;
 
                             while (1) {
                                 if ((dx >= (((int64_t)dev->accel.clip_left) * 3)) && (dx <= (((uint64_t)clip_r) * 3)) &&
@@ -3864,7 +3866,7 @@ ibm8514_poll(ibm8514_t *dev, svga_t *svga)
         dev->linepos = 0;
         if (dev->dispon) {
             if (dev->sc == dev->rowcount) {
-                dev->sc          = 0;
+                dev->sc = 0;
                 dev->maback += (dev->rowoffset << 3);
                 if (dev->interlace)
                     dev->maback += (dev->rowoffset << 3);
@@ -3940,13 +3942,13 @@ ibm8514_recalctimings(svga_t *svga)
     ibm8514_t *dev = &svga->dev8514;
 
     if (ibm8514_on) {
-        dev->h_disp                     = (dev->hdisp + 1) << 3;
-        dev->pitch                      = (dev->accel.advfunc_cntl & 4) ? 1024 : 640;
-        dev->h_total                    = (dev->htotal + 1);
-        dev->v_total                    = (dev->vtotal + 1);
-        dev->v_syncstart                = (dev->vsyncstart + 1);
-        dev->rowcount                  = !!(dev->disp_cntl & 0x08);
-        dev->dispend                   = ((dev->vdisp >> 1) + 1);
+        dev->h_disp      = (dev->hdisp + 1) << 3;
+        dev->pitch       = (dev->accel.advfunc_cntl & 4) ? 1024 : 640;
+        dev->h_total     = (dev->htotal + 1);
+        dev->v_total     = (dev->vtotal + 1);
+        dev->v_syncstart = (dev->vsyncstart + 1);
+        dev->rowcount    = !!(dev->disp_cntl & 0x08);
+        dev->dispend     = ((dev->vdisp >> 1) + 1);
         if (dev->dispend == 766)
             dev->dispend = 768;
 
@@ -3956,9 +3958,9 @@ ibm8514_recalctimings(svga_t *svga)
         if (dev->accel.advfunc_cntl & 4) {
             if (!vga_on && dev->ibm_mode) {
                 if (dev->h_disp == 8) {
-                    dev->h_disp = 1024;
-                    dev->dispend = 768;
-                    dev->v_total = 1536;
+                    dev->h_disp      = 1024;
+                    dev->dispend     = 768;
+                    dev->v_total     = 1536;
                     dev->v_syncstart = 1536;
                 }
             }
@@ -3976,7 +3978,7 @@ ibm8514_recalctimings(svga_t *svga)
             }
 
             if (ibm8514_has_vga) {
-                dev->pitch = dev->ext_pitch;
+                dev->pitch     = dev->ext_pitch;
                 dev->rowoffset = dev->ext_crt_pitch;
             } else
                 dev->rowoffset = 128;
@@ -3986,7 +3988,7 @@ ibm8514_recalctimings(svga_t *svga)
         } else {
             if (!vga_on && dev->ibm_mode) {
                 if (dev->h_disp == 1024) {
-                    dev->h_disp = 640;
+                    dev->h_disp  = 640;
                     dev->dispend = 480;
                 }
             }
@@ -4001,7 +4003,7 @@ ibm8514_recalctimings(svga_t *svga)
             }
 
             if (ibm8514_has_vga) {
-                dev->pitch = dev->ext_pitch;
+                dev->pitch     = dev->ext_pitch;
                 dev->rowoffset = dev->ext_crt_pitch;
             } else
                 dev->rowoffset = 128;
@@ -4017,8 +4019,8 @@ ibm8514_recalctimings(svga_t *svga)
 static uint8_t
 ibm8514_mca_read(int port, void *priv)
 {
-    svga_t    *svga = (svga_t *) priv;
-    ibm8514_t *dev  = &svga->dev8514;
+    const svga_t    *svga = (svga_t *) priv;
+    const ibm8514_t *dev  = &svga->dev8514;
 
     return (dev->pos_regs[port & 7]);
 }
@@ -4040,15 +4042,14 @@ ibm8514_mca_write(int port, uint8_t val, void *priv)
 static uint8_t
 ibm8514_mca_feedb(void *priv)
 {
-    svga_t    *svga = (svga_t *) priv;
-    ibm8514_t *dev  = &svga->dev8514;
+    const svga_t    *svga = (svga_t *) priv;
+    const ibm8514_t *dev  = &svga->dev8514;
 
     return dev->pos_regs[2] & 1;
 }
 
-static void
-    *
-    ibm8514_init(const device_t *info)
+static void *
+ibm8514_init(const device_t *info)
 {
     if (svga_get_pri() == NULL)
         return NULL;
@@ -4062,9 +4063,9 @@ static void
     dev->vram_mask   = dev->vram_size - 1;
     dev->map8        = svga->pallook;
 
-    dev->type = info->flags;
+    dev->type     = info->flags;
     dev->ibm_mode = 1;
-    dev->bpp = 8;
+    dev->bpp      = 8;
 
     ibm8514_io_set(svga);
 
diff --git a/src/video/vid_ati18800.c b/src/video/vid_ati18800.c
index 3e0af9620..5847faa39 100644
--- a/src/video/vid_ati18800.c
+++ b/src/video/vid_ati18800.c
@@ -171,7 +171,7 @@ ati18800_in(uint16_t addr, void *priv)
 static void
 ati18800_recalctimings(svga_t *svga)
 {
-    ati18800_t *ati18800 = (ati18800_t *) svga->priv;
+    const ati18800_t *ati18800 = (ati18800_t *) svga->priv;
 
     if (svga->crtc[0x17] & 4) {
         svga->vtotal <<= 1;
diff --git a/src/video/vid_ati28800.c b/src/video/vid_ati28800.c
index 72a650184..aa5800d1c 100644
--- a/src/video/vid_ati28800.c
+++ b/src/video/vid_ati28800.c
@@ -357,10 +357,10 @@ ati28800_in(uint16_t addr, void *priv)
 static uint8_t
 ati28800k_in(uint16_t addr, void *priv)
 {
-    ati28800_t *ati28800 = (ati28800_t *) priv;
-    svga_t     *svga     = &ati28800->svga;
-    uint16_t    oldaddr  = addr;
-    uint8_t     temp     = 0xFF;
+    ati28800_t   *ati28800 = (ati28800_t *) priv;
+    const svga_t *svga     = &ati28800->svga;
+    uint16_t      oldaddr  = addr;
+    uint8_t       temp     = 0xFF;
 
     if (addr != 0x3da)
         ati28800_log("ati28800k_in : %04X ", addr);
@@ -400,7 +400,7 @@ ati28800k_in(uint16_t addr, void *priv)
 static void
 ati28800_recalctimings(svga_t *svga)
 {
-    ati28800_t *ati28800 = (ati28800_t *) svga->priv;
+    const ati28800_t *ati28800 = (ati28800_t *) svga->priv;
 
     if (ati28800->regs[0xa3] & 0x10)
         svga->ma_latch |= 0x10000;
@@ -532,7 +532,7 @@ ati28800_recalctimings(svga_t *svga)
 static void
 ati28800k_recalctimings(svga_t *svga)
 {
-    ati28800_t *ati28800 = (ati28800_t *) svga->priv;
+    const ati28800_t *ati28800 = (ati28800_t *) svga->priv;
 
     ati28800_recalctimings(svga);
 
diff --git a/src/video/vid_ati_eeprom.c b/src/video/vid_ati_eeprom.c
index 4992fff40..2f4746e86 100644
--- a/src/video/vid_ati_eeprom.c
+++ b/src/video/vid_ati_eeprom.c
@@ -35,7 +35,7 @@ ati_eeprom_load(ati_eeprom_t *eeprom, char *fn, int type)
     int   size;
     eeprom->type = type;
     strncpy(eeprom->fn, fn, sizeof(eeprom->fn) - 1);
-    fp    = nvr_fopen(eeprom->fn, "rb");
+    fp   = nvr_fopen(eeprom->fn, "rb");
     size = eeprom->type ? 512 : 128;
     if (!fp) {
         memset(eeprom->data, 0xff, size);
@@ -53,7 +53,7 @@ ati_eeprom_load_mach8(ati_eeprom_t *eeprom, char *fn)
     int   size;
     eeprom->type = 0;
     strncpy(eeprom->fn, fn, sizeof(eeprom->fn) - 1);
-    fp    = nvr_fopen(eeprom->fn, "rb");
+    fp   = nvr_fopen(eeprom->fn, "rb");
     size = 128;
     if (!fp) { /*The ATI Graphics Ultra bios expects an immediate write to nvram if none is present at boot time otherwise
             it would hang the machine.*/
@@ -95,7 +95,7 @@ ati_eeprom_write(ati_eeprom_t *eeprom, int ena, int clk, int dat)
                         break;
                     eeprom->state = EEPROM_OPCODE;
 #ifdef FALLTHROUGH_ANNOTATION
-                [[fallthrough]];
+                    [[fallthrough]];
 #endif
                 case EEPROM_OPCODE:
                     eeprom->opcode = (eeprom->opcode << 1) | (dat ? 1 : 0);
diff --git a/src/video/vid_ati_mach64.c b/src/video/vid_ati_mach64.c
index 7140e0276..22c3352e3 100644
--- a/src/video/vid_ati_mach64.c
+++ b/src/video/vid_ati_mach64.c
@@ -91,7 +91,8 @@ typedef struct mach64_t {
     uint8_t regs[256];
     int     index;
 
-    int type, pci;
+    int type;
+    int pci;
 
     uint8_t pci_regs[256];
     uint8_t int_line;
@@ -503,7 +504,7 @@ mach64_in(uint16_t addr, void *priv)
 void
 mach64_recalctimings(svga_t *svga)
 {
-    mach64_t *mach64 = (mach64_t *) svga->priv;
+    const mach64_t *mach64 = (mach64_t *) svga->priv;
 
     if (((mach64->crtc_gen_cntl >> 24) & 3) == 3) {
         svga->vtotal     = (mach64->crtc_v_total_disp & 2047) + 1;
@@ -678,7 +679,7 @@ mach64_wait_fifo_idle(mach64_t *mach64)
 }
 
 #define READ8(addr, var)                \
-    switch ((addr) & 3) {               \
+    switch ((addr) &3) {                \
         case 0:                         \
             ret = (var) &0xff;          \
             break;                      \
@@ -694,7 +695,7 @@ mach64_wait_fifo_idle(mach64_t *mach64)
     }
 
 #define WRITE8(addr, var, val)                        \
-    switch ((addr) & 3) {                             \
+    switch ((addr) &3) {                              \
         case 0:                                       \
             var = (var & 0xffffff00) | (val);         \
             break;                                    \
@@ -749,7 +750,7 @@ mach64_accel_write_fifo(mach64_t *mach64, uint32_t addr, uint8_t val)
         case 0x11f:
             WRITE8(addr, mach64->dst_height_width, val);
 #ifdef FALLTHROUGH_ANNOTATION
-        [[fallthrough]];
+            [[fallthrough]];
 #endif
         case 0x113:
             if (((addr & 0x3ff) == 0x11b || (addr & 0x3ff) == 0x11f || (addr & 0x3ff) == 0x113) && !(val & 0x80)) {
@@ -974,7 +975,7 @@ mach64_accel_write_fifo(mach64_t *mach64, uint32_t addr, uint8_t val)
         case 0x2a5:
             addr += 2;
 #ifdef FALLTHROUGH_ANNOTATION
-        [[fallthrough]];
+            [[fallthrough]];
 #endif
         case 0x2aa:
         case 0x2ab:
@@ -991,7 +992,7 @@ mach64_accel_write_fifo(mach64_t *mach64, uint32_t addr, uint8_t val)
         case 0x2b1:
             addr += 2;
 #ifdef FALLTHROUGH_ANNOTATION
-        [[fallthrough]];
+            [[fallthrough]];
 #endif
         case 0x2b6:
         case 0x2b7:
@@ -1245,8 +1246,8 @@ mach64_queue(mach64_t *mach64, uint32_t addr, uint32_t val, uint32_t type)
 void
 mach64_start_fill(mach64_t *mach64)
 {
-    mach64->accel.dst_x       = 0;
-    mach64->accel.dst_y       = 0;
+    mach64->accel.dst_x = 0;
+    mach64->accel.dst_y = 0;
 
     mach64->accel.dst_x_start = (mach64->dst_y_x >> 16) & 0xfff;
     if ((mach64->dst_y_x >> 16) & 0x1000)
@@ -1263,11 +1264,11 @@ mach64_start_fill(mach64_t *mach64)
             mach64->accel.dst_width = (mach64->accel.dst_width & ~7) + 8;
     }
 
-    mach64->accel.x_count = mach64->accel.dst_width;
+    mach64->accel.x_count  = mach64->accel.dst_width;
     mach64->accel.xx_count = 0;
 
-    mach64->accel.src_x       = 0;
-    mach64->accel.src_y       = 0;
+    mach64->accel.src_x = 0;
+    mach64->accel.src_y = 0;
 
     mach64->accel.src_x_start = (mach64->src_y_x >> 16) & 0xfff;
     if ((mach64->src_y_x >> 16) & 0x1000)
@@ -1571,12 +1572,12 @@ mach64_blit(uint32_t cpu_dat, int count, mach64_t *mach64)
     switch (mach64->accel.op) {
         case OP_RECT:
             while (count) {
-                uint8_t write_mask = 0;
-                uint32_t src_dat  = 0;
+                uint8_t  write_mask = 0;
+                uint32_t src_dat    = 0;
                 uint32_t dest_dat;
                 uint32_t host_dat = 0;
                 uint32_t old_dest_dat;
-                int      mix   = 0;
+                int      mix = 0;
                 int      dst_x;
                 int      dst_y;
                 int      src_x;
@@ -1710,7 +1711,7 @@ mach64_blit(uint32_t cpu_dat, int count, mach64_t *mach64)
                     }
 
                     if (!(mach64->dst_cntl & DST_POLYGON_EN) || mach64->accel.poly_draw) {
-                        READ(mach64->accel.dst_offset + ((dst_y) * mach64->accel.dst_pitch) + (dst_x), dest_dat, mach64->accel.dst_size);
+                        READ(mach64->accel.dst_offset + ((dst_y) *mach64->accel.dst_pitch) + (dst_x), dest_dat, mach64->accel.dst_size);
 
                         switch (mach64->accel.clr_cmp_fn) {
                             case 1: /*TRUE*/
@@ -1777,8 +1778,8 @@ mach64_blit(uint32_t cpu_dat, int count, mach64_t *mach64)
                 mach64->accel.x_count--;
                 if (mach64->accel.x_count <= 0) {
                     mach64->accel.xx_count = 0;
-                    mach64->accel.x_count = mach64->accel.dst_width;
-                    mach64->accel.dst_x   = 0;
+                    mach64->accel.x_count  = mach64->accel.dst_width;
+                    mach64->accel.dst_x    = 0;
                     mach64->accel.dst_y += mach64->accel.yinc;
                     mach64->accel.src_x_start = (mach64->src_y_x >> 16) & 0xfff;
                     mach64->accel.src_x_count = mach64->accel.src_width1;
@@ -1830,7 +1831,7 @@ mach64_blit(uint32_t cpu_dat, int count, mach64_t *mach64)
             if (((mach64->crtc_gen_cntl >> 8) & 7) == BPP_24) {
                 int x = 0;
                 while (count) {
-                    uint32_t src_dat  = 0;
+                    uint32_t src_dat = 0;
                     uint32_t dest_dat;
                     uint32_t host_dat = 0;
                     int      mix      = 0;
@@ -1965,7 +1966,7 @@ mach64_blit(uint32_t cpu_dat, int count, mach64_t *mach64)
                 }
             } else {
                 while (count) {
-                    uint32_t src_dat    = 0;
+                    uint32_t src_dat = 0;
                     uint32_t dest_dat;
                     uint32_t host_dat   = 0;
                     int      mix        = 0;
@@ -2879,8 +2880,9 @@ mach64_ext_readb(uint32_t addr, void *priv)
 uint16_t
 mach64_ext_readw(uint32_t addr, void *priv)
 {
-    mach64_t *mach64 = (mach64_t *) priv;
+    const mach64_t *mach64 = (mach64_t *) priv;
     uint16_t  ret;
+
     if (!(addr & 0x400)) {
         mach64_log("nmach64_ext_readw: addr=%04x\n", addr);
         ret = 0xffff;
@@ -2907,8 +2909,9 @@ mach64_ext_readw(uint32_t addr, void *priv)
 uint32_t
 mach64_ext_readl(uint32_t addr, void *priv)
 {
-    mach64_t *mach64 = (mach64_t *) priv;
-    uint32_t  ret;
+    const mach64_t *mach64 = (mach64_t *) priv;
+    uint32_t        ret;
+
     if (!(addr & 0x400)) {
         mach64_log("nmach64_ext_readl: addr=%04x\n", addr);
         ret = 0xffffffff;
@@ -3317,7 +3320,7 @@ uint8_t
 mach64_ext_inb(uint16_t port, void *priv)
 {
     mach64_t *mach64 = (mach64_t *) priv;
-    uint8_t   ret = 0xff;
+    uint8_t   ret    = 0xff;
 
     switch (port) {
         case 0x02ec:
@@ -4036,9 +4039,9 @@ mach64_overlay_draw(svga_t *svga, int displine)
         }
     } else {
         for (x = 0; x < mach64->svga.overlay_latch.cur_xsize; x++) {
-            int h      = h_acc >> 12;
-            int gr_cmp = 0;
-            int vid_cmp = 0;
+            int h         = h_acc >> 12;
+            int gr_cmp    = 0;
+            int vid_cmp   = 0;
             int use_video = 0;
 
             switch (video_key_fn) {
@@ -4216,7 +4219,7 @@ mach64_io_set(mach64_t *mach64)
 uint8_t
 mach64_pci_read(UNUSED(int func), int addr, void *priv)
 {
-    mach64_t *mach64 = (mach64_t *) priv;
+    const mach64_t *mach64 = (mach64_t *) priv;
 
     switch (addr) {
         case 0x00:
@@ -4448,7 +4451,7 @@ mach64gx_init(const device_t *info)
 
     mach64->type           = MACH64_GX;
     mach64->pci            = !!(info->flags & DEVICE_PCI);
-    mach64->pci_id         = (int) 'X' | ((int) 'G' << 8);
+    mach64->pci_id         = 'X' | ('G' << 8);
     mach64->config_chip_id = 0x000000d7;
     mach64->dac_cntl       = 5 << 16;             /*ATI 68860 RAMDAC*/
     mach64->config_stat0   = (5 << 9) | (3 << 3); /*ATI-68860, 256Kx16 DRAM*/
diff --git a/src/video/vid_ati_mach8.c b/src/video/vid_ati_mach8.c
index 45f696a35..1aa55bd6b 100644
--- a/src/video/vid_ati_mach8.c
+++ b/src/video/vid_ati_mach8.c
@@ -40,21 +40,21 @@
 #include <86box/vid_svga_render.h>
 #include <86box/vid_ati_eeprom.h>
 
-#define BIOS_MACH8_ROM_PATH             "roms/video/mach8/BIOS.BIN"
-#define BIOS_MACH32_ISA_ROM_PATH        "roms/video/mach32/MACH32ISA.VBI"
-#define BIOS_MACH32_VLB_ROM_PATH        "roms/video/mach32/MACH32VLB.VBI"
-#define BIOS_MACH32_PCI_ROM_PATH        "roms/video/mach32/MACH32PCI.BIN"
+#define BIOS_MACH8_ROM_PATH      "roms/video/mach8/BIOS.BIN"
+#define BIOS_MACH32_ISA_ROM_PATH "roms/video/mach32/MACH32ISA.VBI"
+#define BIOS_MACH32_VLB_ROM_PATH "roms/video/mach32/MACH32VLB.VBI"
+#define BIOS_MACH32_PCI_ROM_PATH "roms/video/mach32/MACH32PCI.BIN"
 
 typedef struct mach_t {
     ati_eeprom_t eeprom;
     svga_t       svga;
 
-    rom_t bios_rom;
+    rom_t         bios_rom;
     mem_mapping_t mmio_linear_mapping;
 
-    int mca_bus;
-    int pci_bus;
-    int vlb_bus;
+    int     mca_bus;
+    int     pci_bus;
+    int     vlb_bus;
     uint8_t regs[256];
     uint8_t pci_regs[256];
     uint8_t int_line;
@@ -66,33 +66,40 @@ typedef struct mach_t {
     uint16_t config1;
     uint16_t config2;
 
-    uint8_t pos_regs[8];
-    uint8_t cursor_col_0, cursor_col_1;
-    uint8_t ext_cur_col_0_r, ext_cur_col_1_r;
-    uint8_t ext_cur_col_0_g, ext_cur_col_1_g;
-    uint16_t cursor_offset_lo, cursor_offset_hi;
-    uint16_t cursor_x, cursor_y;
+    uint8_t  pos_regs[8];
+    uint8_t  cursor_col_0;
+    uint8_t  cursor_col_1;
+    uint8_t  ext_cur_col_0_r;
+    uint8_t  ext_cur_col_1_r;
+    uint8_t  ext_cur_col_0_g;
+    uint8_t  ext_cur_col_1_g;
+    uint16_t cursor_offset_lo;
+    uint16_t cursor_offset_hi;
+    uint16_t cursor_x;
+    uint16_t cursor_y;
     uint16_t misc;
     uint16_t memory_aperture;
     uint16_t local_cntl;
     uint32_t linear_base;
-    uint8_t ap_size;
-    uint8_t bank_w, bank_r;
+    uint8_t  ap_size;
+    uint8_t  bank_w;
+    uint8_t  bank_r;
 
     struct {
-        uint8_t line_idx;
-        int16_t line_array[6];
-        uint8_t patt_idx;
-        uint8_t patt_len;
-        uint8_t pix_trans[2];
-        uint8_t eeprom_control;
+        uint8_t  line_idx;
+        int16_t  line_array[6];
+        uint8_t  patt_idx;
+        uint8_t  patt_len;
+        uint8_t  pix_trans[2];
+        uint8_t  eeprom_control;
         uint16_t dest_x_end;
         uint16_t dest_x_start;
         uint16_t dest_y_end;
         uint16_t src_x_end;
         uint16_t src_x_start;
-        uint16_t src_x, src_y;
-        int16_t bres_count;
+        uint16_t src_x;
+        uint16_t src_y;
+        int16_t  bres_count;
         uint16_t clock_sel;
         uint16_t crt_offset_lo;
         uint16_t crt_offset_hi;
@@ -103,49 +110,67 @@ typedef struct mach_t {
         uint16_t ge_offset_hi;
         uint16_t linedraw_opt;
         uint16_t max_waitstates;
-        uint8_t patt_data_idx;
-        uint8_t patt_data[0x18];
+        uint8_t  patt_data_idx;
+        uint8_t  patt_data[0x18];
         uint16_t scan_to_x;
         uint16_t scratch0;
         uint16_t scratch1;
         uint16_t test;
         uint16_t pattern;
-        uint8_t test2[2], test3[2];
-        int src_y_dir;
-        int cmd_type;
-        int block_write_mono_pattern_enable;
-        int mono_pattern_enable;
-        int16_t cx_end_line, cy_end_line;
-        int16_t cx, cx_end, cy_end, dx, dx_end, dy_end;
-        int16_t dx_start, dy_start;
-        int16_t cy, sx_start, sx_end;
-        int16_t sx, x_count, xx_count, xxx_count;
-        int16_t sy, y_count;
-        int16_t err;
-        int16_t width, src_width;
-        int16_t height;
-        int poly_src, temp_cnt;
-        int stepx, stepy, src_stepx;
-        uint8_t color_pattern[16];
-        uint8_t color_pattern_full[32];
+        uint8_t  test2[2];
+        uint8_t  test3[2];
+        int      src_y_dir;
+        int      cmd_type;
+        int      block_write_mono_pattern_enable;
+        int      mono_pattern_enable;
+        int16_t  cx_end_line;
+        int16_t  cy_end_line;
+        int16_t  cx;
+        int16_t  cx_end;
+        int16_t  cy_end;
+        int16_t  dx;
+        int16_t  dx_end;
+        int16_t  dy_end;
+        int16_t  dx_start;
+        int16_t  dy_start;
+        int16_t  cy;
+        int16_t  sx_start;
+        int16_t  sx_end;
+        int16_t  sx;
+        int16_t  x_count;
+        int16_t  xx_count;
+        int16_t  xxx_count;
+        int16_t  sy;
+        int16_t  y_count;
+        int16_t  err;
+        int16_t  width;
+        int16_t  src_width;
+        int16_t  height;
+        int      poly_src;
+        int      temp_cnt;
+        int      stepx;
+        int      stepy;
+        int      src_stepx;
+        uint8_t  color_pattern[16];
+        uint8_t  color_pattern_full[32];
         uint16_t color_pattern_word[8];
-        int mono_pattern[8][8];
+        int      mono_pattern[8][8];
         uint32_t ge_offset;
         uint32_t crt_offset;
         uint32_t patt_len_reg;
-        int poly_fill;
+        int      poly_fill;
         uint16_t dst_clr_cmp_mask;
-        int clip_overrun;
-        int color_pattern_idx;
+        int      clip_overrun;
+        int      color_pattern_idx;
     } accel;
 
-    atomic_int force_busy, force_busy2;
+    atomic_int force_busy;
+    atomic_int force_busy2;
 } mach_t;
 
 static video_timings_t timing_gfxultra_isa = { .type = VIDEO_ISA, .write_b = 3, .write_w = 3, .write_l = 6, .read_b = 5, .read_w = 5, .read_l = 10 };
-static video_timings_t timing_mach32_vlb = { .type = VIDEO_BUS, .write_b = 2, .write_w = 2, .write_l = 1, .read_b = 20, .read_w = 20, .read_l = 21 };
-static video_timings_t timing_mach32_pci = { .type = VIDEO_PCI, .write_b = 2, .write_w = 2, .write_l = 1, .read_b = 20, .read_w = 20, .read_l = 21 };
-
+static video_timings_t timing_mach32_vlb   = { .type = VIDEO_BUS, .write_b = 2, .write_w = 2, .write_l = 1, .read_b = 20, .read_w = 20, .read_l = 21 };
+static video_timings_t timing_mach32_pci   = { .type = VIDEO_PCI, .write_b = 2, .write_w = 2, .write_l = 1, .read_b = 20, .read_w = 20, .read_l = 21 };
 
 static void     mach_accel_outb(uint16_t port, uint8_t val, void *priv);
 static void     mach_accel_outw(uint16_t port, uint16_t val, void *priv);
@@ -348,7 +373,6 @@ mach_log(const char *fmt, ...)
         svga->changedvram[(((addr)) & (svga->vram_mask >> 1)) >> 11] = changeframecount; \
     }
 
-
 static int
 mach_pixel_write(mach_t *mach)
 {
@@ -370,27 +394,27 @@ mach_pixel_read(mach_t *mach)
 static void
 mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint32_t cpu_dat, mach_t *mach, ibm8514_t *dev, UNUSED(int len))
 {
-    svga_t *svga = &mach->svga;
-    int compare_mode;
-    int poly_src = 0;
-    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;
-    int frgd_sel;
-    int bkgd_sel;
-    int mono_src;
-    int compare = 0;
-    uint16_t src_dat = 0;
-    uint16_t dest_dat = 0;
-    uint16_t old_dest_dat;
-    uint16_t *vram_w = (uint16_t *) svga->vram;
-    uint16_t mix = 0;
-    int16_t clip_l = dev->accel.clip_left & 0x7ff;
-    int16_t clip_t = dev->accel.clip_top & 0x7ff;
-    int16_t clip_r = dev->accel.multifunc[4] & 0x7ff;
-    int16_t clip_b = dev->accel.multifunc[3] & 0x7ff;
-    uint32_t mono_dat0 = 0;
-    uint32_t mono_dat1 = 0;
+    svga_t   *svga = &mach->svga;
+    int       compare_mode;
+    int       poly_src     = 0;
+    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;
+    int       frgd_sel;
+    int       bkgd_sel;
+    int       mono_src;
+    int       compare  = 0;
+    uint16_t  src_dat  = 0;
+    uint16_t  dest_dat = 0;
+    uint16_t  old_dest_dat;
+    uint16_t *vram_w    = (uint16_t *) svga->vram;
+    uint16_t  mix       = 0;
+    int16_t   clip_l    = dev->accel.clip_left & 0x7ff;
+    int16_t   clip_t    = dev->accel.clip_top & 0x7ff;
+    int16_t   clip_r    = dev->accel.multifunc[4] & 0x7ff;
+    int16_t   clip_b    = dev->accel.multifunc[3] & 0x7ff;
+    uint32_t  mono_dat0 = 0;
+    uint32_t  mono_dat1 = 0;
 
     if ((svga->bpp == 8) || (svga->bpp == 24)) {
         rd_mask &= 0xff;
@@ -398,17 +422,17 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
     }
 
     compare_mode = (mach->accel.dest_cmp_fn >> 3) & 7;
-    frgd_sel = (mach->accel.dp_config >> 13) & 7;
-    bkgd_sel = (mach->accel.dp_config >> 7) & 3;
-    mono_src = (mach->accel.dp_config >> 5) & 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;
 
     mach->accel.ge_offset = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
 
     if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach)) {
-        mach->force_busy = 1;
+        mach->force_busy  = 1;
         mach->force_busy2 = 1;
-        dev->force_busy = 1;
-        dev->force_busy2 = 1;
+        dev->force_busy   = 1;
+        dev->force_busy2  = 1;
     }
 
     if (cpu_input) {
@@ -443,8 +467,8 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 if (dev->accel.desty_axstp >= 0x600)
                     dev->accel.cy |= ~0x5ff;
 
-                mach->accel.width = mach->accel.bres_count;
-                dev->accel.sx = 0;
+                mach->accel.width     = mach->accel.bres_count;
+                dev->accel.sx         = 0;
                 mach->accel.poly_fill = 0;
 
                 mach->accel.color_pattern_idx = ((dev->accel.cx + (dev->accel.cy << 3)) & mach->accel.patt_len);
@@ -456,11 +480,11 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                 if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach)) {
                     if (mach_pixel_write(mach)) {
-                        dev->data_available = 0;
+                        dev->data_available  = 0;
                         dev->data_available2 = 0;
                         return;
                     } else if (mach_pixel_read(mach)) {
-                        dev->data_available = 1;
+                        dev->data_available  = 1;
                         dev->data_available2 = 1;
                         return;
                     }
@@ -478,8 +502,8 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
             }
 
             if (mono_src == 1) {
-                count = mach->accel.width;
-                mix_dat = mach->accel.patt_data[0x10];
+                count               = mach->accel.width;
+                mix_dat             = mach->accel.patt_data[0x10];
                 dev->accel.temp_cnt = 8;
             }
 
@@ -932,8 +956,8 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                     mach_log("BitBLT: Dst Indeterminate X, dpconfig = %04x, destxend = %d, destxstart = %d.\n", mach->accel.dp_config, mach->accel.dest_x_end, mach->accel.dest_x_start);
                 }
 
-                dev->accel.sx = 0;
-                mach->accel.poly_fill = 0;
+                dev->accel.sx                 = 0;
+                mach->accel.poly_fill         = 0;
                 mach->accel.color_pattern_idx = ((dev->accel.dx + (dev->accel.dy << 3)) & mach->accel.patt_len);
                 if ((svga->bpp == 24) && (mono_src != 1)) {
                     if (mach->accel.color_pattern_idx == mach->accel.patt_len)
@@ -951,13 +975,13 @@ 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->accel.height = (mach->accel.dy_end - mach->accel.dy_start);
-                    mach->accel.stepy = 1;
+                    mach->accel.stepy  = 1;
                 } else if (mach->accel.dy_end < mach->accel.dy_start) {
                     mach->accel.height = (mach->accel.dy_start - mach->accel.dy_end);
-                    mach->accel.stepy = -1;
+                    mach->accel.stepy  = -1;
                 } else {
                     mach->accel.height = 0;
-                    mach->accel.stepy = 1;
+                    mach->accel.stepy  = 1;
                 }
 
                 dev->accel.sy = 0;
@@ -1024,7 +1048,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                         for (uint8_t y = 0; y < 8; y++) {
                             for (uint8_t x = 0; x < 8; x++) {
-                                uint32_t temp = (y & 4) ? mono_dat1 : mono_dat0;
+                                uint32_t temp                      = (y & 4) ? mono_dat1 : mono_dat0;
                                 mach->accel.mono_pattern[y][7 - x] = (temp >> (x + ((y & 3) << 3))) & 1;
                             }
                         }
@@ -1033,11 +1057,11 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                 if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach)) {
                     if (mach_pixel_write(mach)) {
-                        dev->data_available = 0;
+                        dev->data_available  = 0;
                         dev->data_available2 = 0;
                         return;
                     } else if (mach_pixel_read(mach)) {
-                        dev->data_available = 1;
+                        dev->data_available  = 1;
                         dev->data_available2 = 1;
                         return;
                     }
@@ -1046,8 +1070,8 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
             if (mono_src == 1) {
                 if (!mach->accel.mono_pattern_enable && !(mach->accel.patt_len_reg & 0x4000)) {
-                    count = mach->accel.width;
-                    mix_dat = mach->accel.patt_data[0x10] ^ ((mach->accel.patt_idx & 1) ? 0xff : 0);
+                    count               = mach->accel.width;
+                    mix_dat             = mach->accel.patt_data[0x10] ^ ((mach->accel.patt_idx & 1) ? 0xff : 0);
                     dev->accel.temp_cnt = 8;
                 }
             }
@@ -1142,8 +1166,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                         break;
                 }
 
-                if (((dev->accel.dx) >= clip_l) && ((dev->accel.dx) <= clip_r) &&
-                    ((dev->accel.dy) >= clip_t) && ((dev->accel.dy) <= clip_b)) {
+                if (((dev->accel.dx) >= clip_l) && ((dev->accel.dx) <= clip_r) && ((dev->accel.dy) >= clip_t) && ((dev->accel.dy) <= clip_b)) {
                     if (mach->accel.dp_config & 0x02) {
                         READ(dev->accel.src + (dev->accel.cx), poly_src, dev->local);
                         poly_src = ((poly_src & rd_mask) == rd_mask);
@@ -1297,7 +1320,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 dev->accel.sx++;
                 if (dev->accel.sx >= mach->accel.width) {
                     mach->accel.poly_fill = 0;
-                    dev->accel.sx = 0;
+                    dev->accel.sx         = 0;
                     if (mach->accel.stepx == -1)
                         dev->accel.dx += mach->accel.width;
                     else
@@ -1363,11 +1386,11 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                 if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach)) {
                     if (mach_pixel_write(mach)) {
-                        dev->data_available = 0;
+                        dev->data_available  = 0;
                         dev->data_available2 = 0;
                         return;
                     } else if (mach_pixel_read(mach)) {
-                        dev->data_available = 1;
+                        dev->data_available  = 1;
                         dev->data_available2 = 1;
                         return;
                     }
@@ -1381,11 +1404,11 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
             }
 
             if (mono_src == 1) {
-                mix_dat = mach->accel.patt_data[0x10];
+                mix_dat             = mach->accel.patt_data[0x10];
                 dev->accel.temp_cnt = 8;
             }
 
-            count = (dev->accel.dx > dev->accel.dy) ? (dev->accel.dx >> 1) : (dev->accel.dy >> 1);
+            count             = (dev->accel.dx > dev->accel.dy) ? (dev->accel.dx >> 1) : (dev->accel.dy >> 1);
             mach->accel.width = count;
 
             if (dev->accel.dx > dev->accel.dy) {
@@ -1520,7 +1543,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                                 break;
 
                             default:
-                               break;
+                                break;
                         }
 
                         if (((dev->accel.cx) >= clip_l) && ((dev->accel.cx) <= clip_r) && ((dev->accel.cy) >= clip_t) && ((dev->accel.cy) <= clip_b)) {
@@ -1879,8 +1902,8 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
             }
             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                                = mach->accel.line_array[(cmd_type == 4) ? 4 : 0];
+            dev->accel.cur_y                                = mach->accel.line_array[(cmd_type == 4) ? 5 : 1];
             break;
 
         case 5: /*Horizontal Raster Draw from scan_to_x register (0xcaee)*/
@@ -1997,11 +2020,11 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                 if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach)) {
                     if (mach_pixel_write(mach)) {
-                        dev->data_available = 0;
+                        dev->data_available  = 0;
                         dev->data_available2 = 0;
                         return;
                     } else if (mach_pixel_read(mach)) {
-                        dev->data_available = 1;
+                        dev->data_available  = 1;
                         dev->data_available2 = 1;
                         return;
                     }
@@ -2009,8 +2032,8 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
             }
 
             if (mono_src == 1) {
-                count = mach->accel.width;
-                mix_dat = mach->accel.patt_data[0x10];
+                count               = mach->accel.width;
+                mix_dat             = mach->accel.patt_data[0x10];
                 dev->accel.temp_cnt = 8;
             }
 
@@ -2073,8 +2096,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                         break;
                 }
 
-                if (((dev->accel.dx) >= clip_l) && ((dev->accel.dx) <= clip_r) &&
-                    ((dev->accel.dy) >= clip_t) && ((dev->accel.dy) <= 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 ? frgd_sel : bkgd_sel) {
                         case 0:
                             src_dat = dev->accel.bkgd_color;
@@ -2262,11 +2284,11 @@ mach_accel_out_pixtrans(mach_t *mach, ibm8514_t *dev, UNUSED(uint16_t port), uin
 static void
 mach_out(uint16_t addr, uint8_t val, void *priv)
 {
-    mach_t     *mach     = (mach_t *) priv;
-    svga_t     *svga     = &mach->svga;
-    ibm8514_t  *dev      = &svga->dev8514;
-    uint8_t     old;
-    uint8_t     rs2;
+    mach_t          *mach = (mach_t *) priv;
+    svga_t          *svga = &mach->svga;
+    const ibm8514_t *dev  = &svga->dev8514;
+    uint8_t          old;
+    uint8_t          rs2;
 
     if (((addr & 0xFFF0) == 0x3D0 || (addr & 0xFFF0) == 0x3B0) && !(svga->miscout & 1))
         addr ^= 0x60;
@@ -2276,7 +2298,7 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
             mach->index = val;
             break;
         case 0x1cf:
-            old = mach->regs[mach->index];
+            old                     = mach->regs[mach->index];
             mach->regs[mach->index] = val;
             mach_log("ATI VGA write reg=0x%02X, val=0x%02X\n", mach->index, val);
             switch (mach->index) {
@@ -2320,7 +2342,7 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
                         if (ibm8514_on)
                             mach_log("Single B2Bank = %02x, AEbank = %02x.\n", mach->regs[0xb2], mach->regs[0xae]);
                     }
-                    svga->read_bank = mach->bank_r << 16;
+                    svga->read_bank  = mach->bank_r << 16;
                     svga->write_bank = mach->bank_w << 16;
 
                     if (mach->index == 0xbe) {
@@ -2430,11 +2452,11 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
 static uint8_t
 mach_in(uint16_t addr, void *priv)
 {
-    mach_t     *mach     = (mach_t *) priv;
-    svga_t     *svga     = &mach->svga;
-    ibm8514_t  *dev      = &svga->dev8514;
-    uint8_t     temp;
-    uint8_t     rs2;
+    mach_t          *mach = (mach_t *) priv;
+    svga_t          *svga = &mach->svga;
+    const ibm8514_t *dev  = &svga->dev8514;
+    uint8_t          temp;
+    uint8_t          rs2;
 
     if (((addr & 0xFFF0) == 0x3D0 || (addr & 0xFFF0) == 0x3B0) && !(svga->miscout & 1))
         addr ^= 0x60;
@@ -2523,8 +2545,8 @@ mach_in(uint16_t addr, void *priv)
 static void
 mach_recalctimings(svga_t *svga)
 {
-    mach_t *mach = (mach_t *) svga->priv;
-    ibm8514_t *dev = &svga->dev8514;
+    const mach_t *mach = (mach_t *) svga->priv;
+    ibm8514_t    *dev  = &svga->dev8514;
 
     if (vga_on && !ibm8514_on) {
         switch (((mach->regs[0xbe] & 0x10) >> 1) | ((mach->regs[0xb9] & 2) << 1) | ((svga->miscout & 0x0c) >> 2)) {
@@ -2670,33 +2692,33 @@ mach_recalctimings(svga_t *svga)
         }
     } else if (dev->local) {
         if (ibm8514_on) {
-            svga->hdisp_time = svga->hdisp  = (dev->hdisp + 1) << 3;
-            dev->pitch                      = (dev->accel.advfunc_cntl & 4) ? 1024 : 640;
-            svga->htotal                    = (dev->htotal + 1);
-            svga->vtotal                    = (dev->vtotal + 1);
-            svga->vsyncstart                = (dev->vsyncstart + 1);
-            svga->rowcount                  = !!(dev->disp_cntl & 0x08);
-            svga->dispend                   = ((dev->vdisp >> 1) + 1);
-            svga->interlace                 = dev->interlace;
+            svga->hdisp_time = svga->hdisp = (dev->hdisp + 1) << 3;
+            dev->pitch                     = (dev->accel.advfunc_cntl & 4) ? 1024 : 640;
+            svga->htotal                   = (dev->htotal + 1);
+            svga->vtotal                   = (dev->vtotal + 1);
+            svga->vsyncstart               = (dev->vsyncstart + 1);
+            svga->rowcount                 = !!(dev->disp_cntl & 0x08);
+            svga->dispend                  = ((dev->vdisp >> 1) + 1);
+            svga->interlace                = dev->interlace;
             svga->split                    = 0xffffff;
             svga->vblankstart              = svga->dispend;
 
             if (svga->dispend == 766) {
-                svga->dispend = 768;
+                svga->dispend     = 768;
                 svga->vblankstart = svga->dispend;
             }
 
             if (svga->dispend == 598) {
-                svga->dispend = 600;
+                svga->dispend     = 600;
                 svga->vblankstart = svga->dispend;
             }
 
             if (dev->accel.advfunc_cntl & 4) {
                 if (dev->ibm_mode) {
                     if (svga->hdisp == 8) {
-                        svga->hdisp = 1024;
-                        svga->dispend = 768;
-                        svga->vtotal = 1536;
+                        svga->hdisp      = 1024;
+                        svga->dispend    = 768;
+                        svga->vtotal     = 1536;
                         svga->vsyncstart = 1536;
                     }
                 }
@@ -2710,14 +2732,14 @@ mach_recalctimings(svga_t *svga)
                     svga->vtotal >>= 1;
                 }
 
-                dev->pitch = dev->ext_pitch;
+                dev->pitch      = dev->ext_pitch;
                 svga->rowoffset = dev->ext_crt_pitch;
 
                 svga->clock = (cpuclock * (double) (1ULL << 32)) / 44900000.0;
             } else {
                 if (dev->ibm_mode) {
                     if ((svga->hdisp == 1024) && !dev->internal_pitch) {
-                        svga->hdisp = 640;
+                        svga->hdisp   = 640;
                         svga->dispend = 480;
                     }
                 }
@@ -2731,7 +2753,7 @@ mach_recalctimings(svga_t *svga)
                     svga->vtotal >>= 1;
                 }
 
-                dev->pitch = dev->ext_pitch;
+                dev->pitch      = dev->ext_pitch;
                 svga->rowoffset = dev->ext_crt_pitch;
 
                 svga->clock = (cpuclock * (double) (1ULL << 32)) / 25175000.0;
@@ -2800,7 +2822,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             if (len == 1)
                 dev->accel.desty_axstp = (dev->accel.desty_axstp & 0x3f00) | val;
             else {
-                mach->accel.src_y = val;
+                mach->accel.src_y      = val;
                 dev->accel.desty_axstp = val & 0x3fff;
                 if (val & 0x2000)
                     dev->accel.desty_axstp |= ~0x1fff;
@@ -2820,7 +2842,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             if (len == 1)
                 dev->accel.destx_distp = (dev->accel.destx_distp & 0x3f00) | val;
             else {
-                mach->accel.src_x = val;
+                mach->accel.src_x      = val;
                 dev->accel.destx_distp = val & 0x3fff;
                 if (val & 0x2000)
                     dev->accel.destx_distp |= ~0x1fff;
@@ -2865,7 +2887,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             if (len == 1)
                 dev->accel.maj_axis_pcnt = (dev->accel.maj_axis_pcnt & 0x0700) | val;
             else {
-                mach->accel.test = val & 0x1fff;
+                mach->accel.test         = val & 0x1fff;
                 dev->accel.maj_axis_pcnt = val & 0x07ff;
             }
             break;
@@ -3005,9 +3027,9 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                             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;
-                            mono_src = (mach->accel.dp_config >> 5) & 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;
 
                             switch (mach->accel.dp_config & 0x200) {
                                 case 0x000: /*8-bit size*/
@@ -3090,9 +3112,9 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                             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;
-                            mono_src = (mach->accel.dp_config >> 5) & 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;
 
                             switch (mach->accel.dp_config & 0x200) {
                                 case 0x000: /*8-bit size*/
@@ -3232,7 +3254,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             }
             break;
 
-/*ATI Mach8/32 specific registers*/
+            /*ATI Mach8/32 specific registers*/
         case 0x82ee:
             mach->accel.patt_data_idx = val & 0x1f;
             mach_log("Pattern Data Index = %d.\n", val & 0x1f);
@@ -3242,7 +3264,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             if (len == 1) {
                 mach->accel.patt_data[mach->accel.patt_data_idx] = val;
             } else {
-                mach->accel.patt_data[mach->accel.patt_data_idx] = val & 0xff;
+                mach->accel.patt_data[mach->accel.patt_data_idx]     = val & 0xff;
                 mach->accel.patt_data[mach->accel.patt_data_idx + 1] = (val >> 8) & 0xff;
                 if (mach->accel.mono_pattern_enable)
                     mach->accel.patt_data_idx = (mach->accel.patt_data_idx + 2) & 0x17;
@@ -3257,7 +3279,6 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                             mach->accel.patt_data_idx += 2;
                         else
                             mach->accel.patt_data_idx = (mach->accel.patt_data_idx + 2) & mach->accel.patt_len;
-
                     }
                     mach_log("ExtCONFIG = %04x, Pattern Mono = %04x, selidx = %d, dataidx = %d, bit 0 = %02x len = %d.\n", mach->accel.ext_ge_config, val, mach->accel.patt_idx, mach->accel.patt_data_idx, val & 1, mach->accel.patt_len);
                 }
@@ -3363,9 +3384,9 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
         case 0xaeef:
             if (len == 1) {
                 mach->accel.dest_y_end = (mach->accel.dest_y_end & 0x0ff) | ((val & 0x07) << 8);
-                dev->data_available  = 0;
-                dev->data_available2 = 0;
-                mach->accel.cmd_type = 2; /*Non-conforming BitBLT from dest_y_end register (0xaeee)*/
+                dev->data_available    = 0;
+                dev->data_available2   = 0;
+                mach->accel.cmd_type   = 2; /*Non-conforming BitBLT from dest_y_end register (0xaeee)*/
                 mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, mach, dev, len);
             }
             break;
@@ -3430,9 +3451,9 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
         case 0xcaef:
             if (len == 1) {
                 mach->accel.scan_to_x = (mach->accel.scan_to_x & 0x0ff) | ((val & 0x07) << 8);
-                dev->data_available  = 0;
-                dev->data_available2 = 0;
-                mach->accel.cmd_type = 5; /*Horizontal Raster Draw from scan_to_x register (0xcaee)*/
+                dev->data_available   = 0;
+                dev->data_available2  = 0;
+                mach->accel.cmd_type  = 5; /*Horizontal Raster Draw from scan_to_x register (0xcaee)*/
                 mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, mach, dev, len);
             }
             break;
@@ -3551,10 +3572,10 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                 mach_log("FEEE val = %d, lineidx = %d, DPCONFIG = %04x, CPUCX = %04x.\n", val, mach->accel.line_idx, mach->accel.dp_config, CX);
             if (len != 1) {
                 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];
+                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;
                     mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, mach, dev, len);
@@ -3573,8 +3594,8 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
 static void
 mach_accel_out(uint16_t port, uint32_t val, mach_t *mach, int len)
 {
-    svga_t *svga = &mach->svga;
-    ibm8514_t *dev = &svga->dev8514;
+    svga_t    *svga = &mach->svga;
+    ibm8514_t *dev  = &svga->dev8514;
 
     mach_log("Port accel out = %04x, val = %04x, len = %d.\n", port, val, len);
 
@@ -3698,9 +3719,9 @@ mach_accel_out(uint16_t port, uint32_t val, mach_t *mach, int len)
                 if (!dev->local || !dev->ext_crt_pitch)
                     dev->ext_crt_pitch = 128;
                 dev->accel.advfunc_cntl = val & 7;
-                ibm8514_on = (dev->accel.advfunc_cntl & 1);
-                vga_on = !ibm8514_on;
-                dev->ibm_mode = 1;
+                ibm8514_on              = (dev->accel.advfunc_cntl & 1);
+                vga_on                  = !ibm8514_on;
+                dev->ibm_mode           = 1;
                 if (ibm8514_on)
                     svga->adv_flags |= FLAG_ATI;
                 else
@@ -3723,13 +3744,13 @@ mach_accel_out(uint16_t port, uint32_t val, mach_t *mach, int len)
                 else {
                     mach_log("AEE val=%02x.\n", val);
                     mach->cursor_offset_lo = val;
-                    svga->hwcursor.addr = mach->cursor_offset_lo << 2;
+                    svga->hwcursor.addr    = mach->cursor_offset_lo << 2;
                 }
                 break;
             case 0xaef:
                 if (len == 1) {
                     mach->cursor_offset_lo = (mach->cursor_offset_lo & 0x00ff) | (val << 8);
-                    svga->hwcursor.addr = mach->cursor_offset_lo << 2;
+                    svga->hwcursor.addr    = mach->cursor_offset_lo << 2;
                 }
                 break;
 
@@ -3737,14 +3758,14 @@ mach_accel_out(uint16_t port, uint32_t val, mach_t *mach, int len)
                 mach->cursor_offset_hi = val & 0x0f;
                 if (len != 1) {
                     svga->hwcursor.addr = ((mach->cursor_offset_lo | (mach->cursor_offset_hi << 16))) << 2;
-                    svga->hwcursor.ena = !!(val & 0x8000);
+                    svga->hwcursor.ena  = !!(val & 0x8000);
                 }
                 mach_log("EEE val=%08x.\n", svga->hwcursor.addr);
                 break;
             case 0xeef:
                 if (len == 1) {
                     svga->hwcursor.addr = ((mach->cursor_offset_lo | (mach->cursor_offset_hi << 16))) << 2;
-                    svga->hwcursor.ena = !!(val & 0x80);
+                    svga->hwcursor.ena  = !!(val & 0x80);
                 }
                 break;
 
@@ -3825,7 +3846,7 @@ mach_accel_out(uint16_t port, uint32_t val, mach_t *mach, int len)
 
             case 0x26ee:
                 mach_log("CRT Pitch = %d, original val = %d.\n", val << 3, val);
-                dev->ext_crt_pitch = val;
+                dev->ext_crt_pitch  = val;
                 dev->internal_pitch = val;
                 if (svga->bpp > 8) {
                     if (svga->bpp == 24)
@@ -3918,9 +3939,9 @@ mach_accel_out(uint16_t port, uint32_t val, mach_t *mach, int len)
                     mach->accel.clock_sel = (mach->accel.clock_sel & 0xff00) | val;
                 else {
                     mach->accel.clock_sel = val;
-                    ibm8514_on = (mach->accel.clock_sel & 1);
-                    vga_on = !ibm8514_on;
-                    dev->ibm_mode = 0;
+                    ibm8514_on            = (mach->accel.clock_sel & 1);
+                    vga_on                = !ibm8514_on;
+                    dev->ibm_mode         = 0;
                     if (ibm8514_on)
                         svga->adv_flags |= FLAG_ATI;
                     else
@@ -3932,9 +3953,9 @@ mach_accel_out(uint16_t port, uint32_t val, mach_t *mach, int len)
             case 0x4aef:
                 if (len == 1) {
                     mach->accel.clock_sel = (mach->accel.clock_sel & 0x00ff) | (val << 8);
-                    ibm8514_on = (mach->accel.clock_sel & 1);
-                    vga_on = !ibm8514_on;
-                    dev->ibm_mode = 0;
+                    ibm8514_on            = (mach->accel.clock_sel & 1);
+                    vga_on                = !ibm8514_on;
+                    dev->ibm_mode         = 0;
                     if (ibm8514_on)
                         svga->adv_flags |= FLAG_ATI;
                     else
@@ -4023,13 +4044,13 @@ mach_accel_out(uint16_t port, uint32_t val, mach_t *mach, int len)
                     mach->accel.ge_offset_lo = (mach->accel.ge_offset_lo & 0xff00) | val;
                 else {
                     mach->accel.ge_offset_lo = val;
-                    dev->accel.ge_offset = mach->accel.ge_offset_lo;
+                    dev->accel.ge_offset     = mach->accel.ge_offset_lo;
                 }
                 break;
             case 0x6eef:
                 if (len == 1) {
                     mach->accel.ge_offset_lo = (mach->accel.ge_offset_lo & 0x00ff) | (val << 8);
-                    dev->accel.ge_offset = mach->accel.ge_offset_lo;
+                    dev->accel.ge_offset     = mach->accel.ge_offset_lo;
                 }
                 break;
 
@@ -4039,13 +4060,13 @@ mach_accel_out(uint16_t port, uint32_t val, mach_t *mach, int len)
                     mach->accel.ge_offset_hi = (mach->accel.ge_offset_hi & 0xff00) | val;
                 else {
                     mach->accel.ge_offset_hi = val;
-                    dev->accel.ge_offset = mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16);
+                    dev->accel.ge_offset     = mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16);
                 }
                 break;
             case 0x72ef:
                 if (len == 1) {
                     mach->accel.ge_offset_hi = (mach->accel.ge_offset_hi & 0x00ff) | (val << 8);
-                    dev->accel.ge_offset = mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16);
+                    dev->accel.ge_offset     = mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16);
                 }
                 break;
 
@@ -4061,7 +4082,7 @@ mach_accel_out(uint16_t port, uint32_t val, mach_t *mach, int len)
                     mach->accel.ext_ge_config = (mach->accel.ext_ge_config & 0xff00) | val;
                 else {
                     mach->accel.ext_ge_config = val;
-                    dev->ext_crt_pitch = dev->internal_pitch;
+                    dev->ext_crt_pitch        = dev->internal_pitch;
                     switch (mach->accel.ext_ge_config & 0x30) {
                         case 0:
                         case 0x10:
@@ -4094,7 +4115,7 @@ mach_accel_out(uint16_t port, uint32_t val, mach_t *mach, int len)
                 mach_log("7AEF write val = %02x.\n", val);
                 if (len == 1) {
                     mach->accel.ext_ge_config = (mach->accel.ext_ge_config & 0x00ff) | (val << 8);
-                    dev->ext_crt_pitch = dev->internal_pitch;
+                    dev->ext_crt_pitch        = dev->internal_pitch;
                     switch (mach->accel.ext_ge_config & 0x30) {
                         case 0:
                         case 0x10:
@@ -4137,16 +4158,16 @@ mach_accel_out(uint16_t port, uint32_t val, mach_t *mach, int len)
 static uint32_t
 mach_accel_in(uint16_t port, mach_t *mach, int len)
 {
-    svga_t    *svga = &mach->svga;
-    ibm8514_t *dev = &svga->dev8514;
-    uint16_t  *vram_w = (uint16_t *) svga->vram;
-    uint16_t   temp = 0;
-    int        cmd;
-    int        vpos = dev->displine + svga->y_add;
-    int        vblankend = svga->vblankstart + svga->crtc[0x16];
-    int        frgd_sel;
-    int        bkgd_sel;
-    int        mono_src;
+    svga_t         *svga   = &mach->svga;
+    ibm8514_t      *dev    = &svga->dev8514;
+    const uint16_t *vram_w = (uint16_t *) svga->vram;
+    uint16_t        temp   = 0;
+    int             cmd;
+    int             vpos      = dev->displine + svga->y_add;
+    int             vblankend = svga->vblankstart + svga->crtc[0x16];
+    int             frgd_sel;
+    int             bkgd_sel;
+    int             mono_src;
 
     switch (port) {
         case 0x2e8:
@@ -4157,7 +4178,7 @@ mach_accel_in(uint16_t port, mach_t *mach, int len)
                     if (vpos >= svga->vblankstart || vpos <= vblankend)
                         temp |= 2;
                 } else {
-                     if (vpos >= svga->vblankstart && vpos <= vblankend)
+                    if (vpos >= svga->vblankstart && vpos <= vblankend)
                         temp |= 2;
                 }
             } else {
@@ -4167,7 +4188,7 @@ mach_accel_in(uint16_t port, mach_t *mach, int len)
                     if (vpos >= svga->vblankstart || vpos <= vblankend)
                         temp |= 2;
                 } else {
-                     if (vpos >= svga->vblankstart && vpos <= vblankend)
+                    if (vpos >= svga->vblankstart && vpos <= vblankend)
                         temp |= 2;
                 }
             }
@@ -4204,7 +4225,7 @@ mach_accel_in(uint16_t port, mach_t *mach, int len)
                     if (vpos >= svga->vblankstart || vpos <= vblankend)
                         dev->subsys_stat |= 1;
                 } else {
-                     if (vpos >= svga->vblankstart && vpos <= vblankend)
+                    if (vpos >= svga->vblankstart && vpos <= vblankend)
                         dev->subsys_stat |= 1;
                 }
             } else {
@@ -4214,7 +4235,7 @@ mach_accel_in(uint16_t port, mach_t *mach, int len)
                     if (vpos >= svga->vblankstart || vpos <= vblankend)
                         dev->subsys_stat |= 1;
                 } else {
-                     if (vpos >= svga->vblankstart && vpos <= vblankend)
+                    if (vpos >= svga->vblankstart && vpos <= vblankend)
                         dev->subsys_stat |= 1;
                 }
             }
@@ -4359,7 +4380,7 @@ mach_accel_in(uint16_t port, mach_t *mach, int len)
                                 temp |= (dev->vram[(dev->accel.newdest_in + dev->accel.cur_x) & dev->vram_mask] << 8);
                         }
                         if (dev->subsys_stat & 1) {
-                            dev->force_busy = 1;
+                            dev->force_busy     = 1;
                             dev->data_available = 1;
                         }
                     }
@@ -4376,7 +4397,7 @@ mach_accel_in(uint16_t port, mach_t *mach, int len)
                         cmd = -1;
                         READ_PIXTRANS_BYTE_IO(dev->accel.dx, 0, dev->local)
 
-                        temp = mach->accel.pix_trans[0];
+                        temp     = mach->accel.pix_trans[0];
                         frgd_sel = (mach->accel.dp_config >> 13) & 7;
                         bkgd_sel = (mach->accel.dp_config >> 7) & 3;
                         mono_src = (mach->accel.dp_config >> 5) & 3;
@@ -4451,7 +4472,7 @@ mach_accel_in(uint16_t port, mach_t *mach, int len)
             }
             break;
 
-/*ATI Mach8/32 specific registers*/
+            /*ATI Mach8/32 specific registers*/
         case 0x12ee:
             if (len == 1)
                 temp = mach->config1 & 0xff;
@@ -4831,7 +4852,7 @@ mach_accel_inw(uint16_t port, void *priv)
 static void
 mach32_ap_writeb(uint32_t addr, uint8_t val, void *priv)
 {
-    mach_t *mach = (mach_t *) priv;
+    mach_t *mach       = (mach_t *) priv;
     uint8_t port_dword = addr & 0xfc;
 
     if ((addr >= ((mach->ap_size << 20) - 0x200)) && (addr < (mach->ap_size << 20))) {
@@ -4851,7 +4872,7 @@ mach32_ap_writeb(uint32_t addr, uint8_t val, void *priv)
 static void
 mach32_ap_writew(uint32_t addr, uint16_t val, void *priv)
 {
-    mach_t *mach = (mach_t *) priv;
+    mach_t *mach       = (mach_t *) priv;
     uint8_t port_dword = addr & 0xfc;
 
     if ((addr >= ((mach->ap_size << 20) - 0x200)) && (addr < (mach->ap_size << 20))) {
@@ -4871,7 +4892,7 @@ mach32_ap_writew(uint32_t addr, uint16_t val, void *priv)
 static void
 mach32_ap_writel(uint32_t addr, uint32_t val, void *priv)
 {
-    mach_t *mach = (mach_t *) priv;
+    mach_t *mach       = (mach_t *) priv;
     uint8_t port_dword = addr & 0xfc;
 
     if ((addr >= ((mach->ap_size << 20) - 0x200)) && (addr < (mach->ap_size << 20))) {
@@ -4912,9 +4933,9 @@ mach32_ap_readb(uint32_t addr, void *priv)
 static uint16_t
 mach32_ap_readw(uint32_t addr, void *priv)
 {
-    mach_t *mach = (mach_t *) priv;
+    mach_t  *mach = (mach_t *) priv;
     uint16_t temp;
-    uint8_t port_dword = addr & 0xfc;
+    uint8_t  port_dword = addr & 0xfc;
 
     if ((addr >= ((mach->ap_size << 20) - 0x200)) && (addr < (mach->ap_size << 20))) {
         if (addr & 0x100) {
@@ -4931,9 +4952,9 @@ mach32_ap_readw(uint32_t addr, void *priv)
 static uint32_t
 mach32_ap_readl(uint32_t addr, void *priv)
 {
-    mach_t *mach = (mach_t *) priv;
+    mach_t  *mach = (mach_t *) priv;
     uint32_t temp;
-    uint8_t port_dword = addr & 0xfc;
+    uint8_t  port_dword = addr & 0xfc;
 
     if ((addr >= ((mach->ap_size << 20) - 0x200)) && (addr < (mach->ap_size << 20))) {
         if (addr & 0x100) {
@@ -5016,12 +5037,12 @@ mach32_updatemapping(mach_t *mach)
 static void
 mach32_hwcursor_draw(svga_t *svga, int displine)
 {
-    mach_t   *mach = (mach_t *) svga->priv;
-    uint16_t dat;
-    int      comb;
-    int      offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
-    uint32_t color0;
-    uint32_t color1;
+    const mach_t *mach = (mach_t *) svga->priv;
+    uint16_t      dat;
+    int           comb;
+    int           offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
+    uint32_t      color0;
+    uint32_t      color1;
 
     if (svga->bpp == 8) {
         color0 = svga->pallook[mach->cursor_col_0];
@@ -5076,11 +5097,11 @@ static void
 mach_io_remove(mach_t *mach)
 {
     io_removehandler(0x01ce, 2,
-                mach_in, NULL, NULL,
-                mach_out, NULL, NULL, mach);
+                     mach_in, NULL, NULL,
+                     mach_out, NULL, NULL, mach);
     io_removehandler(0x03c0, 32,
-                mach_in, NULL, NULL,
-                mach_out, NULL, NULL, mach);
+                     mach_in, NULL, NULL,
+                     mach_out, NULL, NULL, mach);
 
     io_removehandler(0x2e8, 0x0002, mach_accel_inb, mach_accel_inw, NULL, mach_accel_outb, mach_accel_outw, NULL, mach);
     io_removehandler(0x2ea, 0x0004, mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
@@ -5196,11 +5217,11 @@ static void
 mach_io_set(mach_t *mach)
 {
     io_sethandler(0x01ce, 2,
-                mach_in, NULL, NULL,
-                mach_out, NULL, NULL, mach);
+                  mach_in, NULL, NULL,
+                  mach_out, NULL, NULL, mach);
     io_sethandler(0x03c0, 32,
-                mach_in, NULL, NULL,
-                mach_out, NULL, NULL, mach);
+                  mach_in, NULL, NULL,
+                  mach_out, NULL, NULL, mach);
 
     io_sethandler(0x2e8, 0x0002, mach_accel_inb, mach_accel_inw, NULL, mach_accel_outb, mach_accel_outw, NULL, mach);
     io_sethandler(0x2ea, 0x0004, mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
@@ -5315,8 +5336,8 @@ mach_io_set(mach_t *mach)
 static uint8_t
 mach32_pci_read(UNUSED(int func), int addr, void *priv)
 {
-    mach_t  *mach = (mach_t *) priv;
-    uint8_t  ret    = 0x00;
+    const mach_t *mach = (mach_t *) priv;
+    uint8_t       ret  = 0x00;
 
     switch (addr) {
         case 0x00:
@@ -5438,16 +5459,16 @@ mach32_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 static void *
 mach8_init(const device_t *info)
 {
-    mach_t *mach;
-    svga_t *svga;
+    mach_t    *mach;
+    svga_t    *svga;
     ibm8514_t *dev;
-    uint32_t memory;
+    uint32_t   memory;
 
     mach = malloc(sizeof(mach_t));
     memset(mach, 0x00, sizeof(mach_t));
 
     svga = &mach->svga;
-    dev = &svga->dev8514;
+    dev  = &svga->dev8514;
 
     mach->pci_bus    = !!(info->flags & DEVICE_PCI);
     mach->vlb_bus    = !!(info->flags & DEVICE_VLB);
@@ -5483,10 +5504,10 @@ mach8_init(const device_t *info)
     }
 
     svga_init(info, svga, mach, dev->local ? (memory << 10) : (512 << 10), /*default: 512kB for Mach8, 2MB for Mach32*/
-                  mach_recalctimings,
-                  mach_in, mach_out,
-                  dev->local ? mach32_hwcursor_draw : NULL,
-                  NULL);
+              mach_recalctimings,
+              mach_in, mach_out,
+              dev->local ? mach32_hwcursor_draw : NULL,
+              NULL);
 
     if (dev->local) {
         switch (memory) {
@@ -5504,8 +5525,8 @@ mach8_init(const device_t *info)
                 break;
         }
         svga->hwcursor.cur_ysize = 64;
-        mach->config1 = 0x20;
-        mach->config2 = 0x08;
+        mach->config1            = 0x20;
+        mach->config2            = 0x08;
         /*Fake the RAMDAC to give the VLB/MCA variants full 24-bit support until said RAMDAC is implemented.*/
         if (mach->vlb_bus) {
             video_inform(VIDEO_FLAG_TYPE_8514, &timing_mach32_vlb);
@@ -5524,33 +5545,33 @@ mach8_init(const device_t *info)
         mem_mapping_disable(&mach->mmio_linear_mapping);
     } else {
         video_inform(VIDEO_FLAG_TYPE_8514, &timing_gfxultra_isa);
-        mach->config1 = 0x02 | 0x20 | 0x80;
-        mach->config2 = 0x02;
+        mach->config1  = 0x02 | 0x20 | 0x80;
+        mach->config2  = 0x02;
         dev->ext_pitch = 1024;
     }
 
     svga->force_old_addr = 1;
-    svga->miscout = 1;
-    svga->bpp = 8;
-    svga->packed_chain4 = 1;
-    ibm8514_enabled = 1;
-    ibm8514_has_vga = 1;
-    dev->ibm_mode = 1;
-    dev->rowoffset = 128;
+    svga->miscout        = 1;
+    svga->bpp            = 8;
+    svga->packed_chain4  = 1;
+    ibm8514_enabled      = 1;
+    ibm8514_has_vga      = 1;
+    dev->ibm_mode        = 1;
+    dev->rowoffset       = 128;
     mach_io_set(mach);
 
     if (dev->local) {
-        svga->decode_mask = (4 << 20) - 1;
-        mach->cursor_col_1 = 0xff;
+        svga->decode_mask     = (4 << 20) - 1;
+        mach->cursor_col_1    = 0xff;
         mach->ext_cur_col_1_r = 0xff;
         mach->ext_cur_col_1_g = 0xff;
-        dev->ext_crt_pitch = 128;
+        dev->ext_crt_pitch    = 128;
         if (mach->vlb_bus)
             ati_eeprom_load(&mach->eeprom, "mach32_vlb.nvr", 1);
         else if (mach->pci_bus) {
             ati_eeprom_load(&mach->eeprom, "mach32_pci.nvr", 1);
             mem_mapping_disable(&mach->bios_rom.mapping);
-            mach->card = pci_add_card(PCI_ADD_VIDEO, mach32_pci_read, mach32_pci_write, mach);
+            mach->card                      = pci_add_card(PCI_ADD_VIDEO, mach32_pci_read, mach32_pci_write, mach);
             mach->pci_regs[PCI_REG_COMMAND] = 0x83;
             mach->pci_regs[0x30]            = 0x00;
             mach->pci_regs[0x32]            = 0x0c;
@@ -5591,9 +5612,9 @@ mach32_pci_available(void)
 static void
 mach_close(void *priv)
 {
-    mach_t *mach = (mach_t *) priv;
-    svga_t *svga = &mach->svga;
-    ibm8514_t *dev = &svga->dev8514;
+    mach_t    *mach = (mach_t *) priv;
+    svga_t    *svga = &mach->svga;
+    ibm8514_t *dev  = &svga->dev8514;
 
     if (dev) {
         free(dev->vram);
diff --git a/src/video/vid_cga.c b/src/video/vid_cga.c
index 69d9609c6..14ff3b221 100644
--- a/src/video/vid_cga.c
+++ b/src/video/vid_cga.c
@@ -99,7 +99,7 @@ cga_out(uint16_t addr, uint8_t val, void *priv)
 uint8_t
 cga_in(uint16_t addr, void *priv)
 {
-    cga_t *cga = (cga_t *) priv;
+    const cga_t *cga = (cga_t *) priv;
 
     uint8_t ret = 0xff;
 
@@ -135,7 +135,7 @@ cga_pravetz_out(UNUSED(uint16_t addr), uint8_t val, void *priv)
 uint8_t
 cga_pravetz_in(UNUSED(uint16_t addr), void *priv)
 {
-    cga_t *cga = (cga_t *) priv;
+    const cga_t *cga = (cga_t *) priv;
 
     return (cga->fontbase >> 8);
 }
diff --git a/src/video/vid_cga_comp.c b/src/video/vid_cga_comp.c
index 52e7675ee..31e4a6bf7 100644
--- a/src/video/vid_cga_comp.c
+++ b/src/video/vid_cga_comp.c
@@ -172,7 +172,7 @@ update_cga16_color(uint8_t cgamode)
     video_sharpness = (int) (sharpness * 256 / 100);
 }
 
-static Bit8u
+static uint8_t
 byte_clamp(int v)
 {
     v >>= 13;
@@ -186,21 +186,20 @@ static int temp[SCALER_MAXWIDTH + 10] = { 0 };
 static int atemp[SCALER_MAXWIDTH + 2] = { 0 };
 static int btemp[SCALER_MAXWIDTH + 2] = { 0 };
 
-Bit32u *
-Composite_Process(uint8_t cgamode, Bit8u border, Bit32u blocks /*, bool doublewidth*/, Bit32u *TempLine)
+uint32_t *
+Composite_Process(uint8_t cgamode, uint8_t border, uint32_t blocks /*, bool doublewidth*/, uint32_t *TempLine)
 {
-    int    x;
-    Bit32u x2;
+    uint32_t x2;
 
     int w = blocks * 4;
 
-    int    *o;
-    Bit32u *rgbi;
-    int    *b;
-    int    *i;
-    Bit32u *srgb;
-    int    *ap;
-    int    *bp;
+    int            *o;
+    const uint32_t *rgbi;
+    const int      *b;
+    int            *i;
+    uint32_t       *srgb;
+    int            *ap;
+    int            *bp;
 
 #define COMPOSITE_CONVERT(I, Q)                                                  \
     do {                                                                         \
@@ -230,15 +229,15 @@ Composite_Process(uint8_t cgamode, Bit8u border, Bit32u blocks /*, bool doublewi
     o    = temp;
     rgbi = TempLine;
     b    = &CGA_Composite_Table[border * 68];
-    for (x = 0; x < 4; ++x)
+    for (uint8_t x = 0; x < 4; ++x)
         OUT(b[(x + 3) & 3]);
     OUT(CGA_Composite_Table[(border << 6) | ((*rgbi & 0x0f) << 2) | 3]);
-    for (x = 0; x < w - 1; ++x) {
+    for (int x = 0; x < w - 1; ++x) {
         OUT(CGA_Composite_Table[((rgbi[0] & 0x0f) << 6) | ((rgbi[1] & 0x0f) << 2) | (x & 3)]);
         ++rgbi;
     }
     OUT(CGA_Composite_Table[((*rgbi & 0x0f) << 6) | (border << 2) | 3]);
-    for (x = 0; x < 5; ++x)
+    for (uint8_t x = 0; x < 5; ++x)
         OUT(b[x & 3]);
 
     if ((cgamode & 4) != 0) {
@@ -258,7 +257,7 @@ Composite_Process(uint8_t cgamode, Bit8u border, Bit32u blocks /*, bool doublewi
         i  = temp + 4;
         ap = atemp + 1;
         bp = btemp + 1;
-        for (x = -1; x < w + 1; ++x) {
+        for (int x = -1; x < w + 1; ++x) {
             ap[x] = i[-4] - ((i[-2] - i[0] + i[2]) << 1) + i[4];
             bp[x] = (i[-3] - i[-1] + i[1] - i[3]) << 1;
             ++i;
diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c
index 2f13a5c0e..babd45756 100644
--- a/src/video/vid_ega.c
+++ b/src/video/vid_ega.c
@@ -56,7 +56,7 @@ static video_timings_t timing_ega = { .type = VIDEO_ISA, .write_b = 8, .write_w
 static uint8_t         ega_rotate[8][256];
 static uint32_t        pallook16[256];
 static uint32_t        pallook64[256];
-static int             ega_type = 0;
+static int             ega_type           = 0;
 static int             old_overscan_color = 0;
 
 uint8_t egaremap2bpp[256];
@@ -64,7 +64,7 @@ uint8_t egaremap2bpp[256];
 /* 3C2 controls default mode on EGA. On VGA, it determines monitor type (mono or colour):
     7=CGA mode (200 lines), 9=EGA mode (350 lines), 8=EGA mode (200 lines). */
 int egaswitchread;
-int egaswitches = 9;
+int egaswitches     = 9;
 int update_overscan = 0;
 
 uint8_t ega_in(uint16_t addr, void *priv);
@@ -102,6 +102,9 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
                 case 0xb3:
                     ati_eeprom_write((ati_eeprom_t *) ega->eeprom, val & 8, val & 2, val & 1);
                     break;
+
+                default:
+                    break;
             }
             break;
 
@@ -180,6 +183,9 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
                 case 4:
                     ega->chain2_write = !(val & 4);
                     break;
+
+                default:
+                    break;
             }
             break;
         case 0x3ce:
@@ -213,11 +219,17 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
                         case 0xC: /*32k at B8000*/
                             mem_mapping_set_addr(&ega->mapping, 0xb8000, 0x08000);
                             break;
+
+                        default:
+                            break;
                     }
                     break;
                 case 7:
                     ega->colournocare = val;
                     break;
+
+                default:
+                    break;
             }
             break;
         case 0x3d0:
@@ -244,6 +256,9 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
                 }
             }
             break;
+
+        default:
+            break;
     }
 }
 
@@ -267,6 +282,7 @@ ega_in(uint16_t addr, void *priv)
                     if (ati_eeprom_read((ati_eeprom_t *) ega->eeprom))
                         ret |= 8;
                     break;
+
                 default:
                     ret = ega->regs[ega->index];
                     break;
@@ -315,7 +331,7 @@ ega_in(uint16_t addr, void *priv)
             break;
         case 0x3d1:
         case 0x3d5:
-            switch(ega->crtcreg) {
+            switch (ega->crtcreg) {
                 case 0xc:
                 case 0xd:
                 case 0xe:
@@ -340,6 +356,9 @@ ega_in(uint16_t addr, void *priv)
             ega->stat ^= 0x30; /*Fools IBM EGA video BIOS self-test*/
             ret = ega->stat;
             break;
+
+        default:
+            break;
     }
 
     return ret;
@@ -435,11 +454,11 @@ ega_recalctimings(ega_t *ega)
                 ega->hdisp *= (ega->seqregs[1] & 1) ? 16 : 18;
             else
                 ega->hdisp *= (ega->seqregs[1] & 1) ? 8 : 9;
-            ega->render = ega_render_text;
+            ega->render    = ega_render_text;
             ega->hdisp_old = ega->hdisp;
         } else {
             ega->hdisp *= (ega->seqregs[1] & 8) ? 16 : 8;
-            ega->render = ega_render_graphics;
+            ega->render    = ega_render_graphics;
             ega->hdisp_old = ega->hdisp;
         }
     }
@@ -779,7 +798,7 @@ ega_remap_cpu_addr(uint32_t inaddr, ega_t *ega)
     if (ega->gdcreg[6] & 2) {
         a0mux |= 2;
     }
-    if (ega->vram_limit <= 64*1024) {
+    if (ega->vram_limit <= 64 * 1024) {
         a0mux |= 1;
     }
 
@@ -798,6 +817,9 @@ ega_remap_cpu_addr(uint32_t inaddr, ega_t *ega)
         case 0xC: // 32K B800
             addr &= 0x7FFF;
             break;
+
+        default:
+            break;
     }
 
     switch (a0mux) {
@@ -811,15 +833,18 @@ ega_remap_cpu_addr(uint32_t inaddr, ega_t *ega)
             // A0 becomes the inversion of PGSEL (reg 0x3C2, miscout, bit 5)
             // That is, 1 selects the "low" 64k, and 0 selects the "high" 64k.
             addr &= ~1;
-            addr |= (~ega->miscout>>5)&1;
+            addr |= (~ega->miscout >> 5) & 1;
             break;
         case 3: // A0 becomes A14
             addr &= ~1;
-            addr |= (inaddr>>14)&1;
+            addr |= (inaddr >> 14) & 1;
             break;
         case 6: // A0 becomes A16
             addr &= ~1;
-            addr |= (inaddr>>16)&1;
+            addr |= (inaddr >> 16) & 1;
+            break;
+
+        default:
             break;
     }
 
@@ -940,6 +965,9 @@ ega_write(uint32_t addr, uint8_t val, void *priv)
                         if (writemask2 & 8)
                             ega->vram[addr | 0x3] = (vald & ega->gdcreg[8]) ^ ega->ld;
                         break;
+
+                    default:
+                        break;
                 }
             }
             break;
@@ -999,9 +1027,15 @@ ega_write(uint32_t addr, uint8_t val, void *priv)
                         if (writemask2 & 8)
                             ega->vram[addr | 0x3] = (vald & ega->gdcreg[8]) ^ ega->ld;
                         break;
+
+                    default:
+                        break;
                 }
             }
             break;
+
+        default:
+            break;
     }
 }
 
@@ -1111,6 +1145,9 @@ ega_init(ega_t *ega, int monitor_type, int is_mono)
                             case 3:
                                 pallook64[c] = pallook16[c] = makecol32(0x34, 0xff, 0x5d);
                                 break;
+
+                            default:
+                                break;
                         }
                         break;
                     case DISPLAY_AMBER:
@@ -1124,6 +1161,9 @@ ega_init(ega_t *ega, int monitor_type, int is_mono)
                             case 3:
                                 pallook64[c] = pallook16[c] = makecol32(0xff, 0xe3, 0x34);
                                 break;
+
+                            default:
+                                break;
                         }
                         break;
                     case DISPLAY_WHITE:
@@ -1138,6 +1178,9 @@ ega_init(ega_t *ega, int monitor_type, int is_mono)
                             case 3:
                                 pallook64[c] = pallook16[c] = makecol32(0xff, 0xfd, 0xed);
                                 break;
+
+                            default:
+                                break;
                         }
                         break;
                 }
@@ -1201,8 +1244,8 @@ ega_standalone_init(const device_t *info)
         ega_type = 1;
 
     switch (info->local) {
-        case EGA_IBM:
         default:
+        case EGA_IBM:
             rom_init(&ega->bios_rom, BIOS_IBM_PATH,
                      0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
             break;
diff --git a/src/video/vid_ega_render.c b/src/video/vid_ega_render.c
index 01ee7ac04..2d15d6dc5 100644
--- a/src/video/vid_ega_render.c
+++ b/src/video/vid_ega_render.c
@@ -115,16 +115,16 @@ ega_render_text(ega_t *ega)
     ega->lastline_draw = ega->displine;
 
     if (ega->fullchange) {
-        const bool doublewidth = ((ega->seqregs[1] & 8) != 0);
-        const bool attrblink = ((ega->attrregs[0x10] & 8) != 0);
+        const bool doublewidth   = ((ega->seqregs[1] & 8) != 0);
+        const bool attrblink     = ((ega->attrregs[0x10] & 8) != 0);
         const bool attrlinechars = (ega->attrregs[0x10] & 4);
-        const bool crtcreset = ((ega->crtc[0x17] & 0x80) == 0);
-        const bool seq9dot = ((ega->seqregs[1] & 1) == 0);
-        const int dwshift = doublewidth ? 1 : 0;
-        const int dotwidth = 1 << dwshift;
-        const int charwidth = dotwidth*(seq9dot ? 9 : 8);
-        const bool blinked = ega->blink & 0x10;
-        uint32_t *p = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
+        const bool crtcreset     = ((ega->crtc[0x17] & 0x80) == 0);
+        const bool seq9dot       = ((ega->seqregs[1] & 1) == 0);
+        const int  dwshift       = doublewidth ? 1 : 0;
+        const int  dotwidth      = 1 << dwshift;
+        const int  charwidth     = dotwidth * (seq9dot ? 9 : 8);
+        const bool blinked       = ega->blink & 0x10;
+        uint32_t  *p             = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
 
         for (int x = 0; x < (ega->hdisp + ega->scrollcache); x += charwidth) {
             uint32_t addr = ega->remap_func(ega, ega->ma) & ega->vrammask;
@@ -167,7 +167,7 @@ ega_render_text(ega_t *ega)
                 dat |= (dat >> 1) & 1;
 
             for (int xx = 0; xx < charwidth; xx++)
-                p[xx] = (dat & (0x100 >> (xx>>dwshift))) ? fg : bg;
+                p[xx] = (dat & (0x100 >> (xx >> dwshift))) ? fg : bg;
 
             ega->ma += 4;
             p += charwidth;
@@ -186,28 +186,28 @@ ega_render_graphics(ega_t *ega)
         ega->firstline_draw = ega->displine;
     ega->lastline_draw = ega->displine;
 
-    const bool doublewidth = ((ega->seqregs[1] & 8) != 0);
-    const bool cga2bpp = ((ega->gdcreg[5] & 0x20) != 0);
-    const bool attrblink = ((ega->attrregs[0x10] & 8) != 0);
-    const bool blinked = ega->blink & 0x10;
-    const bool crtcreset = ((ega->crtc[0x17] & 0x80) == 0);
-    const bool seqoddeven = ((ega->seqregs[1] & 4) != 0);
-    const uint8_t blinkmask = (attrblink && blinked ? 0x8 : 0x0);
-    uint32_t *p = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
-    const int dwshift = doublewidth ? 1 : 0;
-    const int dotwidth = 1 << dwshift;
-    const int charwidth = dotwidth*8;
-    int secondcclk = 0;
+    const bool    doublewidth = ((ega->seqregs[1] & 8) != 0);
+    const bool    cga2bpp     = ((ega->gdcreg[5] & 0x20) != 0);
+    const bool    attrblink   = ((ega->attrregs[0x10] & 8) != 0);
+    const bool    blinked     = ega->blink & 0x10;
+    const bool    crtcreset   = ((ega->crtc[0x17] & 0x80) == 0);
+    const bool    seqoddeven  = ((ega->seqregs[1] & 4) != 0);
+    const uint8_t blinkmask   = (attrblink && blinked ? 0x8 : 0x0);
+    uint32_t     *p           = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
+    const int     dwshift     = doublewidth ? 1 : 0;
+    const int     dotwidth    = 1 << dwshift;
+    const int     charwidth   = dotwidth * 8;
+    int           secondcclk  = 0;
     for (int x = 0; x <= (ega->hdisp + ega->scrollcache); x += charwidth) {
         uint32_t addr = ega->remap_func(ega, ega->ma) & ega->vrammask;
 
         uint8_t edat[4];
         if (seqoddeven) {
             // FIXME: Verify the behaviour of planes 1,3 on actual hardware
-            edat[0] = ega->vram[(addr | 0) ^ secondcclk];
-            edat[1] = ega->vram[(addr | 1) ^ secondcclk];
-            edat[2] = ega->vram[(addr | 2) ^ secondcclk];
-            edat[3] = ega->vram[(addr | 3) ^ secondcclk];
+            edat[0]    = ega->vram[(addr | 0) ^ secondcclk];
+            edat[1]    = ega->vram[(addr | 1) ^ secondcclk];
+            edat[2]    = ega->vram[(addr | 2) ^ secondcclk];
+            edat[3]    = ega->vram[(addr | 3) ^ secondcclk];
             secondcclk = (secondcclk + 1) & 1;
             if (secondcclk == 0)
                 ega->ma += 4;
@@ -219,25 +219,25 @@ ega_render_graphics(ega_t *ega)
 
         if (cga2bpp) {
             // Remap CGA 2bpp-chunky data into fully planar data
-            uint8_t dat0 = egaremap2bpp[edat[1]   ] | (egaremap2bpp[edat[0]   ] << 4);
-            uint8_t dat1 = egaremap2bpp[edat[1]>>1] | (egaremap2bpp[edat[0]>>1] << 4);
-            uint8_t dat2 = egaremap2bpp[edat[3]   ] | (egaremap2bpp[edat[2]   ] << 4);
-            uint8_t dat3 = egaremap2bpp[edat[3]>>1] | (egaremap2bpp[edat[2]>>1] << 4);
-            edat[0] = dat0;
-            edat[1] = dat1;
-            edat[2] = dat2;
-            edat[3] = dat3;
+            uint8_t dat0 = egaremap2bpp[edat[1]] | (egaremap2bpp[edat[0]] << 4);
+            uint8_t dat1 = egaremap2bpp[edat[1] >> 1] | (egaremap2bpp[edat[0] >> 1] << 4);
+            uint8_t dat2 = egaremap2bpp[edat[3]] | (egaremap2bpp[edat[2]] << 4);
+            uint8_t dat3 = egaremap2bpp[edat[3] >> 1] | (egaremap2bpp[edat[2] >> 1] << 4);
+            edat[0]      = dat0;
+            edat[1]      = dat1;
+            edat[2]      = dat2;
+            edat[3]      = dat3;
         }
 
         if (!crtcreset) {
             for (int i = 0; i < 8; i += 2) {
                 const int outoffs = i << dwshift;
                 const int inshift = 6 - i;
-                uint8_t dat = (edatlookup[(edat[0] >> inshift) & 3][(edat[1] >> inshift) & 3]     )
-                            | (edatlookup[(edat[2] >> inshift) & 3][(edat[3] >> inshift) & 3] << 2);
+                uint8_t   dat     = (edatlookup[(edat[0] >> inshift) & 3][(edat[1] >> inshift) & 3])
+                    | (edatlookup[(edat[2] >> inshift) & 3][(edat[3] >> inshift) & 3] << 2);
                 // FIXME: Confirm blink behaviour is actually XOR on real hardware
                 uint32_t p0 = ega->pallook[ega->egapal[((dat >> 4) & ega->plane_mask) ^ blinkmask]];
-                uint32_t p1 = ega->pallook[ega->egapal[(dat      & ega->plane_mask) ^ blinkmask]];
+                uint32_t p1 = ega->pallook[ega->egapal[(dat & ega->plane_mask) ^ blinkmask]];
                 for (int subx = 0; subx < dotwidth; subx++)
                     p[outoffs + subx] = p0;
                 for (int subx = 0; subx < dotwidth; subx++)
diff --git a/src/video/vid_mda.c b/src/video/vid_mda.c
index 8888208e2..f743885c5 100644
--- a/src/video/vid_mda.c
+++ b/src/video/vid_mda.c
@@ -75,7 +75,7 @@ mda_out(uint16_t addr, uint8_t val, void *priv)
 uint8_t
 mda_in(uint16_t addr, void *priv)
 {
-    mda_t *mda = (mda_t *) priv;
+    const mda_t *mda = (mda_t *) priv;
 
     switch (addr) {
         case 0x3b0:
@@ -107,7 +107,7 @@ mda_write(uint32_t addr, uint8_t val, void *priv)
 uint8_t
 mda_read(uint32_t addr, void *priv)
 {
-    mda_t *mda = (mda_t *) priv;
+    const mda_t *mda = (mda_t *) priv;
 
     return mda->vram[addr & 0xfff];
 }
diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index b35810e03..0e83c034a 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -169,7 +169,7 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
         case 0x3c3:
             if (xga_enabled) {
                 svga->xga.on = (val & 0x01) ? 0 : 1;
-                vga_on = !svga->xga.on;
+                vga_on       = !svga->xga.on;
             }
             break;
         case 0x3c4:
@@ -205,6 +205,9 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                     svga->chain4       = val & 8;
                     svga->fast         = (svga->gdcreg[8] == 0xff && !(svga->gdcreg[3] & 0x18) && !svga->gdcreg[1]) && ((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only) && !(svga->adv_flags & FLAG_ADDR_BY8);
                     break;
+
+                default:
+                    break;
             }
             break;
         case 0x2ea:
@@ -245,6 +248,9 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                     svga->dac_pos  = 0;
                     svga->dac_addr = (svga->dac_addr + 1) & 255;
                     break;
+
+                default:
+                    break;
             }
             break;
         case 0x3ce:
@@ -283,18 +289,27 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                                 mem_mapping_set_addr(&svga->mapping, 0xb8000, 0x08000);
                                 svga->banked_mask = 0x7fff;
                                 break;
+
+                            default:
+                                break;
                         }
                     }
                     break;
                 case 7:
                     svga->colournocare = val;
                     break;
+
+                default:
+                    break;
             }
             svga->gdcreg[svga->gdcaddr & 15] = val;
             svga->fast                       = (svga->gdcreg[8] == 0xff && !(svga->gdcreg[3] & 0x18) && !svga->gdcreg[1]) && ((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only);
             if (((svga->gdcaddr & 15) == 5 && (val ^ o) & 0x70) || ((svga->gdcaddr & 15) == 6 && (val ^ o) & 1))
                 svga_recalctimings(svga);
             break;
+
+        default:
+            break;
     }
 }
 
@@ -362,6 +377,9 @@ svga_in(uint16_t addr, void *priv)
                     else
                         ret = svga->vgapal[index].b & 0x3f;
                     break;
+
+                default:
+                    break;
             }
             if (svga->adv_flags & FLAG_RAMDAC_SHIFT)
                 ret >>= 2;
@@ -403,6 +421,9 @@ svga_in(uint16_t addr, void *priv)
             ret = svga->cgastat;
 
             break;
+
+        default:
+            break;
     }
 
     return ret;
@@ -561,8 +582,14 @@ svga_recalctimings(svga_t *svga)
                             else
                                 svga->render = svga_render_32bpp_highres;
                             break;
+
+                        default:
+                            break;
                     }
                     break;
+
+                default:
+                    break;
             }
         }
     }
@@ -698,15 +725,15 @@ svga_do_render(svga_t *svga)
 void
 svga_poll(void *priv)
 {
-    svga_t  *svga = (svga_t *) priv;
-    ibm8514_t *dev = &svga->dev8514;
-    uint32_t x;
-    uint32_t blink_delay;
-    int      wx;
-    int      wy;
-    int      ret;
-    int      old_ma;
-    int      linecountff = 0;
+    svga_t    *svga = (svga_t *) priv;
+    ibm8514_t *dev  = &svga->dev8514;
+    uint32_t   x;
+    uint32_t   blink_delay;
+    int        wx;
+    int        wy;
+    int        ret;
+    int        old_ma;
+    int        linecountff = 0;
 
     if (!vga_on && ibm8514_enabled && ibm8514_on) {
         if (!dev->local) {
@@ -808,14 +835,14 @@ svga_poll(void *priv)
         if ((svga->sc == (svga->crtc[11] & 31)) || (svga->sc == svga->rowcount))
             svga->con = 0;
         if (svga->dispon) {
-        	/*Real IBM 8514/A or compatibility mode doesn't have linedbl, so skip those.*/
+            /*Real IBM 8514/A or compatibility mode doesn't have linedbl, so skip those.*/
             if (dev->local && ibm8514_on) {
-                svga->linedbl = 0;
+                svga->linedbl     = 0;
                 svga->linecountff = 0;
-                linecountff = 1;
+                linecountff       = 1;
             }
             if (svga->linedbl && !svga->linecountff && !linecountff) {
-            	svga->linecountff = 1;
+                svga->linecountff = 1;
                 svga->ma          = svga->maback;
             } else if (svga->sc == svga->rowcount) {
                 svga->linecountff = 0;
@@ -920,7 +947,7 @@ svga_poll(void *priv)
             svga->oddeven ^= 1;
 
             svga->monitor->mon_changeframecount = svga->interlace ? 3 : 2;
-            svga->vslines    = 0;
+            svga->vslines                       = 0;
 
             if ((dev->local && vga_on) || !dev->local) {
                 if (svga->interlace && svga->oddeven)
@@ -933,7 +960,7 @@ svga_poll(void *priv)
                 else
                     svga->ma = svga->maback = svga->ma_latch;
             }
-            svga->ca = ((svga->crtc[0xe] << 8) | svga->crtc[0xf]) + ((svga->crtc[0xb] & 0x60) >> 5) + svga->ca_adj;
+            svga->ca     = ((svga->crtc[0xe] << 8) | svga->crtc[0xf]) + ((svga->crtc[0xb] & 0x60) >> 5) + svga->ca_adj;
             svga->ma     = (svga->ma << 2);
             svga->maback = (svga->maback << 2);
             svga->ca     = (svga->ca << 2);
@@ -994,9 +1021,9 @@ svga_init(const device_t *info, svga_t *svga, void *priv, int memsize,
 {
     int e;
 
-    svga->priv = priv;
+    svga->priv          = priv;
     svga->monitor_index = monitor_index_global;
-    svga->monitor = &monitors[svga->monitor_index];
+    svga->monitor       = &monitors[svga->monitor_index];
 
     for (int c = 0; c < 256; c++) {
         e = c;
@@ -1010,10 +1037,10 @@ svga_init(const device_t *info, svga_t *svga, void *priv, int memsize,
     svga->attrregs[0x11] = 0;
     svga->overscan_color = 0x000000;
 
-    svga->monitor->mon_overscan_x  = 16;
-    svga->monitor->mon_overscan_y  = 32;
-    svga->x_add = 8;
-    svga->y_add = 16;
+    svga->monitor->mon_overscan_x = 16;
+    svga->monitor->mon_overscan_y = 32;
+    svga->x_add                   = 8;
+    svga->y_add                   = 16;
 
     svga->crtc[0]           = 63;
     svga->crtc[6]           = 255;
@@ -1127,7 +1154,7 @@ svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *priv)
     svga_t *svga = (svga_t *) priv;
 
     int     writemask2 = svga->writemask;
-    int     reset_wm = 0;
+    int     reset_wm   = 0;
     latch_t vall;
     uint8_t wm = svga->writemask;
     uint8_t count;
@@ -1156,7 +1183,7 @@ svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *priv)
                 }
             } else {
                 svga->xga.on = 0;
-                vga_on = !svga->xga.on;
+                vga_on       = !svga->xga.on;
             }
         }
         addr = svga_decode_addr(svga, addr, 1);
@@ -1328,6 +1355,9 @@ svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *priv)
                 }
             }
             break;
+
+        default:
+            break;
     }
 
     if (reset_wm)
@@ -1354,11 +1384,11 @@ svga_read_common(uint32_t addr, uint8_t linear, void *priv)
             if (((svga->xga.op_mode & 7) >= 4) && (svga->xga.aperture_cntl >= 1)) {
                 if (svga->xga.test == 0xa5) { /*Memory size test of XGA*/
                     svga->xga.on = 1;
-                    vga_on = !svga->xga.on;
+                    vga_on       = !svga->xga.on;
                     return svga->xga.test;
                 } else if (svga->xga.test == 0x5a) {
                     svga->xga.on = 1;
-                    vga_on = !svga->xga.on;
+                    vga_on       = !svga->xga.on;
                     return svga->xga.test;
                 } else if ((addr == 0xa0000) || (addr == 0xa0010)) {
                     addr += svga->xga.read_bank;
@@ -1366,7 +1396,7 @@ svga_read_common(uint32_t addr, uint8_t linear, void *priv)
                 }
             } else {
                 svga->xga.on = 0;
-                vga_on = !svga->xga.on;
+                vga_on       = !svga->xga.on;
             }
         }
         addr = svga_decode_addr(svga, addr, 0);
@@ -1404,7 +1434,7 @@ svga_read_common(uint32_t addr, uint8_t linear, void *priv)
         addr &= ~1;
         if (linear && ibm8514_on && (svga->adv_flags & FLAG_ATI))
             addr &= svga->vram_mask;
-       	else
+        else
             addr <<= 2;
     } else {
         if (linear && ibm8514_on && (svga->adv_flags & FLAG_ATI)) {
@@ -1586,8 +1616,8 @@ svga_writeb_linear(uint32_t addr, uint8_t val, void *priv)
     if (addr >= svga->vram_max)
         return;
     addr &= svga->vram_mask;
-    svga->changedvram[addr >> 12]  = svga->monitor->mon_changeframecount;
-    *(uint8_t *) &svga->vram[addr] = val;
+    svga->changedvram[addr >> 12] = svga->monitor->mon_changeframecount;
+    *&svga->vram[addr]            = val;
 }
 
 void
@@ -1713,7 +1743,7 @@ svga_writel_linear(uint32_t addr, uint32_t val, void *priv)
 uint8_t
 svga_readb_linear(uint32_t addr, void *priv)
 {
-    svga_t *svga = (svga_t *) priv;
+    const svga_t *svga = (svga_t *) priv;
 
     if (!svga->fast)
         return svga_read_linear(addr, priv);
@@ -1722,7 +1752,7 @@ svga_readb_linear(uint32_t addr, void *priv)
     if (addr >= svga->vram_max)
         return 0xff;
 
-    return *(uint8_t *) &svga->vram[addr & svga->vram_mask];
+    return *&svga->vram[addr & svga->vram_mask];
 }
 
 uint16_t
@@ -1744,8 +1774,8 @@ svga_readw_common(uint32_t addr, uint8_t linear, void *priv)
 
     addr &= svga->decode_mask;
     if (svga->translate_address) {
-        uint8_t  val1 = 0xff;
-        uint8_t  val2 = 0xff;
+        uint8_t  val1  = 0xff;
+        uint8_t  val2  = 0xff;
         uint32_t addr2 = svga->translate_address(addr, priv);
         if (addr2 < svga->vram_max)
             val1 = svga->vram[addr2 & svga->vram_mask];
@@ -1792,10 +1822,10 @@ svga_readl_common(uint32_t addr, uint8_t linear, void *priv)
 
     addr &= svga->decode_mask;
     if (svga->translate_address) {
-        uint8_t  val1 = 0xff;
-        uint8_t  val2 = 0xff;
-        uint8_t  val3 = 0xff;
-        uint8_t  val4 = 0xff;
+        uint8_t  val1  = 0xff;
+        uint8_t  val2  = 0xff;
+        uint8_t  val3  = 0xff;
+        uint8_t  val4  = 0xff;
         uint32_t addr2 = svga->translate_address(addr, priv);
         if (addr2 < svga->vram_max)
             val1 = svga->vram[addr2 & svga->vram_mask];
diff --git a/src/video/vid_svga_render.c b/src/video/vid_svga_render.c
index af4cb83da..c9369f09c 100644
--- a/src/video/vid_svga_render.c
+++ b/src/video/vid_svga_render.c
@@ -65,6 +65,9 @@ svga_render_blank(svga_t *svga)
         case 9:
             char_width = 16;
             break;
+
+        default:
+            break;
     }
 
     uint32_t *line_ptr   = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -1305,7 +1308,7 @@ svga_render_15bpp_mix_lowres(svga_t *svga)
         svga->lastline_draw = svga->displine;
 
         for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-            dat         = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+            dat       = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
             p[x << 1] = p[(x << 1) + 1] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 
             dat >>= 16;
@@ -1386,7 +1389,7 @@ svga_render_16bpp_lowres(svga_t *svga)
             svga->lastline_draw = svga->displine;
 
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-                dat         = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+                dat       = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
                 p[x << 1] = p[(x << 1) + 1] = video_16to32[dat & 0xffff];
                 p[(x << 1) + 2] = p[(x << 1) + 3] = video_16to32[dat >> 16];
 
diff --git a/src/video/vid_table.c b/src/video/vid_table.c
index aaf407ca4..eb999eb3f 100644
--- a/src/video/vid_table.c
+++ b/src/video/vid_table.c
@@ -412,7 +412,7 @@ video_get_video_from_internal_name(char *s)
     int c = 0;
 
     while (video_cards[c].device != NULL) {
-        if (!strcmp((char *) video_cards[c].device->internal_name, s))
+        if (!strcmp(video_cards[c].device->internal_name, s))
             return c;
         c++;
     }
diff --git a/src/video/vid_vga.c b/src/video/vid_vga.c
index cd70a1bc1..43b8a2750 100644
--- a/src/video/vid_vga.c
+++ b/src/video/vid_vga.c
@@ -69,6 +69,9 @@ vga_out(uint16_t addr, uint8_t val, void *priv)
                 }
             }
             break;
+
+        default:
+            break;
     }
     svga_out(addr, val, svga);
 }
diff --git a/src/video/vid_xga.c b/src/video/vid_xga.c
index 7afa3e41a..350fc1c50 100644
--- a/src/video/vid_xga.c
+++ b/src/video/vid_xga.c
@@ -34,26 +34,27 @@
 #include <86box/vid_svga_render.h>
 #include <86box/vid_xga_device.h>
 #include "cpu.h"
+#include <86box/plat_unused.h>
 
-#define XGA_BIOS_PATH  "roms/video/xga/XGA_37F9576_Ver200.BIN"
-#define XGA2_BIOS_PATH "roms/video/xga/xga2_v300.bin"
+#define XGA_BIOS_PATH       "roms/video/xga/XGA_37F9576_Ver200.BIN"
+#define XGA2_BIOS_PATH      "roms/video/xga/xga2_v300.bin"
 #define INMOS_XGA_BIOS_PATH "roms/video/xga/InMOS XGA - Fairchild NM27C256Q-150.BIN"
 
 static video_timings_t timing_xga_isa = { .type = VIDEO_ISA, .write_b = 3, .write_w = 3, .write_l = 6, .read_b = 5, .read_w = 5, .read_l = 10 };
 static video_timings_t timing_xga_mca = { .type = VIDEO_MCA, .write_b = 4, .write_w = 5, .write_l = 10, .read_b = 5, .read_w = 5, .read_l = 10 };
 
-static void    xga_ext_outb(uint16_t addr, uint8_t val, void *p);
-static uint8_t xga_ext_inb(uint16_t addr, void *p);
+static void    xga_ext_outb(uint16_t addr, uint8_t val, void *priv);
+static uint8_t xga_ext_inb(uint16_t addr, void *priv);
 
-static void xga_writew(uint32_t addr, uint16_t val, void *p);
-static uint16_t xga_readw(uint32_t addr, void *p);
+static void     xga_writew(uint32_t addr, uint16_t val, void *priv);
+static uint16_t xga_readw(uint32_t addr, void *priv);
 
 int xga_has_vga = 0;
 
 void
-svga_xga_out(uint16_t addr, uint8_t val, void *p)
+svga_xga_out(uint16_t addr, uint8_t val, void *priv)
 {
-    svga_t *svga = (svga_t *)p;
+    svga_t *svga = (svga_t *) priv;
     uint8_t old;
 
     if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
@@ -84,14 +85,17 @@ svga_xga_out(uint16_t addr, uint8_t val, void *p)
                 }
             }
             break;
+
+        default:
+            break;
     }
     svga_out(addr, val, svga);
 }
 
 uint8_t
-svga_xga_in(uint16_t addr, void *p)
+svga_xga_in(uint16_t addr, void *priv)
 {
-    svga_t *svga = (svga_t *)p;
+    svga_t *svga = (svga_t *) priv;
     uint8_t temp;
 
     if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
@@ -119,7 +123,9 @@ xga_updatemapping(svga_t *svga)
 {
     xga_t *xga = &svga->xga;
 
-    //pclog("OpMode = %x, linear base = %08x, aperture cntl = %d, access mode = %x, map = %x, endian reverse = %d, a5test = %d, XGA on = %d.\n", xga->op_mode, xga->linear_base, xga->aperture_cntl, xga->access_mode, svga->gdcreg[6] & 0x0c, xga->linear_endian_reverse, xga->a5_test, xga->on);
+#if 0
+    pclog("OpMode = %x, linear base = %08x, aperture cntl = %d, access mode = %x, map = %x, endian reverse = %d, a5test = %d, XGA on = %d.\n", xga->op_mode, xga->linear_base, xga->aperture_cntl, xga->access_mode, svga->gdcreg[6] & 0x0c, xga->linear_endian_reverse, xga->a5_test, xga->on);
+#endif
     if (((xga->op_mode & 7) >= 4) || ((xga->op_mode & 7) == 0)) {
         if ((xga->aperture_cntl == 1) || (xga->aperture_cntl == 2)) {
             mem_mapping_disable(&svga->mapping);
@@ -151,9 +157,13 @@ xga_updatemapping(svga_t *svga)
                 vga_on  = !xga->on;
             }
         }
-        //pclog("XGA opmode (extended) = %d, disp mode = %d, aperture = %d.\n", xga->op_mode & 7, xga->disp_cntl_2 & 7, xga->aperture_cntl);
+#if 0
+        pclog("XGA opmode (extended) = %d, disp mode = %d, aperture = %d.\n", xga->op_mode & 7, xga->disp_cntl_2 & 7, xga->aperture_cntl);
+#endif
     }
-    //pclog("VGA on = %d.\n", vga_on);
+#if 0
+    pclog("VGA on = %d.\n", vga_on);
+#endif
 }
 
 void
@@ -188,16 +198,19 @@ xga_recalctimings(svga_t *svga)
         switch ((xga->clk_sel_1 >> 2) & 3) {
             case 0:
                 if (xga->clk_sel_2 & 0x80) {
-                    svga->clock = (cpuclock * (double) (1ull << 32)) / 41539000.0;
+                    svga->clock = (cpuclock * (double) (1ULL << 32)) / 41539000.0;
                 } else {
-                    svga->clock = (cpuclock * (double) (1ull << 32)) / 25175000.0;
+                    svga->clock = (cpuclock * (double) (1ULL << 32)) / 25175000.0;
                 }
                 break;
             case 1:
-                svga->clock = (cpuclock * (double) (1ull << 32)) / 28322000.0;
+                svga->clock = (cpuclock * (double) (1ULL << 32)) / 28322000.0;
                 break;
             case 3:
-                svga->clock = (cpuclock * (double) (1ull << 32)) / 44900000.0;
+                svga->clock = (cpuclock * (double) (1ULL << 32)) / 44900000.0;
+                break;
+
+            default:
                 break;
         }
     }
@@ -343,8 +356,8 @@ xga_ext_out_reg(xga_t *xga, svga_t *svga, uint8_t idx, uint8_t val)
 
         case 0x51:
             xga->disp_cntl_2 = val;
-            xga->on = ((val & 7) >= 3);
-            vga_on = !xga->on;
+            xga->on          = ((val & 7) >= 3);
+            vga_on           = !xga->on;
             svga_recalctimings(svga);
             break;
 
@@ -390,7 +403,9 @@ xga_ext_out_reg(xga_t *xga, svga_t *svga, uint8_t idx, uint8_t val)
                     xga->cursor_data_on = 0;
                 }
             }
-            // pclog("Sprite POS = %d, data on = %d, idx = %d, apcntl = %d\n", xga->sprite_pos, xga->cursor_data_on, xga->sprite_pal_addr_idx, xga->aperture_cntl);
+#if 0
+            pclog("Sprite POS = %d, data on = %d, idx = %d, apcntl = %d\n", xga->sprite_pos, xga->cursor_data_on, xga->sprite_pal_addr_idx, xga->aperture_cntl);
+#endif
             break;
 
         case 0x62:
@@ -428,6 +443,9 @@ xga_ext_out_reg(xga_t *xga, svga_t *svga, uint8_t idx, uint8_t val)
                     svga->dac_pos         = 0;
                     svga->dac_addr        = (svga->dac_addr + 1) & 0xff;
                     break;
+
+                default:
+                    break;
             }
             break;
 
@@ -454,16 +472,21 @@ xga_ext_out_reg(xga_t *xga, svga_t *svga, uint8_t idx, uint8_t val)
             xga->clk_sel_2 = val;
             svga_recalctimings(svga);
             break;
+
+        default:
+            break;
     }
 }
 
 static void
-xga_ext_outb(uint16_t addr, uint8_t val, void *p)
+xga_ext_outb(uint16_t addr, uint8_t val, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
+    svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = &svga->xga;
 
-    //pclog("[%04X:%08X]: EXT OUTB = %02x, val = %02x\n", CS, cpu_state.pc, addr, val);
+#if 0
+    pclog("[%04X:%08X]: EXT OUTB = %02x, val = %02x\n", CS, cpu_state.pc, addr, val);
+#endif
     switch (addr & 0x0f) {
         case 0:
             xga->op_mode = val;
@@ -479,7 +502,9 @@ xga_ext_outb(uint16_t addr, uint8_t val, void *p)
             break;
         case 8:
             xga->ap_idx = val;
-            //pclog("Aperture CNTL = %d, val = %02x, up to bit6 = %02x\n", xga->aperture_cntl, val, val & 0x3f);
+#if 0
+            pclog("Aperture CNTL = %d, val = %02x, up to bit6 = %02x\n", xga->aperture_cntl, val, val & 0x3f);
+#endif
             if ((xga->op_mode & 7) < 4) {
                 xga->write_bank = xga->read_bank = 0;
             } else {
@@ -501,15 +526,18 @@ xga_ext_outb(uint16_t addr, uint8_t val, void *p)
             xga->regs[xga->regs_idx] = val;
             xga_ext_out_reg(xga, svga, xga->regs_idx, xga->regs[xga->regs_idx]);
             break;
+
+        default:
+            break;
     }
 }
 
 static uint8_t
-xga_ext_inb(uint16_t addr, void *p)
+xga_ext_inb(uint16_t addr, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
+    svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = &svga->xga;
-    uint8_t ret;
+    uint8_t ret  = 0;
     uint8_t index;
 
     switch (addr & 0x0f) {
@@ -693,6 +721,9 @@ xga_ext_inb(uint16_t addr, void *p)
                             svga->dac_addr = (svga->dac_addr + 1) & 0xff;
                             ret            = svga->vgapal[index].b;
                             break;
+
+                        default:
+                            break;
                     }
                     break;
 
@@ -711,7 +742,9 @@ xga_ext_inb(uint16_t addr, void *p)
                     break;
 
                 case 0x6a:
-                    // pclog("Sprite POS Read = %d, addr idx = %04x\n", xga->sprite_pos, xga->sprite_pal_addr_idx_prefetch);
+#if 0
+                    pclog("Sprite POS Read = %d, addr idx = %04x\n", xga->sprite_pos, xga->sprite_pal_addr_idx_prefetch);
+#endif
                     ret                      = xga->sprite_data[xga->sprite_pos_prefetch];
                     xga->sprite_pos_prefetch = (xga->sprite_pos_prefetch + 1) & 0x3ff;
                     break;
@@ -735,9 +768,15 @@ xga_ext_inb(uint16_t addr, void *p)
                     break;
             }
             break;
+
+        default:
+            break;
     }
 
-    //pclog("[%04X:%08X]: EXT INB = %02x, ret = %02x\n", CS, cpu_state.pc, addr, ret);
+#if 0
+    pclog("[%04X:%08X]: EXT INB = %02x, ret = %02x\n", CS, cpu_state.pc, addr, ret);
+#endif
+
     return ret;
 }
 
@@ -751,7 +790,7 @@ xga_ext_inb(uint16_t addr, void *p)
 #define READW(addr, dat) \
     dat = *(uint16_t *) &xga->vram[(addr) & (xga->vram_mask)];
 
-#define READW_INV(addr, dat) \
+#define READW_INV(addr, dat)                        \
     dat = xga->vram[(addr + 1) & (xga->vram_mask)]; \
     dat |= (xga->vram[(addr) & (xga->vram_mask)] << 8);
 
@@ -759,9 +798,9 @@ xga_ext_inb(uint16_t addr, void *p)
     *(uint16_t *) &xga->vram[((addr)) & (xga->vram_mask)] = dat; \
     xga->changedvram[(((addr)) & (xga->vram_mask)) >> 12] = svga->monitor->mon_changeframecount;
 
-#define WRITEW_INV(addr, dat)                                        \
-    xga->vram[((addr + 1)) & (xga->vram_mask)] = dat & 0xff; \
-    xga->vram[((addr)) & (xga->vram_mask)] = dat >> 8; \
+#define WRITEW_INV(addr, dat)                                           \
+    xga->vram[((addr + 1)) & (xga->vram_mask)]            = dat & 0xff; \
+    xga->vram[((addr)) & (xga->vram_mask)]                = dat >> 8;   \
     xga->changedvram[(((addr)) & (xga->vram_mask)) >> 12] = svga->monitor->mon_changeframecount;
 
 #define ROP(mix, d, s)                                                                 \
@@ -839,12 +878,12 @@ xga_ext_inb(uint16_t addr, void *p)
 static uint32_t
 xga_accel_read_pattern_map_pixel(svga_t *svga, int x, int y, int map, uint32_t base, int width)
 {
-    xga_t   *xga  = &svga->xga;
-    uint32_t addr = base;
-    int      bits;
-    uint32_t byte;
-    uint8_t  px;
-    int      skip = 0;
+    const xga_t *xga  = &svga->xga;
+    uint32_t     addr = base;
+    int          bits;
+    uint32_t     byte;
+    uint8_t      px;
+    int          skip = 0;
 
     if (xga->base_addr_1mb) {
         if (addr < xga->base_addr_1mb || (addr > (xga->base_addr_1mb + 0xfffff)))
@@ -875,7 +914,7 @@ xga_accel_read_pattern_map_pixel(svga_t *svga, int x, int y, int map, uint32_t b
 }
 
 static uint32_t
-xga_accel_read_map_pixel(svga_t *svga, int x, int y, int map, uint32_t base, int width, int usesrc)
+xga_accel_read_map_pixel(svga_t *svga, int x, int y, int map, uint32_t base, int width, UNUSED(int usesrc))
 {
     xga_t   *xga  = &svga->xga;
     uint32_t addr = base;
@@ -938,6 +977,9 @@ xga_accel_read_map_pixel(svga_t *svga, int x, int y, int map, uint32_t base, int
                 }
             }
             return byte;
+
+        default:
+            break;
     }
     return 0;
 }
@@ -1016,6 +1058,9 @@ xga_accel_write_map_pixel(svga_t *svga, int x, int y, int map, uint32_t base, ui
                 mem_writew_phys(addr, pixel);
             }
             break;
+
+        default:
+            break;
     }
 }
 
@@ -1078,6 +1123,9 @@ xga_short_stroke(svga_t *svga, uint8_t ssv)
             dirx = 1;
             diry = 1;
             break;
+
+        default:
+            break;
     }
 
     if (xga->accel.pat_src == 8) {
@@ -1169,18 +1217,18 @@ xga_line_draw_write(svga_t *svga)
     int      dx;
     int      dy;
 
-    dminor = ((int16_t) xga->accel.bres_k1);
+    dminor = (xga->accel.bres_k1);
     if (xga->accel.bres_k1 & 0x2000)
         dminor |= ~0x1fff;
     dminor >>= 1;
 
-    destxtmp = ((int16_t) xga->accel.bres_k2);
+    destxtmp = (xga->accel.bres_k2);
     if (xga->accel.bres_k2 & 0x2000)
         destxtmp |= ~0x1fff;
 
     dmajor = -(destxtmp - (dminor << 1)) >> 1;
 
-    err = ((int16_t) xga->accel.bres_err_term);
+    err = (xga->accel.bres_err_term);
     if (xga->accel.bres_err_term & 0x2000)
         destxtmp |= ~0x1fff;
 
@@ -1325,10 +1373,12 @@ xga_bitblt(svga_t *svga)
     uint32_t srcwidth   = xga->accel.px_map_width[xga->accel.src_map];
     uint32_t patheight  = xga->accel.px_map_height[xga->accel.pat_src];
     uint32_t srcheight  = xga->accel.px_map_height[xga->accel.src_map];
+#if 0
     uint32_t dstheight  = xga->accel.px_map_height[xga->accel.dst_map];
-    uint32_t frgdcol    = xga->accel.frgd_color;
-    uint32_t bkgdcol    = xga->accel.bkgd_color;
-    int      mix        = 0;
+#endif
+    uint32_t frgdcol = xga->accel.frgd_color;
+    uint32_t bkgdcol = xga->accel.bkgd_color;
+    int      mix     = 0;
     int      xdir;
     int      ydir;
 
@@ -1360,8 +1410,10 @@ xga_bitblt(svga_t *svga)
 
     xga->accel.pattern = 0;
 
-    //pclog("XGA bitblt linear endian reverse=%d, access_mode=%x, octanty=%d, src command = %08x, pxsrcmap=%x, pxpatmap=%x, pxdstmap=%x, srcmap=%d, patmap=%d, dstmap=%d, usesrcvramfr=%d, usevrambk=%d.\n",
-    //      xga->linear_endian_reverse, xga->access_mode & 0x0f, ydir, xga->accel.command, xga->accel.px_map_format[xga->accel.src_map] & 0x0f, xga->accel.px_map_format[xga->accel.pat_src] & 0x0f, xga->accel.px_map_format[xga->accel.dst_map] & 0x0f, xga->accel.src_map, xga->accel.pat_src, xga->accel.dst_map, ((xga->accel.command >> 28) & 3), ((xga->accel.command >> 30) & 3));
+#if 0
+    pclog("XGA bitblt linear endian reverse=%d, access_mode=%x, octanty=%d, src command = %08x, pxsrcmap=%x, pxpatmap=%x, pxdstmap=%x, srcmap=%d, patmap=%d, dstmap=%d, usesrcvramfr=%d, usevrambk=%d.\n",
+          xga->linear_endian_reverse, xga->access_mode & 0x0f, ydir, xga->accel.command, xga->accel.px_map_format[xga->accel.src_map] & 0x0f, xga->accel.px_map_format[xga->accel.pat_src] & 0x0f, xga->accel.px_map_format[xga->accel.dst_map] & 0x0f, xga->accel.src_map, xga->accel.pat_src, xga->accel.dst_map, ((xga->accel.command >> 28) & 3), ((xga->accel.command >> 30) & 3));
+#endif
 
     if (xga->accel.pat_src == 8) {
         if (srcheight == 7)
@@ -1375,8 +1427,10 @@ xga_bitblt(svga_t *svga)
                 }
             }
         }
-        // pclog("Pattern Map = 8: CMD = %08x: SRCBase = %08x, DSTBase = %08x, from/to vram dir = %d, cmd dir = %06x\n", xga->accel.command, srcbase, dstbase, xga->from_to_vram, xga->accel.dir_cmd);
-        // pclog("CMD = %08x: Y = %d, X = %d, patsrc = %02x, srcmap = %d, dstmap = %d, py = %d, sy = %d, dy = %d, width0 = %d, width1 = %d, width2 = %d, width3 = %d\n", xga->accel.command, xga->accel.y, xga->accel.x, xga->accel.pat_src, xga->accel.src_map, xga->accel.dst_map, xga->accel.py, xga->accel.sy, xga->accel.dy, xga->accel.px_map_width[0], xga->accel.px_map_width[1], xga->accel.px_map_width[2], xga->accel.px_map_width[3]);
+#if 0
+        pclog("Pattern Map = 8: CMD = %08x: SRCBase = %08x, DSTBase = %08x, from/to vram dir = %d, cmd dir = %06x\n", xga->accel.command, srcbase, dstbase, xga->from_to_vram, xga->accel.dir_cmd);
+        pclog("CMD = %08x: Y = %d, X = %d, patsrc = %02x, srcmap = %d, dstmap = %d, py = %d, sy = %d, dy = %d, width0 = %d, width1 = %d, width2 = %d, width3 = %d\n", xga->accel.command, xga->accel.y, xga->accel.x, xga->accel.pat_src, xga->accel.src_map, xga->accel.dst_map, xga->accel.py, xga->accel.sy, xga->accel.dy, xga->accel.px_map_width[0], xga->accel.px_map_width[1], xga->accel.px_map_width[2], xga->accel.px_map_width[3]);
+#endif
         while (xga->accel.y >= 0) {
             if (xga->accel.command & 0xc0) {
                 if ((xga->accel.dx >= xga->accel.mask_map_origin_x_off) && (xga->accel.dx <= ((xga->accel.px_map_width[0] & 0xfff) + xga->accel.mask_map_origin_x_off)) && (xga->accel.dy >= xga->accel.mask_map_origin_y_off) && (xga->accel.dy <= ((xga->accel.px_map_height[0] & 0xfff) + xga->accel.mask_map_origin_y_off))) {
@@ -1453,9 +1507,11 @@ xga_bitblt(svga_t *svga)
             }
         }
 
-        // pclog("XGA bitblt linear endian reverse=%d, octanty=%d, src command = %08x, pxsrcmap=%x, pxdstmap=%x, srcmap=%d, patmap=%d, dstmap=%d, dstwidth=%d, dstheight=%d, srcwidth=%d, srcheight=%d, dstbase=%08x, srcbase=%08x.\n", xga->linear_endian_reverse, ydir, xga->accel.command, xga->accel.px_map_format[xga->accel.src_map] & 0x0f, xga->accel.px_map_format[xga->accel.dst_map] & 0x0f, xga->accel.src_map, xga->accel.pat_src, xga->accel.dst_map, dstwidth, dstheight, srcwidth, srcheight, dstbase, srcbase);
-        // pclog("Pattern Map = %d: CMD = %08x: PATBase = %08x, SRCBase = %08x, DSTBase = %08x\n", xga->accel.pat_src, xga->accel.command, patbase, srcbase, dstbase);
-        // pclog("CMD = %08x: Y = %d, X = %d, patsrc = %02x, srcmap = %d, dstmap = %d, py = %d, sy = %d, dy = %d, width0 = %d, width1 = %d, width2 = %d, width3 = %d\n", xga->accel.command, xga->accel.y, xga->accel.x, xga->accel.pat_src, xga->accel.src_map, xga->accel.dst_map, xga->accel.py, xga->accel.sy, xga->accel.dy, xga->accel.px_map_width[0], xga->accel.px_map_width[1], xga->accel.px_map_width[2], xga->accel.px_map_width[3]);
+#if 0
+        pclog("XGA bitblt linear endian reverse=%d, octanty=%d, src command = %08x, pxsrcmap=%x, pxdstmap=%x, srcmap=%d, patmap=%d, dstmap=%d, dstwidth=%d, dstheight=%d, srcwidth=%d, srcheight=%d, dstbase=%08x, srcbase=%08x.\n", xga->linear_endian_reverse, ydir, xga->accel.command, xga->accel.px_map_format[xga->accel.src_map] & 0x0f, xga->accel.px_map_format[xga->accel.dst_map] & 0x0f, xga->accel.src_map, xga->accel.pat_src, xga->accel.dst_map, dstwidth, dstheight, srcwidth, srcheight, dstbase, srcbase);
+        pclog("Pattern Map = %d: CMD = %08x: PATBase = %08x, SRCBase = %08x, DSTBase = %08x\n", xga->accel.pat_src, xga->accel.command, patbase, srcbase, dstbase);
+        pclog("CMD = %08x: Y = %d, X = %d, patsrc = %02x, srcmap = %d, dstmap = %d, py = %d, sy = %d, dy = %d, width0 = %d, width1 = %d, width2 = %d, width3 = %d\n", xga->accel.command, xga->accel.y, xga->accel.x, xga->accel.pat_src, xga->accel.src_map, xga->accel.dst_map, xga->accel.py, xga->accel.sy, xga->accel.dy, xga->accel.px_map_width[0], xga->accel.px_map_width[1], xga->accel.px_map_width[2], xga->accel.px_map_width[3]);
+#endif
         while (xga->accel.y >= 0) {
             mix = xga_accel_read_pattern_map_pixel(svga, xga->accel.px, xga->accel.py, xga->accel.pat_src, patbase, patwidth + 1);
 
@@ -1646,7 +1702,9 @@ xga_mem_write(uint32_t addr, uint32_t val, xga_t *xga, svga_t *svga, int len)
                     xga->accel.short_stroke_vector3 = (xga->accel.short_stroke >> 16) & 0xff;
                     xga->accel.short_stroke_vector4 = (xga->accel.short_stroke >> 24) & 0xff;
 
-                    // pclog("1Vector = %02x, 2Vector = %02x, 3Vector = %02x, 4Vector = %02x\n", xga->accel.short_stroke_vector1, xga->accel.short_stroke_vector2, xga->accel.short_stroke_vector3, xga->accel.short_stroke_vector4);
+#if 0
+                    pclog("1Vector = %02x, 2Vector = %02x, 3Vector = %02x, 4Vector = %02x\n", xga->accel.short_stroke_vector1, xga->accel.short_stroke_vector2, xga->accel.short_stroke_vector3, xga->accel.short_stroke_vector4);
+#endif
                     xga_short_stroke(svga, xga->accel.short_stroke_vector1);
                     xga_short_stroke(svga, xga->accel.short_stroke_vector2);
                     xga_short_stroke(svga, xga->accel.short_stroke_vector3);
@@ -1917,39 +1975,54 @@ exec_command:
                     xga->accel.dst_map   = ((xga->accel.command >> 16) & 0x0f);
                     xga->accel.src_map   = ((xga->accel.command >> 20) & 0x0f);
 
-                    // if (xga->accel.pat_src) {
-                    //     pclog("[%04X:%08X]: Accel Command = %02x, full = %08x, patwidth = %d, dstwidth = %d, srcwidth = %d, patheight = %d, dstheight = %d, srcheight = %d, px = %d, py = %d, dx = %d, dy = %d, sx = %d, sy = %d, patsrc = %d, dstmap = %d, srcmap = %d, dstbase = %08x, srcbase = %08x, patbase = %08x, dstformat = %x, srcformat = %x, planemask = %08x\n",
-                    //       CS, cpu_state.pc, ((xga->accel.command >> 24) & 0x0f), xga->accel.command, xga->accel.px_map_width[xga->accel.pat_src],
-                    //       xga->accel.px_map_width[xga->accel.dst_map], xga->accel.px_map_width[xga->accel.src_map],
-                    //       xga->accel.px_map_height[xga->accel.pat_src], xga->accel.px_map_height[xga->accel.dst_map],
-                    //       xga->accel.px_map_height[xga->accel.src_map],
-                    //       xga->accel.pat_map_x, xga->accel.pat_map_y,
-                    //       xga->accel.dst_map_x, xga->accel.dst_map_y,
-                    //       xga->accel.src_map_x, xga->accel.src_map_y,
-                    //       xga->accel.pat_src, xga->accel.dst_map, xga->accel.src_map,
-                    //       xga->accel.px_map_base[xga->accel.dst_map], xga->accel.px_map_base[xga->accel.src_map], xga->accel.px_map_base[xga->accel.pat_src],
-                    //       xga->accel.px_map_format[xga->accel.dst_map] & 0x0f, xga->accel.px_map_format[xga->accel.src_map] & 0x0f, xga->accel.plane_mask);
-                    //     //pclog("\n");
-                    // }
+#if 0
+                    if (xga->accel.pat_src) {
+                        pclog("[%04X:%08X]: Accel Command = %02x, full = %08x, patwidth = %d, dstwidth = %d, srcwidth = %d, patheight = %d, dstheight = %d, srcheight = %d, px = %d, py = %d, dx = %d, dy = %d, sx = %d, sy = %d, patsrc = %d, dstmap = %d, srcmap = %d, dstbase = %08x, srcbase = %08x, patbase = %08x, dstformat = %x, srcformat = %x, planemask = %08x\n",
+                              CS, cpu_state.pc, ((xga->accel.command >> 24) & 0x0f), xga->accel.command, xga->accel.px_map_width[xga->accel.pat_src],
+                              xga->accel.px_map_width[xga->accel.dst_map], xga->accel.px_map_width[xga->accel.src_map],
+                              xga->accel.px_map_height[xga->accel.pat_src], xga->accel.px_map_height[xga->accel.dst_map],
+                              xga->accel.px_map_height[xga->accel.src_map],
+                              xga->accel.pat_map_x, xga->accel.pat_map_y,
+                              xga->accel.dst_map_x, xga->accel.dst_map_y,
+                              xga->accel.src_map_x, xga->accel.src_map_y,
+                              xga->accel.pat_src, xga->accel.dst_map, xga->accel.src_map,
+                              xga->accel.px_map_base[xga->accel.dst_map], xga->accel.px_map_base[xga->accel.src_map], xga->accel.px_map_base[xga->accel.pat_src],
+                              xga->accel.px_map_format[xga->accel.dst_map] & 0x0f, xga->accel.px_map_format[xga->accel.src_map] & 0x0f, xga->accel.plane_mask);
+                        pclog("\n");
+                    }
+#endif
                     switch ((xga->accel.command >> 24) & 0x0f) {
                         case 3: /*Bresenham Line Draw Read*/
-                            //pclog("Line Draw Read\n");
+#if 0
+                            pclog("Line Draw Read\n");
+#endif
                             break;
                         case 4: /*Short Stroke Vectors*/
-                            //pclog("Short Stroke Vectors.\n");
+#if 0
+                            pclog("Short Stroke Vectors.\n");
+#endif
                             break;
                         case 5: /*Bresenham Line Draw Write*/
-                            //pclog("Line Draw Write.\n");
+#if 0
+                            pclog("Line Draw Write.\n");
+#endif
                             xga_line_draw_write(svga);
                             break;
                         case 8: /*BitBLT*/
                             xga_bitblt(svga);
                             break;
                         case 9: /*Inverting BitBLT*/
-                            //pclog("Inverting BitBLT\n");
+#if 0
+                            pclog("Inverting BitBLT\n");
+#endif
                             break;
                         case 0x0a: /*Area Fill*/
-                            //pclog("Area Fill.\n");
+#if 0
+                            pclog("Area Fill.\n");
+#endif
+                            break;
+
+                        default:
                             break;
                     }
                 } else if (len == 2) {
@@ -1974,42 +2047,51 @@ exec_command:
                     goto exec_command;
                 }
                 break;
+
+            default:
+                break;
         }
     }
 }
 
 static void
-xga_memio_writeb(uint32_t addr, uint8_t val, void *p)
+xga_memio_writeb(uint32_t addr, uint8_t val, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
+    svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = &svga->xga;
 
     xga_mem_write(addr, val, xga, svga, 1);
-    // pclog("Write MEMIOB = %04x, val = %02x\n", addr & 0x7f, val);
+#if 0
+    pclog("Write MEMIOB = %04x, val = %02x\n", addr & 0x7f, val);
+#endif
 }
 
 static void
-xga_memio_writew(uint32_t addr, uint16_t val, void *p)
+xga_memio_writew(uint32_t addr, uint16_t val, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
+    svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = &svga->xga;
 
     xga_mem_write(addr, val, xga, svga, 2);
-    // pclog("Write MEMIOW = %04x, val = %04x\n", addr & 0x7f, val);
+#if 0
+    pclog("Write MEMIOW = %04x, val = %04x\n", addr & 0x7f, val);
+#endif
 }
 
 static void
-xga_memio_writel(uint32_t addr, uint32_t val, void *p)
+xga_memio_writel(uint32_t addr, uint32_t val, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
+    svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = &svga->xga;
 
     xga_mem_write(addr, val, xga, svga, 4);
-    // pclog("Write MEMIOL = %04x, val = %08x\n", addr & 0x7f, val);
+#if 0
+    pclog("Write MEMIOL = %04x, val = %08x\n", addr & 0x7f, val);
+#endif
 }
 
 static uint8_t
-xga_mem_read(uint32_t addr, xga_t *xga, svga_t *svga)
+xga_mem_read(uint32_t addr, xga_t *xga, UNUSED(svga_t *svga))
 {
     uint8_t temp = 0;
 
@@ -2083,6 +2165,9 @@ xga_mem_read(uint32_t addr, xga_t *xga, svga_t *svga)
             case 0x7b:
                 temp = xga->accel.dst_map_y >> 8;
                 break;
+
+            default:
+                break;
         }
     }
 
@@ -2090,36 +2175,41 @@ xga_mem_read(uint32_t addr, xga_t *xga, svga_t *svga)
 }
 
 static uint8_t
-xga_memio_readb(uint32_t addr, void *p)
+xga_memio_readb(uint32_t addr, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
+    svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = &svga->xga;
     uint8_t temp;
 
     temp = xga_mem_read(addr, xga, svga);
 
-    // pclog("[%04X:%08X]: Read MEMIOB = %04x, temp = %02x\n", CS, cpu_state.pc, addr, temp);
+#if 0
+    pclog("[%04X:%08X]: Read MEMIOB = %04x, temp = %02x\n", CS, cpu_state.pc, addr, temp);
+#endif
+
     return temp;
 }
 
 static uint16_t
-xga_memio_readw(uint32_t addr, void *p)
+xga_memio_readw(uint32_t addr, void *priv)
 {
-    svga_t  *svga = (svga_t *) p;
+    svga_t  *svga = (svga_t *) priv;
     xga_t   *xga  = &svga->xga;
     uint16_t temp;
 
     temp = xga_mem_read(addr, xga, svga);
     temp |= (xga_mem_read(addr + 1, xga, svga) << 8);
 
-    // pclog("[%04X:%08X]: Read MEMIOW = %04x, temp = %04x\n", CS, cpu_state.pc, addr, temp);
+#if 0
+    pclog("[%04X:%08X]: Read MEMIOW = %04x, temp = %04x\n", CS, cpu_state.pc, addr, temp);
+#endif
     return temp;
 }
 
 static uint32_t
-xga_memio_readl(uint32_t addr, void *p)
+xga_memio_readl(uint32_t addr, void *priv)
 {
-    svga_t  *svga = (svga_t *) p;
+    svga_t  *svga = (svga_t *) priv;
     xga_t   *xga  = &svga->xga;
     uint32_t temp;
 
@@ -2128,7 +2218,9 @@ xga_memio_readl(uint32_t addr, void *p)
     temp |= (xga_mem_read(addr + 2, xga, svga) << 16);
     temp |= (xga_mem_read(addr + 3, xga, svga) << 24);
 
-    // pclog("Read MEMIOL = %04x, temp = %08x\n", addr, temp);
+#if 0
+    pclog("Read MEMIOL = %04x, temp = %08x\n", addr, temp);
+#endif
     return temp;
 }
 
@@ -2173,6 +2265,9 @@ xga_hwcursor_draw(svga_t *svga, int displine)
                     /* Complement */
                     p[x_pos] ^= 0xffffff;
                     break;
+
+                default:
+                    break;
             }
         }
 
@@ -2291,9 +2386,9 @@ xga_render_16bpp(xga_t *xga, svga_t *svga)
 }
 
 static void
-xga_write(uint32_t addr, uint8_t val, void *p)
+xga_write(uint32_t addr, uint8_t val, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
+    svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = &svga->xga;
 
     if (!xga->on) {
@@ -2315,14 +2410,14 @@ xga_write(uint32_t addr, uint8_t val, void *p)
     }
 
     xga->changedvram[(addr & xga->vram_mask) >> 12] = svga->monitor->mon_changeframecount;
-    xga->vram[addr & xga->vram_mask] = val;
+    xga->vram[addr & xga->vram_mask]                = val;
 }
 
 static void
-xga_writew(uint32_t addr, uint16_t val, void *p)
+xga_writew(uint32_t addr, uint16_t val, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
-    xga_t  *xga  = &svga->xga;
+    svga_t      *svga = (svga_t *) priv;
+    const xga_t *xga  = &svga->xga;
 
     if (!xga->on) {
         svga_writew(addr, val, svga);
@@ -2334,10 +2429,10 @@ xga_writew(uint32_t addr, uint16_t val, void *p)
 }
 
 static void
-xga_writel(uint32_t addr, uint32_t val, void *p)
+xga_writel(uint32_t addr, uint32_t val, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
-    xga_t  *xga  = &svga->xga;
+    svga_t      *svga = (svga_t *) priv;
+    const xga_t *xga  = &svga->xga;
 
     if (!xga->on) {
         svga_writel(addr, val, svga);
@@ -2350,13 +2445,12 @@ xga_writel(uint32_t addr, uint32_t val, void *p)
     xga_write(addr + 3, (val >> 24) & 0xff, svga);
 }
 
-
 static uint8_t
-xga_read(uint32_t addr, void *p)
+xga_read(uint32_t addr, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
-    xga_t  *xga  = &svga->xga;
-    uint8_t ret = 0xff;
+    svga_t      *svga = (svga_t *) priv;
+    const xga_t *xga  = &svga->xga;
+    uint8_t      ret  = 0xff;
 
     if (!xga->on)
         return svga_read(addr, svga);
@@ -2380,11 +2474,11 @@ xga_read(uint32_t addr, void *p)
 }
 
 static uint16_t
-xga_readw(uint32_t addr, void *p)
+xga_readw(uint32_t addr, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
-    xga_t  *xga  = &svga->xga;
-    uint16_t ret = 0xffff;
+    svga_t      *svga = (svga_t *) priv;
+    const xga_t *xga  = &svga->xga;
+    uint16_t     ret  = 0xffff;
 
     if (!xga->on)
         return svga_readw(addr, svga);
@@ -2396,11 +2490,11 @@ xga_readw(uint32_t addr, void *p)
 }
 
 static uint32_t
-xga_readl(uint32_t addr, void *p)
+xga_readl(uint32_t addr, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
-    xga_t  *xga  = &svga->xga;
-    uint32_t ret = 0xffffffff;
+    svga_t      *svga = (svga_t *) priv;
+    const xga_t *xga  = &svga->xga;
+    uint32_t     ret  = 0xffffffff;
 
     if (!xga->on)
         return svga_readl(addr, svga);
@@ -2414,9 +2508,9 @@ xga_readl(uint32_t addr, void *p)
 }
 
 static void
-xga_write_linear(uint32_t addr, uint8_t val, void *p)
+xga_write_linear(uint32_t addr, uint8_t val, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
+    svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = &svga->xga;
 
     if (!xga->on) {
@@ -2446,43 +2540,43 @@ xga_write_linear(uint32_t addr, uint8_t val, void *p)
 }
 
 static void
-xga_writew_linear(uint32_t addr, uint16_t val, void *p)
+xga_writew_linear(uint32_t addr, uint16_t val, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
-    xga_t  *xga  = &svga->xga;
+    svga_t      *svga = (svga_t *) priv;
+    const xga_t *xga  = &svga->xga;
 
     if (!xga->on) {
         svga_writew_linear(addr, val, svga);
         return;
     }
 
-    xga_write_linear(addr, val, p);
-    xga_write_linear(addr + 1, val >> 8, p);
+    xga_write_linear(addr, val, priv);
+    xga_write_linear(addr + 1, val >> 8, priv);
 }
 
 static void
-xga_writel_linear(uint32_t addr, uint32_t val, void *p)
+xga_writel_linear(uint32_t addr, uint32_t val, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
-    xga_t  *xga  = &svga->xga;
+    svga_t      *svga = (svga_t *) priv;
+    const xga_t *xga  = &svga->xga;
 
     if (!xga->on) {
         svga_writel_linear(addr, val, svga);
         return;
     }
 
-    xga_write_linear(addr, val, p);
-    xga_write_linear(addr + 1, val >> 8, p);
-    xga_write_linear(addr + 2, val >> 16, p);
-    xga_write_linear(addr + 3, val >> 24, p);
+    xga_write_linear(addr, val, priv);
+    xga_write_linear(addr + 1, val >> 8, priv);
+    xga_write_linear(addr + 2, val >> 16, priv);
+    xga_write_linear(addr + 3, val >> 24, priv);
 }
 
 static uint8_t
-xga_read_linear(uint32_t addr, void *p)
+xga_read_linear(uint32_t addr, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
-    xga_t  *xga  = &svga->xga;
-    uint8_t ret = 0xff;
+    svga_t      *svga = (svga_t *) priv;
+    const xga_t *xga  = &svga->xga;
+    uint8_t      ret  = 0xff;
 
     if (!xga->on)
         return svga_read_linear(addr, svga);
@@ -2508,11 +2602,11 @@ xga_read_linear(uint32_t addr, void *p)
 }
 
 static uint16_t
-xga_readw_linear(uint32_t addr, void *p)
+xga_readw_linear(uint32_t addr, void *priv)
 {
-    svga_t  *svga = (svga_t *) p;
-    xga_t   *xga  = &svga->xga;
-    uint16_t ret;
+    svga_t      *svga = (svga_t *) priv;
+    const xga_t *xga  = &svga->xga;
+    uint16_t     ret;
 
     if (!xga->on)
         return svga_readw_linear(addr, svga);
@@ -2524,11 +2618,11 @@ xga_readw_linear(uint32_t addr, void *p)
 }
 
 static uint32_t
-xga_readl_linear(uint32_t addr, void *p)
+xga_readl_linear(uint32_t addr, void *priv)
 {
-    svga_t *svga = (svga_t *) p;
-    xga_t  *xga  = &svga->xga;
-    uint32_t ret;
+    svga_t      *svga = (svga_t *) priv;
+    const xga_t *xga  = &svga->xga;
+    uint32_t     ret;
 
     if (!xga->on)
         return svga_readl_linear(addr, svga);
@@ -2553,6 +2647,9 @@ xga_do_render(svga_t *svga)
         case 4:
             xga_render_16bpp(xga, svga);
             break;
+
+        default:
+            break;
     }
 
     svga->x_add = (overscan_x >> 1);
@@ -2713,14 +2810,17 @@ xga_poll(xga_t *xga, svga_t *svga)
 static uint8_t
 xga_mca_read(int port, void *priv)
 {
-    svga_t *svga = (svga_t *) priv;
-    xga_t  *xga  = &svga->xga;
-    uint8_t ret = xga->pos_regs[port & 7];
+    const svga_t *svga = (svga_t *) priv;
+    const xga_t  *xga  = &svga->xga;
+    uint8_t       ret  = xga->pos_regs[port & 7];
 
     if (((port & 7) == 3) && !(ret & 1)) /*Always enable the mapping.*/
         ret |= 1;
 
-    //pclog("[%04X:%08X]: POS Read Port = %x, val = %02x\n", CS, cpu_state.pc, port & 7, xga->pos_regs[port & 7]);
+#if 0
+    pclog("[%04X:%08X]: POS Read Port = %x, val = %02x\n", CS, cpu_state.pc, port & 7, xga->pos_regs[port & 7]);
+#endif
+
     return ret;
 }
 
@@ -2737,8 +2837,8 @@ xga_mca_write(int port, uint8_t val, void *priv)
     io_removehandler(0x2100 + (xga->instance << 4), 0x0010, xga_ext_inb, NULL, NULL, xga_ext_outb, NULL, NULL, svga);
     mem_mapping_disable(&xga->bios_rom.mapping);
     mem_mapping_disable(&xga->memio_mapping);
-    xga->on = 0;
-    vga_on  = !xga->on;
+    xga->on                    = 0;
+    vga_on                     = !xga->on;
     xga->linear_endian_reverse = 0;
     xga->a5_test               = 0;
 
@@ -2760,22 +2860,24 @@ xga_mca_write(int port, uint8_t val, void *priv)
         else
             mem_mapping_set_addr(&xga->memio_mapping, xga->rom_addr + 0x1c00 + (xga->instance * 0x80), 0x80);
     }
-    //pclog("[%04X:%08X]: POS Write Port = %x, val = %02x, linear base = %08x, instance = %d, rom addr = %05x\n", CS, cpu_state.pc, port & 7, val, xga->linear_base, xga->instance, xga->rom_addr);
+#if 0
+    pclog("[%04X:%08X]: POS Write Port = %x, val = %02x, linear base = %08x, instance = %d, rom addr = %05x\n", CS, cpu_state.pc, port & 7, val, xga->linear_base, xga->instance, xga->rom_addr);
+#endif
 }
 
 static uint8_t
 xga_mca_feedb(void *priv)
 {
-    svga_t *svga = (svga_t *) priv;
-    xga_t  *xga  = &svga->xga;
+    const svga_t *svga = (svga_t *) priv;
+    const xga_t  *xga  = &svga->xga;
 
     return xga->pos_regs[2] & 1;
 }
 
 static void
-xga_mca_reset(void *p)
+xga_mca_reset(void *priv)
 {
-    svga_t *svga = (svga_t *) p;
+    svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = &svga->xga;
 
     xga->on = 0;
@@ -2784,15 +2886,15 @@ xga_mca_reset(void *p)
 }
 
 static void
-xga_reset(void *p)
+xga_reset(void *priv)
 {
-    svga_t *svga = (svga_t *) p;
+    svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = &svga->xga;
 
     mem_mapping_disable(&xga->bios_rom.mapping);
     mem_mapping_disable(&xga->memio_mapping);
-    xga->on = 0;
-    vga_on  = !xga->on;
+    xga->on                    = 0;
+    vga_on                     = !xga->on;
     xga->linear_endian_reverse = 0;
     xga->a5_test               = 0;
 }
@@ -2801,8 +2903,8 @@ static uint8_t
 xga_pos_in(uint16_t addr, void *priv)
 {
     svga_t *svga = (svga_t *) priv;
-    xga_t   *xga  = &svga->xga;
-    uint8_t ret = 0xff;
+    xga_t  *xga  = &svga->xga;
+    uint8_t ret  = 0xff;
 
     if (xga_has_vga) {
         switch (addr) {
@@ -2828,7 +2930,9 @@ xga_pos_in(uint16_t addr, void *priv)
                     ret = xga->pos_regs[3];
                 } else
                     ret = 0;
-                //pclog("POS IDX for 0103 = %d, ret = %02x.\n", xga->pos_idx & 3, ret);
+#if 0
+                pclog("POS IDX for 0103 = %d, ret = %02x.\n", xga->pos_idx & 3, ret);
+#endif
                 break;
             case 0x0104:
                 switch (xga->pos_idx & 3) {
@@ -2844,8 +2948,13 @@ xga_pos_in(uint16_t addr, void *priv)
                     case 3:
                         ret = 0;
                         break;
+
+                    default:
+                        break;
                 }
-                //pclog("POS IDX for 0104 = %d, ret = %02x.\n", xga->pos_idx & 3, ret);
+#if 0
+                pclog("POS IDX for 0104 = %d, ret = %02x.\n", xga->pos_idx & 3, ret);
+#endif
                 break;
             case 0x0108:
             case 0x0109:
@@ -2863,6 +2972,9 @@ xga_pos_in(uint16_t addr, void *priv)
 
                 ret |= xga->isa_pos_enable;
                 break;
+
+            default:
+                break;
         }
     } else {
         switch (addr) {
@@ -2897,6 +3009,9 @@ xga_pos_in(uint16_t addr, void *priv)
 
                 ret |= xga->isa_pos_enable;
                 break;
+
+            default:
+                break;
         }
     }
     return ret;
@@ -2906,7 +3021,7 @@ static void
 xga_pos_out(uint16_t addr, uint8_t val, void *priv)
 {
     svga_t *svga = (svga_t *) priv;
-    xga_t   *xga  = &svga->xga;
+    xga_t  *xga  = &svga->xga;
 
     if (xga_has_vga) {
         switch (addr) {
@@ -2914,8 +3029,10 @@ xga_pos_out(uint16_t addr, uint8_t val, void *priv)
                 xga->pos_idx = (xga->pos_idx & 0x00ff) | (val << 8);
                 break;
             case 0x0107:
-                xga->pos_idx = (xga->pos_idx & 0xff00) | (val);
-                //pclog("POS IDX Write = %04x.\n", xga->pos_idx);
+                xga->pos_idx = (xga->pos_idx & 0xff00) | val;
+#if 0
+                pclog("POS IDX Write = %04x.\n", xga->pos_idx);
+#endif
                 break;
             case 0x0108:
             case 0x0109:
@@ -2925,9 +3042,12 @@ xga_pos_out(uint16_t addr, uint8_t val, void *priv)
             case 0x010d:
             case 0x010e:
             case 0x010f:
-                xga->instance_num = addr & 7;
+                xga->instance_num   = addr & 7;
                 xga->isa_pos_enable = val & 0x08;
                 break;
+
+            default:
+                break;
         }
     } else {
         switch (addr) {
@@ -2939,16 +3059,18 @@ xga_pos_out(uint16_t addr, uint8_t val, void *priv)
             case 0x010d:
             case 0x010e:
             case 0x010f:
-                xga->instance_num = addr & 7;
+                xga->instance_num   = addr & 7;
                 xga->isa_pos_enable = val & 0x08;
                 break;
+
+            default:
+                break;
         }
     }
 }
 
-static void
-    *
-    xga_init(const device_t *info)
+static void *
+xga_init(const device_t *info)
 {
     if (svga_get_pri() == NULL)
         return NULL;
@@ -2957,13 +3079,13 @@ static void
     xga_t   *xga  = &svga->xga;
     FILE    *f;
     uint32_t temp;
-    uint8_t *rom               = NULL;
+    uint8_t *rom = NULL;
 
     xga->ext_mem_addr = device_get_config_hex16("ext_mem_addr");
     xga->instance_isa = device_get_config_int("instance");
-    xga->type = device_get_config_int("type");
-    xga->dma_channel = device_get_config_int("dma");
-    xga->bus  = info->flags;
+    xga->type         = device_get_config_int("type");
+    xga->dma_channel  = device_get_config_int("dma");
+    xga->bus          = info->flags;
 
     xga->vram_size             = (1024 << 10);
     xga->vram_mask             = xga->vram_size - 1;
@@ -3010,7 +3132,7 @@ static void
         xga->instance    = (xga->pos_regs[2] & 0x0e) >> 1;
         xga->pos_regs[4] = 1 | 2;
         xga->linear_base = ((xga->pos_regs[4] & 0xfe) * 0x1000000) + (xga->instance << 22);
-        xga->rom_addr = 0xc0000 + (((xga->pos_regs[2] & 0xf0) >> 4) * 0x2000);
+        xga->rom_addr    = 0xc0000 + (((xga->pos_regs[2] & 0xf0) >> 4) * 0x2000);
     }
 
     mem_mapping_add(&xga->video_mapping, 0, 0, xga_read, xga_readw, xga_readl,
@@ -3038,15 +3160,14 @@ static void
             io_sethandler(0x0106, 0x0002, NULL, NULL, NULL, xga_pos_out, NULL, NULL, svga);
 
         io_sethandler(0x2100 + (xga->instance << 4), 0x0010, xga_ext_inb, NULL, NULL, xga_ext_outb, NULL, NULL, svga);
-		io_sethandler(0x0108, 0x0008, xga_pos_in, NULL, NULL, xga_pos_out, NULL, NULL, svga);
+        io_sethandler(0x0108, 0x0008, xga_pos_in, NULL, NULL, xga_pos_out, NULL, NULL, svga);
         mem_mapping_set_addr(&xga->memio_mapping, xga->rom_addr + 0x1c00 + (xga->instance * 0x80), 0x80);
     }
     return svga;
 }
 
-static void
-    *
-    svga_xga_init(const device_t *info)
+static void *
+svga_xga_init(const device_t *info)
 {
     svga_t *svga = malloc(sizeof(svga_t));
     memset(svga, 0, sizeof(svga_t));
@@ -3063,16 +3184,16 @@ static void
 
     svga->bpp     = 8;
     svga->miscout = 1;
-    xga_has_vga = 1;
-    xga_enabled = 1;
+    xga_has_vga   = 1;
+    xga_enabled   = 1;
 
     return xga_init(info);
 }
 
 static void
-xga_close(void *p)
+xga_close(void *priv)
 {
-    svga_t *svga = (svga_t *) p;
+    svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = &svga->xga;
 
     if (svga) {
@@ -3094,17 +3215,17 @@ inmos_xga_available(void)
 }
 
 static void
-xga_speed_changed(void *p)
+xga_speed_changed(void *priv)
 {
-    svga_t *svga = (svga_t *) p;
+    svga_t *svga = (svga_t *) priv;
 
     svga_recalctimings(svga);
 }
 
 static void
-xga_force_redraw(void *p)
+xga_force_redraw(void *priv)
 {
-    svga_t *svga = (svga_t *) p;
+    svga_t *svga = (svga_t *) priv;
 
     svga->fullchange = svga->monitor->mon_changeframecount;
 }
@@ -3132,7 +3253,7 @@ static const device_config_t xga_mca_configuration[] = {
         }
     },
     { .name = "", .description = "", .type = CONFIG_END }
-// clang-format on
+  // clang-format on
 };
 
 static const device_config_t xga_isa_configuration[] = {
@@ -3217,7 +3338,7 @@ static const device_config_t xga_isa_configuration[] = {
         },
     },
     { .name = "", .description = "", .type = CONFIG_END }
-// clang-format on
+  // clang-format on
 };
 
 const device_t xga_device = {
diff --git a/src/win/languages/zh-TW.rc b/src/win/languages/zh-TW.rc
index 0aea4a635..4c73ffb6d 100644
--- a/src/win/languages/zh-TW.rc
+++ b/src/win/languages/zh-TW.rc
@@ -109,7 +109,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "擷圖(&C)\tCtrl+F11", IDM_ACTION_SCREENSHOT
         MENUITEM SEPARATOR
-        MENUITEM "首選項(&P)...", IDM_PREFERENCES
+        MENUITEM "偏好設定(&P)...", IDM_PREFERENCES
 #ifdef DISCORD
         MENUITEM "啟用 Discord 整合(&D)", IDM_DISCORD
 #endif
@@ -240,7 +240,7 @@ END
 // Dialog
 //
 
-#define STR_PREFERENCES   "首選項"
+#define STR_PREFERENCES   "偏好設定"
 #define STR_SND_GAIN      "音量增益"
 #define STR_NEW_FLOPPY    "新增映像"
 #define STR_CONFIG        "設定"
@@ -293,10 +293,10 @@ END
 #define STR_JOY3          "搖桿 3..."
 #define STR_JOY4          "搖桿 4..."
 
-#define STR_SOUND1        "音訊卡 1:"
-#define STR_SOUND2        "音訊卡 2:"
-#define STR_SOUND3        "音訊卡 3:"
-#define STR_SOUND4        "音訊卡 4:"
+#define STR_SOUND1        "音效卡 1:"
+#define STR_SOUND2        "音效卡 2:"
+#define STR_SOUND3        "音效卡 3:"
+#define STR_SOUND4        "音效卡 4:"
 #define STR_MIDI_OUT      "MIDI 輸出裝置:"
 #define STR_MIDI_IN       "MIDI 輸入裝置:"
 #define STR_MPU401        "獨立 MPU-401"
@@ -357,7 +357,7 @@ END
 #define STR_SPECIFY       "指定(&S)..."
 #define STR_SECTORS       "磁區(S):"
 #define STR_HEADS         "磁頭(H):"
-#define STR_CYLS          "柱面(C):"
+#define STR_CYLS          "磁柱(C):"
 #define STR_SIZE_MB       "大小 (MB):"
 #define STR_TYPE          "類型:"
 #define STR_IMG_FORMAT    "映像格式:"