Merge pull request #5718 from toggo9/drsm35286

Add ICL DRS M35/286.

src/include/86box/machine.h

@@ -469,6 +469,7 @@ extern int machine_at_quadt386sx_init(const machine_t *);
 extern int machine_at_award286_init(const machine_t *);
 extern int machine_at_gdc212m_init(const machine_t *);
 extern int machine_at_gw286ct_init(const machine_t *);
+extern int machine_at_drsm35286_init(const machine_t *);
 extern int machine_at_senor_scat286_init(const machine_t *);
 extern int machine_at_super286c_init(const machine_t *);
 extern int machine_at_super286tr_init(const machine_t *);

src/include/86box/video.h

@@ -358,6 +358,7 @@ extern const device_t chips_69000_onboard_device;
 
 /* Cirrus Logic GD54xx */
 extern const device_t gd5401_isa_device;
+extern const device_t gd5401_onboard_device;
 extern const device_t gd5402_isa_device;
 extern const device_t gd5402_onboard_device;
 extern const device_t gd5420_isa_device;

src/machine/m_at_286_386sx.c

@@ -529,6 +529,28 @@ machine_at_gw286ct_init(const machine_t *model)
     return ret;
 }
 
+int
+machine_at_drsm35286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/drsm35286/syab04-665821fb81363428830424.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+	
+    device_add(&ide_isa_device);
+    device_add(&fdc37c651_ide_device);
+   
+    machine_at_scat_init(model, 1, 0);
+	
+	if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    return ret;
+}
+
 int
 machine_at_senor_scat286_init(const machine_t *model)
 {

src/machine/machine_table.c

@@ -3981,6 +3981,45 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
+    {
+        .name = "[SCAT] ICL DRS M35/286",
+        .internal_name = "drsm35286",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_SCAT,
+        .init = machine_at_drsm35286_init,
+        .p1_handler = NULL,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags = MACHINE_IDE | MACHINE_VIDEO,
+        .ram = {
+            .min = 512,
+            .max = 5000,
+            .step = 128
+        },
+        .nvrmask = 127,
+        .kbc_device = NULL,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &gd5401_onboard_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
         .name = "[SCAT] Samsung SPC-4200P",

src/video/vid_cl54xx.c

@@ -45,6 +45,7 @@
 #include <86box/plat_unused.h>
 
 #define BIOS_GD5401_PATH                "roms/video/cirruslogic/avga1.rom"
+#define BIOS_GD5401_ONBOARD_PATH        "roms/machines/drsm35286/qpaw01-6658237d5e3c2611427518.bin"
 #define BIOS_GD5402_PATH                "roms/video/cirruslogic/avga2.rom"
 #define BIOS_GD5402_ONBOARD_PATH        "roms/machines/cmdsl386sx25/c000.rom"
 #define BIOS_GD5420_PATH                "roms/video/cirruslogic/5420.vbi"
@@ -4236,8 +4237,11 @@ gd54xx_init(const device_t *info)
 
     switch (id) {
         case CIRRUS_ID_CLGD5401:
-            romfn = BIOS_GD5401_PATH;
-            break;
+        if (info->local & 0x100)
+                romfn = BIOS_GD5401_ONBOARD_PATH;
+            else
+				romfn = BIOS_GD5401_PATH;
+			break;
 
         case CIRRUS_ID_CLGD5402:
             if (info->local & 0x200)
@@ -4945,6 +4949,20 @@ const device_t gd5401_isa_device = {
     .config        = NULL,
 };
 
+const device_t gd5401_onboard_device = {
+    .name          = "Cirrus Logic GD5401 (ISA) (ACUMOS AVGA1) (On-Board)",
+    .internal_name = "cl_gd5402_onboard",
+    .flags         = DEVICE_ISA16,
+    .local         = CIRRUS_ID_CLGD5401 | 0x100,
+    .init          = gd54xx_init,
+    .close         = gd54xx_close,
+    .reset         = gd54xx_reset,
+    .available     = NULL,
+    .speed_changed = gd54xx_speed_changed,
+    .force_redraw  = gd54xx_force_redraw,
+    .config        = NULL,
+};
+
 const device_t gd5402_isa_device = {
     .name          = "Cirrus Logic GD5402 (ISA) (ACUMOS AVGA2)",
     .internal_name = "cl_gd5402_isa",