diff --git a/src/cdrom/cdrom_image_backend.c b/src/cdrom/cdrom_image_backend.c
index 25085285c..7dcde1cdb 100644
--- a/src/cdrom/cdrom_image_backend.c
+++ b/src/cdrom/cdrom_image_backend.c
@@ -170,25 +170,23 @@ cleanup_error:
 static int
 bin_read(void *priv, uint8_t *buffer, uint64_t seek, size_t count)
 {
-    track_file_t *tf;
-
-    cdrom_image_backend_log("CDROM: binary_read(%08lx, pos=%" PRIu64 " count=%lu)\n",
-                            tf->fp, seek, count);
+    track_file_t *tf = NULL;
 
     if ((tf = (track_file_t *) priv)->fp == NULL)
         return 0;
 
+    cdrom_image_backend_log("CDROM: binary_read(%08lx, pos=%" PRIu64 " count=%lu)\n",
+                            tf->fp, seek, count);
+
     if (fseeko64(tf->fp, seek, SEEK_SET) == -1) {
-#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
         cdrom_image_backend_log("CDROM: binary_read failed during seek!\n");
-#endif
+
         return 0;
     }
 
     if (fread(buffer, count, 1, tf->fp) != 1) {
-#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
         cdrom_image_backend_log("CDROM: binary_read failed during read!\n");
-#endif
+
         return 0;
     }
 
@@ -207,9 +205,7 @@ bin_read(void *priv, uint8_t *buffer, uint64_t seek, size_t count)
 static uint64_t
 bin_get_length(void *priv)
 {
-    track_file_t *tf;
-
-    cdrom_image_backend_log("CDROM: binary_length(%08lx)\n", tf->fp);
+    track_file_t *tf = NULL;
 
     if ((tf = (track_file_t *) priv)->fp == NULL)
         return 0;
@@ -1159,10 +1155,9 @@ cdi_load_cue(cd_img_t *cdi, const char *cuefile)
                 trk.file = audio_init(filename, &error);
             }
             if (error) {
-#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
                 cdrom_image_backend_log("CUE: cannot open file '%s' in cue sheet!\n",
                                         filename);
-#endif
+
                 if (trk.file != NULL) {
                     trk.file->close(trk.file);
                     trk.file = NULL;
@@ -1177,9 +1172,8 @@ cdi_load_cue(cd_img_t *cdi, const char *cuefile)
             /* Ignored commands. */
             success = 1;
         } else {
-#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
             cdrom_image_backend_log("CUE: unsupported command '%s' in cue sheet!\n", command);
-#endif
+
             success = 0;
         }
 
diff --git a/src/chipset/sis_85c50x.c b/src/chipset/sis_85c50x.c
index 137ddb5cf..2286105ce 100644
--- a/src/chipset/sis_85c50x.c
+++ b/src/chipset/sis_85c50x.c
@@ -107,8 +107,8 @@ sis_85c50x_shadow_recalc(sis_85c50x_t *dev)
         if (dev->states[8 + i] != state) {
             mem_set_mem_state_both(base, 0x00004000, state);
             sis_85c50x_log("%05X-%05X: R%c, W%c\n", base, base + 0x3fff,
-                           (dev->pci_conf[0x543 & (0x80 >> i)) ?
-                           ((dev->pci_conf[0x54] & 0x40) ? 'I' : 'D') : 'E',
+                           (dev->pci_conf[0x54] & (0x80 >> i)) ?
+                           ((dev->pci_conf[0x53] & 0x40) ? 'I' : 'D') : 'E',
                            (dev->pci_conf[0x54] & (0x80 >> i)) ?
                            ((dev->pci_conf[0x53] & 0x20) ? 'P' : 'I') : 'E');
             dev->states[8 + i] = state;
diff --git a/src/cpu/386.c b/src/cpu/386.c
index 657bd0894..3524e0d1e 100644
--- a/src/cpu/386.c
+++ b/src/cpu/386.c
@@ -279,7 +279,7 @@ exec386_2386(int32_t cycs)
             if (!cpu_state.abrt) {
 #ifdef ENABLE_386_LOG
                 if (in_smm)
-                    x386_2386_log("[%04X:%08X] %08X\n", CS, cpu_state.pc, fetchdat);
+                    x386_log("[%04X:%08X] %08X\n", CS, cpu_state.pc, fetchdat);
 #endif
                 opcode = fetchdat & 0xFF;
                 fetchdat >>= 8;
diff --git a/src/cpu/808x.c b/src/cpu/808x.c
index 6705563c0..990f9ae87 100644
--- a/src/cpu/808x.c
+++ b/src/cpu/808x.c
@@ -130,10 +130,10 @@ typedef int (*OpFn)(uint32_t fetchdat);
 static int tempc_fpu = 0;
 
 #ifdef ENABLE_808X_LOG
+#if 0
 void dumpregs(int);
-
+#endif
 int x808x_do_log = ENABLE_808X_LOG;
-int indump       = 0;
 
 static void
 x808x_log(const char *fmt, ...)
diff --git a/src/cpu/x86.c b/src/cpu/x86.c
index 5435f366d..4bf381ee4 100644
--- a/src/cpu/x86.c
+++ b/src/cpu/x86.c
@@ -83,7 +83,9 @@ int fpu_cycles = 0;
 int in_lock = 0;
 
 #ifdef ENABLE_X86_LOG
+#if 0
 void dumpregs(int);
+#endif
 
 int x86_do_log = ENABLE_X86_LOG;
 int indump     = 0;
@@ -93,13 +95,14 @@ x86_log(const char *fmt, ...)
 {
     va_list ap;
 
-    if (x808x_do_log) {
+    if (x86_do_log) {
         va_start(ap, fmt);
         pclog_ex(fmt, ap);
         va_end(ap);
     }
 }
 
+#if 0
 void
 dumpregs(int force)
 {
@@ -144,6 +147,7 @@ dumpregs(int force)
     x87_dumpregs();
     indump = 0;
 }
+#endif
 #else
 #    define x86_log(fmt, ...)
 #endif
diff --git a/src/cpu/x87.c b/src/cpu/x87.c
index 2aafd44e6..390c06dc2 100644
--- a/src/cpu/x87.c
+++ b/src/cpu/x87.c
@@ -26,22 +26,22 @@ uint32_t x87_op_off;
 uint16_t x87_pc_seg;
 uint16_t x87_op_seg;
 
-#ifdef ENABLE_FPU_LOG
-int fpu_do_log = ENABLE_FPU_LOG;
+#ifdef ENABLE_FPU_X87_LOG
+int fpu_x87_do_log = ENABLE_FPU_X87_LOG;
 
 void
-fpu_log(const char *fmt, ...)
+fpu_x87_log(const char *fmt, ...)
 {
     va_list ap;
 
-    if (fpu_do_log) {
+    if (fpu_x87_do_log) {
         va_start(ap, fmt);
         pclog_ex(fmt, ap);
         va_end(ap);
     }
 }
 #else
-#    define fpu_log(fmt, ...)
+#    define fpu_x87_log(fmt, ...)
 #endif
 
 #ifdef USE_NEW_DYNAREC
@@ -546,17 +546,17 @@ unpack_FPU_TW(uint16_t tag_byte)
     return (twd >> 2);
 }
 
-#ifdef ENABLE_808X_LOG
+#ifdef ENABLE_FPU_X87_LOG
 void
 x87_dumpregs(void)
 {
     if (cpu_state.ismmx) {
-        fpu_log("MM0=%016llX\tMM1=%016llX\tMM2=%016llX\tMM3=%016llX\n", cpu_state.MM[0].q, cpu_state.MM[1].q, cpu_state.MM[2].q, cpu_state.MM[3].q);
-        fpu_log("MM4=%016llX\tMM5=%016llX\tMM6=%016llX\tMM7=%016llX\n", cpu_state.MM[4].q, cpu_state.MM[5].q, cpu_state.MM[6].q, cpu_state.MM[7].q);
+        fpu_x87_log("MM0=%016llX\tMM1=%016llX\tMM2=%016llX\tMM3=%016llX\n", cpu_state.MM[0].q, cpu_state.MM[1].q, cpu_state.MM[2].q, cpu_state.MM[3].q);
+        fpu_x87_log("MM4=%016llX\tMM5=%016llX\tMM6=%016llX\tMM7=%016llX\n", cpu_state.MM[4].q, cpu_state.MM[5].q, cpu_state.MM[6].q, cpu_state.MM[7].q);
     } else {
-        fpu_log("ST(0)=%f\tST(1)=%f\tST(2)=%f\tST(3)=%f\t\n", cpu_state.ST[cpu_state.TOP], cpu_state.ST[(cpu_state.TOP + 1) & 7], cpu_state.ST[(cpu_state.TOP + 2) & 7], cpu_state.ST[(cpu_state.TOP + 3) & 7]);
-        fpu_log("ST(4)=%f\tST(5)=%f\tST(6)=%f\tST(7)=%f\t\n", cpu_state.ST[(cpu_state.TOP + 4) & 7], cpu_state.ST[(cpu_state.TOP + 5) & 7], cpu_state.ST[(cpu_state.TOP + 6) & 7], cpu_state.ST[(cpu_state.TOP + 7) & 7]);
+        fpu_x87_log("ST(0)=%f\tST(1)=%f\tST(2)=%f\tST(3)=%f\t\n", cpu_state.ST[cpu_state.TOP], cpu_state.ST[(cpu_state.TOP + 1) & 7], cpu_state.ST[(cpu_state.TOP + 2) & 7], cpu_state.ST[(cpu_state.TOP + 3) & 7]);
+        fpu_x87_log("ST(4)=%f\tST(5)=%f\tST(6)=%f\tST(7)=%f\t\n", cpu_state.ST[(cpu_state.TOP + 4) & 7], cpu_state.ST[(cpu_state.TOP + 5) & 7], cpu_state.ST[(cpu_state.TOP + 6) & 7], cpu_state.ST[(cpu_state.TOP + 7) & 7]);
     }
-    fpu_log("Status = %04X  Control = %04X  Tag = %04X\n", cpu_state.npxs, cpu_state.npxc, x87_gettag());
+    fpu_x87_log("Status = %04X  Control = %04X  Tag = %04X\n", cpu_state.npxs, cpu_state.npxc, x87_gettag());
 }
 #endif
diff --git a/src/device/smbus_sis5595.c b/src/device/smbus_sis5595.c
index b76b38e17..191e7a6a5 100644
--- a/src/device/smbus_sis5595.c
+++ b/src/device/smbus_sis5595.c
@@ -148,7 +148,7 @@ smbus_sis5595_read_data(void *priv)
             break;
     }
 
-    smbus_sis5595_log("SMBus SIS5595: read(%02X) = %02x\n", addr, ret);
+    smbus_sis5595_log("SMBus SIS5595: read(%02X) = %02x\n", dev->addr, ret);
 
     return ret;
 }
@@ -171,7 +171,7 @@ smbus_sis5595_write_data(void *priv, uint8_t val)
     uint16_t         prev_stat;
     uint16_t         timer_bytes = 0;
 
-    smbus_sis5595_log("SMBus SIS5595: write(%02X, %02X)\n", addr, val);
+    smbus_sis5595_log("SMBus SIS5595: write(%02X, %02X)\n", dev->addr, val);
 
     prev_stat      = dev->next_stat;
     dev->next_stat = 0x0000;
diff --git a/src/disk/hdc_ide_ali5213.c b/src/disk/hdc_ide_ali5213.c
index eee3844c4..8ff3d392c 100644
--- a/src/disk/hdc_ide_ali5213.c
+++ b/src/disk/hdc_ide_ali5213.c
@@ -83,7 +83,7 @@ ali5213_write(uint16_t addr, uint8_t val, void *priv)
 {
     ali5213_t *dev = (ali5213_t *) priv;
 
-    ali5213_log("[%04X:%08X] [W] %02X = %02X (%i)\n", CS, cpu_state.pc, port, val, dev->tries);
+    ali5213_log("[%04X:%08X] [W] %02X = %02X\n", CS, cpu_state.pc, addr, val);
 
     switch (addr) {
         case 0xf4: /* Usually it writes 30h here */
@@ -179,7 +179,7 @@ ali5213_read(uint16_t addr, void *priv)
             break;
     }
 
-    ali5213_log("[%04X:%08X] [R] %02X = %02X\n", CS, cpu_state.pc, port, ret);
+    ali5213_log("[%04X:%08X] [R] %02X = %02X\n", CS, cpu_state.pc, addr, ret);
 
     return ret;
 }
diff --git a/src/disk/hdc_ide_um8673f.c b/src/disk/hdc_ide_um8673f.c
index 9ee149c7f..bc046dd26 100644
--- a/src/disk/hdc_ide_um8673f.c
+++ b/src/disk/hdc_ide_um8673f.c
@@ -79,7 +79,7 @@ um8673f_write(uint16_t addr, uint8_t val, void *priv)
 {
     um8673f_t *dev = (um8673f_t *) priv;
 
-    um8673f_log("[%04X:%08X] [W] %02X = %02X (%i)\n", CS, cpu_state.pc, port, val, dev->tries);
+    um8673f_log("[%04X:%08X] [W] %02X = %02X (%i)\n", CS, cpu_state.pc, addr, val, dev->tries);
 
     switch (addr) {
         case 0x108:
@@ -140,7 +140,7 @@ um8673f_read(uint16_t addr, void *priv)
             break;
     }
 
-    um8673f_log("[%04X:%08X] [R] %02X = %02X\n", CS, cpu_state.pc, port, ret);
+    um8673f_log("[%04X:%08X] [R] %02X = %02X\n", CS, cpu_state.pc, addr, ret);
 
     return ret;
 }
diff --git a/src/disk/hdc_ide_w83769f.c b/src/disk/hdc_ide_w83769f.c
index ed34bc9fc..c2b053814 100644
--- a/src/disk/hdc_ide_w83769f.c
+++ b/src/disk/hdc_ide_w83769f.c
@@ -59,7 +59,7 @@ w83769f_log(const char *fmt, ...)
 {
     va_list ap;
 
-    if (cmd640_do_log) {
+    if (w83769f_do_log) {
         va_start(ap, fmt);
         pclog_ex(fmt, ap);
         va_end(ap);
diff --git a/src/dma.c b/src/dma.c
index 1c23c53c2..8bf60cdc8 100644
--- a/src/dma.c
+++ b/src/dma.c
@@ -18,6 +18,7 @@
  *          Copyright 2016-2020 Miran Grca.
  *          Copyright 2017-2020 Fred N. van Kempen.
  */
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/src/floppy/fdc_monster.c b/src/floppy/fdc_monster.c
index d2dedb5c0..504254ee0 100644
--- a/src/floppy/fdc_monster.c
+++ b/src/floppy/fdc_monster.c
@@ -11,10 +11,11 @@
  *
  *
  * Authors:  Jasmine Iwanek, <jasmine@iwanek.co.uk>
+ *           Miran Grca, <mgrca8@gmail.com>
  *
- *           Copyright 2022 Jasmine Iwanek.
+ *           Copyright 2022-2024 Jasmine Iwanek.
+ *           Copyright 2024      Miran Grca.
  */
-
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -103,10 +104,10 @@ monster_fdc_close(void *priv)
     monster_fdc_t *dev = (monster_fdc_t *) priv;
 
     if (dev->nvr_path[0] != 0x00) {
-        FILE *f = nvr_fopen(dev->nvr_path, "wb");
-        if (f != NULL) {
-            fwrite(dev->bios_rom.rom, 1, 0x2000, f);
-            fclose(f);
+        FILE *fp = nvr_fopen(dev->nvr_path, "wb");
+        if (fp != NULL) {
+            fwrite(dev->bios_rom.rom, 1, 0x2000, fp);
+            fclose(fp);
         }
     }
 
@@ -144,10 +145,10 @@ monster_fdc_init(UNUSED(const device_t *info))
     if (rom_writes_enabled) {
         mem_mapping_set_write_handler(&dev->bios_rom.mapping, rom_write, rom_writew, rom_writel);
         sprintf(dev->nvr_path, "monster_fdc_%i.nvr", device_get_instance());
-        FILE *f = nvr_fopen(dev->nvr_path, "rb");
-        if (f != NULL) {
-            fread(dev->bios_rom.rom, 1, 0x2000, f);
-            fclose(f);
+        FILE *fp = nvr_fopen(dev->nvr_path, "rb");
+        if (fp != NULL) {
+            (void) !fread(dev->bios_rom.rom, 1, 0x2000, fp);
+            fclose(fp);
         }
     }
 
diff --git a/src/gdbstub.c b/src/gdbstub.c
index 8322c5ef6..900f40dab 100644
--- a/src/gdbstub.c
+++ b/src/gdbstub.c
@@ -40,6 +40,7 @@
 #include <86box/86box.h>
 #include "cpu.h"
 #include "x86seg.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "x87_ops_conv.h"
 #include <86box/io.h>
diff --git a/src/network/net_rtl8139.c b/src/network/net_rtl8139.c
index 2e85d67bf..bc44b3fb1 100644
--- a/src/network/net_rtl8139.c
+++ b/src/network/net_rtl8139.c
@@ -22,13 +22,14 @@
  *          Copyright 2011-2023 Benjamin Poirier.
  *          Copyright 2023 Cacodemon345.
  */
+#include <stdarg.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
 #include <time.h>
-
+#define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/timer.h>
 #include <86box/pci.h>
diff --git a/src/sound/snd_cs423x.c b/src/sound/snd_cs423x.c
index 02ca16fa6..95d183e8f 100644
--- a/src/sound/snd_cs423x.c
+++ b/src/sound/snd_cs423x.c
@@ -752,7 +752,7 @@ cs423x_init(const device_t *info)
 
                 FILE *fp = rom_fopen(PNP_ROM_CS4236B, "rb");
                 if (fp) {
-                    fread(&(dev->eeprom_data[23]), 1, 8201, fp);
+                    (void) !fread(&(dev->eeprom_data[23]), 1, 8201, fp);
                     fclose(fp);
                 }
 
diff --git a/src/unix/dummy_cdrom_ioctl.c b/src/unix/dummy_cdrom_ioctl.c
index 5c533b216..ed19dfb1f 100644
--- a/src/unix/dummy_cdrom_ioctl.c
+++ b/src/unix/dummy_cdrom_ioctl.c
@@ -205,7 +205,7 @@ plat_cdrom_read_sector(uint8_t *buffer, int raw, uint32_t sector)
         /* Cooked */
     }
     plat_cdrom_close();
-    dummy_cdrom_ioctl_log("ReadSector status=%d, sector=%d, size=%" PRId64 ".\n", status, sector, (long long) size);
+    dummy_cdrom_ioctl_log("ReadSector sector=%d.\n", sector);
 
     return 0;
 }
diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c
index 9a0ebfc50..b05491bf0 100644
--- a/src/video/vid_ega.c
+++ b/src/video/vid_ega.c
@@ -54,11 +54,17 @@ enum {
     EGA_TSENG
 };
 
+enum {
+    EGA_TYPE_IBM    = 0,
+    EGA_TYPE_OTHER  = 1,
+    EGA_TYPE_COMPAQ = 2
+};
+
 static video_timings_t timing_ega = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
 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           = EGA_TYPE_IBM;
 static int             old_overscan_color = 0;
 
 /* 3C2 controls default mode on EGA. On VGA, it determines monitor type (mono or colour):
@@ -180,7 +186,7 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
             }
             break;
         case 0x3c6:
-            if (ega_type == 2)
+            if (ega_type == EGA_TYPE_COMPAQ)
                 ega->ctl_mode = val;
             break;
         case 0x3ce:
@@ -295,47 +301,47 @@ ega_in(uint16_t addr, void *priv)
             break;
 
         case 0x3c0:
-            if (ega_type == 1)
+            if (ega_type == EGA_TYPE_OTHER)
                 ret = ega->attraddr | ega->attr_palette_enable;
             break;
         case 0x3c1:
-            if (ega_type == 1)
+            if (ega_type == EGA_TYPE_OTHER)
                 ret = ega->attrregs[ega->attraddr];
             break;
         case 0x3c2:
             ret = (egaswitches & (8 >> egaswitchread)) ? 0x10 : 0x00;
             break;
         case 0x3c4:
-            if (ega_type == 1)
+            if (ega_type == EGA_TYPE_OTHER)
                 ret = ega->seqaddr;
             break;
         case 0x3c5:
-            if (ega_type == 1)
+            if (ega_type == EGA_TYPE_OTHER)
                 ret = ega->seqregs[ega->seqaddr & 0xf];
             break;
         case 0x3c6:
-            if (ega_type == 2)
+            if (ega_type == EGA_TYPE_COMPAQ)
                 ret = ega->ctl_mode;
             break;
         case 0x3c8:
-            if (ega_type == 1)
+            if (ega_type == EGA_TYPE_OTHER)
                 ret = 2;
             break;
         case 0x3cc:
-            if (ega_type == 1)
+            if (ega_type == EGA_TYPE_OTHER)
                 ret = ega->miscout;
             break;
         case 0x3ce:
-            if (ega_type == 1)
+            if (ega_type == EGA_TYPE_OTHER)
                 ret = ega->gdcaddr;
             break;
         case 0x3cf:
-            if (ega_type == 1)
+            if (ega_type == EGA_TYPE_OTHER)
                 ret = ega->gdcreg[ega->gdcaddr & 0xf];
             break;
         case 0x3d0:
         case 0x3d4:
-            if (ega_type == 1)
+            if (ega_type == EGA_TYPE_OTHER)
                 ret = ega->crtcreg;
             break;
         case 0x3d1:
@@ -349,28 +355,28 @@ ega_in(uint16_t addr, void *priv)
                     break;
 
                 case 0x10:
-                    if (ega_type == 1)
+                    if (ega_type == EGA_TYPE_OTHER)
                         ret = ega->crtc[ega->crtcreg];
                     else
                         ret = ega->light_pen >> 8;
                     break;
 
                 case 0x11:
-                    if (ega_type == 1)
+                    if (ega_type == EGA_TYPE_OTHER)
                         ret = ega->crtc[ega->crtcreg];
                     else
                         ret = ega->light_pen & 0xff;
                     break;
 
                 default:
-                    if (ega_type == 1)
+                    if (ega_type == EGA_TYPE_OTHER)
                         ret = ega->crtc[ega->crtcreg];
                     break;
             }
             break;
         case 0x3da:
             ega->attrff = 0;
-            if (ega_type == 2) {
+            if (ega_type == EGA_TYPE_COMPAQ) {
                 ret = ega->stat & 0xcf;
                 switch ((ega->attrregs[0x12] >> 4) & 0x03) {
                     case 0x00:
@@ -466,7 +472,7 @@ ega_recalctimings(ega_t *ega)
     ega->linedbl  = ega->crtc[9] & 0x80;
     ega->rowcount = ega->crtc[9] & 0x1f;
 
-    if (ega_type == 2) {
+    if (ega_type == EGA_TYPE_COMPAQ) {
         color = (ega->miscout & 1);
         clksel = ((ega->miscout & 0xc) >> 2);
 
@@ -1396,7 +1402,7 @@ ega_init(ega_t *ega, int monitor_type, int is_mono)
     ega->crtc[6] = 255;
 
     timer_add(&ega->timer, ega_poll, ega, 1);
-    if (ega_type == 2)
+    if (ega_type == EGA_TYPE_COMPAQ)
         timer_add(&ega->dot_timer, ega_dot_poll, ega, 1);
 }
 
@@ -1416,11 +1422,11 @@ ega_standalone_init(const device_t *info)
     ega->y_add = 14;
 
     if ((info->local == EGA_IBM) || (info->local == EGA_ISKRA) || (info->local == EGA_TSENG))
-        ega_type = 0;
+        ega_type = EGA_TYPE_IBM;
     else if (info->local == EGA_COMPAQ)
-        ega_type = 2;
+        ega_type = EGA_TYPE_COMPAQ;
     else
-        ega_type = 1;
+        ega_type = EGA_TYPE_OTHER;
 
     ega->actual_type = info->local;
     ega->chipset = 0;