From f51c8a5595ee3f172227d3d7e4beb5d74100fda4 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Sat, 2 Apr 2022 17:48:11 -0400
Subject: [PATCH] src/floppy

---
 src/floppy/fdc_magitronic.c | 17 +++++++++++------
 src/floppy/fdc_pii15xb.c    | 22 ++++++++++++++--------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/floppy/fdc_magitronic.c b/src/floppy/fdc_magitronic.c
index a27e19748..ba9e9a580 100644
--- a/src/floppy/fdc_magitronic.c
+++ b/src/floppy/fdc_magitronic.c
@@ -114,11 +114,17 @@ static int b215_available(void)
 static const device_config_t b215_config[] = {
 // clang-format off
     {
-        "bios_addr", "BIOS Address:", CONFIG_HEX20, "", 0xca000, "", { 0 },
-        {
-            { "CA00H", 0xca000 },
-            { "CC00H", 0xcc000 },
-            { "" }
+        .name = "bios_addr",
+        .description = "BIOS Address:",
+        .type = CONFIG_HEX20,
+        .default_string = "",
+        .default_int = 0xca000,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "CA00H", .value = 0xca000 },
+            { .description = "CC00H", .value = 0xcc000 },
+            { .description = ""                        }
         }
     },
     { "", "", -1 }
@@ -138,4 +144,3 @@ const device_t fdc_b215_device = {
     .force_redraw = NULL,
     .config = b215_config
 };
-
diff --git a/src/floppy/fdc_pii15xb.c b/src/floppy/fdc_pii15xb.c
index 2e865ec56..42b72885f 100644
--- a/src/floppy/fdc_pii15xb.c
+++ b/src/floppy/fdc_pii15xb.c
@@ -124,16 +124,22 @@ static int pii_158_available(void)
 static const device_config_t pii_config[] = {
 // clang-format off
     {
-        "bios_addr", "BIOS Address:", CONFIG_HEX20, "", 0xce000, "", { 0 },
-        {
-            { "Disabled", 0 },
-            { "CA00H",    0xca000 },
-            { "CC00H",    0xcc000 },
-            { "CE00H",    0xce000 },
-            { "" }
+        .name = "bios_addr",
+        .description = "BIOS Address:",
+        .type = CONFIG_HEX20,
+        .default_string = "",
+        .default_int = 0xce000,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "Disabled", .value = 0 },
+            { .description = "CA00H",    .value = 0xca000 },
+            { .description = "CC00H",    .value = 0xcc000 },
+            { .description = "CE00H",    .value = 0xce000 },
+            { .description = ""                           }
         }
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
 // clang-format on
 };