Merge pull request #2237 from jriwanek-forks/named-initializers-2

Named initializers part 2
86Box · Mar 18, 2022 · 3fe794c59bcef3f07f780089715f92cba0c91a28 · 3fe794c
2 parents ebd4607 + 3b73ce3
commit 3fe794c59bcef3f07f780089715f92cba0c91a28
diff --git a/src/device/isamem.c b/src/device/isamem.c
@@ -88,11 +88,13 @@
 
 #define ISAMEM_IBMXT_CARD 0
 #define ISAMEM_GENXT_CARD 1
-#define ISAMEM_IBMAT_CARD 2
-#define ISAMEM_GENAT_CARD 3
-#define ISAMEM_P5PAK_CARD 4
-#define ISAMEM_A6PAK_CARD 5
-#define ISAMEM_EMS5150_CARD 6
+#define ISAMEM_RAMCARD_CARD 2
+#define ISAMEM_SYSTEMCARD_CARD 3
+#define ISAMEM_IBMAT_CARD 4
+#define ISAMEM_GENAT_CARD 5
+#define ISAMEM_P5PAK_CARD 6
+#define ISAMEM_A6PAK_CARD 7
+#define ISAMEM_EMS5150_CARD 8
 #define ISAMEM_EV159_CARD 10
 #define ISAMEM_RAMPAGEXT_CARD 11
 #define ISAMEM_ABOVEBOARD_CARD 12
