Added the Ast! Advantage 40xxd.

src/include/86box/machine.h

@@ -564,6 +564,7 @@ extern int machine_at_dtk461_init(const machine_t *);
 extern int machine_at_sis401_init(const machine_t *);
 extern int machine_at_isa486_init(const machine_t *);
 extern int machine_at_av4_init(const machine_t *);
+extern int machine_at_advantage40xxd_init(const machine_t *);
 extern int machine_at_valuepoint433_init(const machine_t *);
 
 extern int machine_at_vli486sv2g_init(const machine_t *);

src/include/86box/sio.h

@@ -125,6 +125,8 @@ extern const device_t sio_detect_device;
 #endif /* USE_SIO_DETECT */
 
 /* UMC */
+extern const device_t um82c863f_device;
+extern const device_t um82c863f_ide_device;
 extern const device_t um8663af_device;
 extern const device_t um8663af_ide_device;
 extern const device_t um8663af_sec_device;

src/include/86box/video.h

@@ -359,6 +359,7 @@ extern const device_t gd5420_isa_device;
 extern const device_t gd5420_onboard_device;
 extern const device_t gd5422_isa_device;
 extern const device_t gd5424_vlb_device;
+extern const device_t gd5424_onboard_device;
 extern const device_t gd5426_isa_device;
 extern const device_t gd5426_diamond_speedstar_pro_a1_isa_device;
 extern const device_t gd5426_vlb_device;

src/machine/m_at_386dx_486.c

@@ -1009,6 +1009,33 @@ machine_at_ami471_init(const machine_t *model)
     return ret;
 }
 
+int
+machine_at_advantage40xxd_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/advantage40xxd/AST101.09A",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add(&sis_85c471_device);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    device_add(&keyboard_ps2_phoenix_device);
+
+    device_add(&ide_vlb_device);
+    device_add(&um82c863f_ide_device);
+
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
 int
 machine_at_vli486sv2g_init(const machine_t *model)
 {

src/machine/machine_table.c

@@ -6485,6 +6485,46 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
+    /* Has Phoenix KBC firmware. */
+    {
+        .name = "[SiS 471] AST Advantage! 40xxd",
+        .internal_name = "advantage40xxd",
+        .type = MACHINE_TYPE_486,
+        .chipset = MACHINE_CHIPSET_SIS_471,
+        .init = machine_at_advantage40xxd_init,
+        .p1_handler = NULL,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 2
+        },
+        .bus_flags = MACHINE_PS2_VLB,
+        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM,
+        .ram = {
+            .min = 4096,
+            .max = 36864,
+            .step = 4096
+        },
+        .nvrmask = 127,
+        .kbc_device = NULL,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &gd5424_onboard_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     /* Has AMIKey F KBC firmware. */
     {
         .name = "[Symphony SL42C460] DTK PKM-0031Y",

src/sio/sio_um8663f.c

@@ -281,6 +281,34 @@ um8663f_init(UNUSED(const device_t *info))
     return dev;
 }
 
+const device_t um82c863f_device = {
+    .name          = "UMC UM82C863F Super I/O",
+    .internal_name = "um82c863f",
+    .flags         = 0,
+    .local         = 0xc100,
+    .init          = um8663f_init,
+    .close         = um8663f_close,
+    .reset         = um8663f_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t um82c863f_ide_device = {
+    .name          = "UMC UM82C863F Super I/O (With IDE)",
+    .internal_name = "um82c863f_ide",
+    .flags         = 0,
+    .local         = 0xc101,
+    .init          = um8663f_init,
+    .close         = um8663f_close,
+    .reset         = um8663f_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
 const device_t um8663af_device = {
     .name          = "UMC UM8663AF Super I/O",
     .internal_name = "um8663af",

src/video/vid_cl54xx.c

@@ -4254,10 +4254,16 @@ gd54xx_init(const device_t *info)
             break;
 
         case CIRRUS_ID_CLGD5422:
-        case CIRRUS_ID_CLGD5424:
             romfn = BIOS_GD5422_PATH;
             break;
 
+        case CIRRUS_ID_CLGD5424:
+            if (info->local & 0x200)
+                romfn = /*NULL*/ "roms/machines/advantage40xxd/AST101.09A";
+            else
+                romfn = BIOS_GD5422_PATH;
+            break;
+
         case CIRRUS_ID_CLGD5426:
             if (info->local & 0x200)
                 romfn = NULL;
@@ -5023,6 +5029,20 @@ const device_t gd5424_vlb_device = {
     .config        = gd542x_config,
 };
 
+const device_t gd5424_onboard_device = {
+    .name          = "Cirrus Logic GD5424 (VLB) (On-Board)",
+    .internal_name = "cl_gd5424_onboard",
+    .flags         = DEVICE_VLB,
+    .local         = CIRRUS_ID_CLGD5424 | 0x200,
+    .init          = gd54xx_init,
+    .close         = gd54xx_close,
+    .reset         = gd54xx_reset,
+    .available     = NULL,
+    .speed_changed = gd54xx_speed_changed,
+    .force_redraw  = gd54xx_force_redraw,
+    .config        = gd542x_config,
+};
+
 const device_t gd5426_isa_device = {
     .name          = "Cirrus Logic GD5426 (ISA)",
     .internal_name = "cl_gd5426_isa",