Merge pull request #6113 from win2kgamer/r534f-bios

Add BIOS selector and 1998 BIOS to the Rise R534F

src/include/86box/machine.h

@@ -1046,6 +1046,9 @@ extern int             machine_at_via809ds_init(const machine_t *);
 /* SiS 5571 */
 extern int             machine_at_cb52xsi_init(const machine_t *);
 extern int             machine_at_ms5146_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  r534f_device;
+#endif
 extern int             machine_at_r534f_init(const machine_t *);
 
 /* SiS 5581 */

src/machine/m_at_socket7.c

@@ -1590,17 +1590,57 @@ machine_at_ms5146_init(const machine_t *model)
     return ret;
 }
 
+static const device_config_t r534f_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "r534f_1998",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "06/12/1998", .internal_name = "r534f_1998", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/r534f/r534f008-1998.bin", "" } },
+            { .name = "03/13/2000 (Unicore)", .internal_name = "r534f", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/r534f/r534f008.bin", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t r534f_device = {
+    .name          = "Rise R534F",
+    .internal_name = "r534f_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = r534f_config
+};
+
 int
 machine_at_r534f_init(const machine_t *model)
 {
-    int ret;
+    int ret = 0;
+    const char* fn;
 
-    ret = bios_load_linear("roms/machines/r534f/r534f008.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
+    /* No ROMs available */
+    if (!device_available(model->device))
         return ret;
 
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+
     machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);

src/machine/machine_table.c

@@ -15595,7 +15595,7 @@ const machine_t machines[] = {
         .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &r534f_device,
         .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,