@@ -416,6 +418,8 @@ isamem_init(const device_t *info)
     switch(dev->board) {
 	case ISAMEM_IBMXT_CARD:		/* IBM PC/XT Memory Expansion Card */
 	case ISAMEM_GENXT_CARD:		/* Generic PC/XT Memory Expansion Card */
+	case ISAMEM_RAMCARD_CARD:	/* Microsoft RAMCard for IBM PC */
+	case ISAMEM_SYSTEMCARD_CARD:	/* Microsoft SystemCard */
 	case ISAMEM_P5PAK_CARD:		/* Paradise Systems 5-PAK */
 	case ISAMEM_A6PAK_CARD:		/* AST SixPakPlus */
 		dev->total_size = device_get_config_int("size");
@@ -736,6 +740,66 @@ static const device_t genericxt_device = {
     .config = genericxt_config
 };
 
+static const device_config_t msramcard_config[] = {
+// clang-format off
+    {
+        "size", "Memory Size", CONFIG_SPINNER, "", 64, "",
+        { 0, 256, 64 },
+        { { 0 } }
+    },
+    {
+        "start", "Start Address", CONFIG_SPINNER, "", 0, "",
+        { 0, 624, 64 },
+        { { 0 } }
+    },
+    { "", "", -1 }
+// clang-format on
+};
+
+static const device_t msramcard_device = {
+    .name = "Microsoft RAMCard for IBM PC",
+    .internal_name = "msramcard",
+    .flags = DEVICE_ISA,
+    .local = ISAMEM_RAMCARD_CARD,
+    .init = isamem_init,
+    .close = isamem_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = msramcard_config
+};
+
+static const device_config_t mssystemcard_config[] = {
+// clang-format off
+    {
+        "size", "Memory Size", CONFIG_SPINNER, "", 64, "",
+        { 0, 256, 64 },
+        { { 0 } }
+    },
+    {
+        "start", "Start Address", CONFIG_SPINNER, "", 0, "",
+        { 0, 624, 64 },
+        { { 0 } }
+    },
+    { "", "", -1 }
+// clang-format on
+};
+
+static const device_t mssystemcard_device = {
+    .name = "Microsoft SystemCard",
+    .internal_name = "mssystemcard",
+    .flags = DEVICE_ISA,
+    .local = ISAMEM_SYSTEMCARD_CARD,
+    .init = isamem_init,
+    .close = isamem_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = mssystemcard_config
+};
+
 static const device_config_t ibmat_config[] = {
 // clang-format off
     {
@@ -1178,25 +1242,27 @@ static const struct {
     const device_t	*dev;
 } boards[] = {
 // clang-format off
-    { &isa_none_device  },
-    { &ibmxt_device     },
-    { &genericxt_device },
-    { &ibmat_device     },
-    { &genericat_device },
-    { &p5pak_device     },
-    { &a6pak_device     },
-    { &ems5150_device   },
-    { &ev159_device     },
+    { &isa_none_device     },
+    { &ibmxt_device        },
+    { &genericxt_device    },
+    { &msramcard_device    },
+    { &mssystemcard_device },
+    { &ibmat_device        },
+    { &genericat_device    },
+    { &p5pak_device        },
+    { &a6pak_device        },
+    { &ems5150_device      },
+    { &ev159_device        },
 #if defined(DEV_BRANCH) && defined(USE_ISAMEM_BRAT)
-    { &brat_device      },
+    { &brat_device         },
 #endif
 #if defined(DEV_BRANCH) && defined(USE_ISAMEM_RAMPAGE)
-    { &rampage_device   },
+    { &rampage_device      },
 #endif
 #if defined(DEV_BRANCH) && defined(USE_ISAMEM_IAB)
-    { &iab_device       },
+    { &iab_device          },
 #endif
-    { NULL              }
+    { NULL                 }
 // clang-format on
 };
 

diff --git a/src/include/86box/device.h b/src/include/86box/device.h
@@ -40,6 +40,7 @@
 # define EMU_DEVICE_H
 
 
+#define CONFIG_END			-1
 #define CONFIG_STRING		 0
 #define CONFIG_INT			 1
 #define CONFIG_BINARY		 2

diff --git a/src/video/agpgart.c b/src/video/agpgart.c
@@ -179,16 +179,16 @@ agpgart_close(void *priv)
     free(dev);
 }
 
-
-const device_t agpgart_device =
-{
-    "AGP Graphics Address Remapping Table",
-    "agpgart",
-    DEVICE_PCI,
-    0,
-    agpgart_init, agpgart_close, NULL,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t agpgart_device = {
+    .name = "AGP Graphics Address Remapping Table",
+    .internal_name = "agpgart",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = agpgart_init,
+    .close = agpgart_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/video/vid_ati18800.c b/src/video/vid_ati18800.c
@@ -281,45 +281,47 @@ static void ati18800_force_redraw(void *p)
 }
 
 #if defined(DEV_BRANCH) && defined(USE_VGAWONDER)
-const device_t ati18800_wonder_device =
-{
-        "ATI-18800",
-        "ati18800w",
-        DEVICE_ISA, ATI18800_WONDER,
-        ati18800_init,
-        ati18800_close,
-	NULL,
-        { ati18800_wonder_available },
-        ati18800_speed_changed,
-        ati18800_force_redraw,
-	NULL
+const device_t ati18800_wonder_device = {
+    .name = "ATI-18800",
+    .internal_name = "ati18800w",
+    .flags = DEVICE_ISA,
+    .local = ATI18800_WONDER,
+    .init = ati18800_init,
+    .close = ati18800_close,
+    .reset = NULL,
+    { .available = ati18800_wonder_available },
+    .speed_changed = ati18800_speed_changed,
+    .force_redraw = ati18800_force_redraw,
+    .config = NULL
 };
 #endif
 
 const device_t ati18800_vga88_device =
 {
-        "ATI-18800-1",
-        "ati18800v",
-        DEVICE_ISA, ATI18800_VGA88,
-        ati18800_init,
-        ati18800_close,
-	NULL,
-        { ati18800_vga88_available },
-        ati18800_speed_changed,
-        ati18800_force_redraw,
-	NULL
+    .name = "ATI-18800-1",
+    .internal_name = "ati18800v",
+    .flags = DEVICE_ISA,
+    .local = ATI18800_VGA88,
+    .init = ati18800_init,
+    .close = ati18800_close,
+    .reset = NULL,
+    { .available = ati18800_vga88_available },
+    .speed_changed = ati18800_speed_changed,
+    .force_redraw = ati18800_force_redraw,
+    .config = NULL
 };
 
 const device_t ati18800_device =
 {
-        "ATI-18800-5",
-        "ati18800",
-        DEVICE_ISA, ATI18800_EDGE16,
-        ati18800_init,
-        ati18800_close,
-	NULL,
-        { ati18800_available },
-        ati18800_speed_changed,
-        ati18800_force_redraw,
-	NULL
+    .name = "ATI-18800-5",
+    .internal_name = "ati18800",
+    .flags = DEVICE_ISA,
+    .local = ATI18800_EDGE16,
+    .init = ati18800_init,
+    .close = ati18800_close,
+    .reset = NULL,
+    { .available = ati18800_available },
+    .speed_changed = ati18800_speed_changed,
+    .force_redraw = ati18800_force_redraw,
+    .config = NULL
 };