From f11ff443afc75b6f82e96e7dd71da96cf036738d Mon Sep 17 00:00:00 2001
From: rushieda <185547947+rushieda@users.noreply.github.com>
Date: Mon, 30 Dec 2024 19:11:46 +0300
Subject: [PATCH] Add the Compaq ProSignia S316/318 (Intel chipset)

---
 src/include/86box/machine.h  |  1 +
 src/machine/m_at_socket370.c | 40 +++++++++++++++++++++++++++++++++++
 src/machine/machine_table.c  | 41 ++++++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+)

diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 57bc7e533..d46e816ce 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -842,6 +842,7 @@ extern int machine_at_6via90ap_init(const machine_t *);
 extern int machine_at_s1857_init(const machine_t *);
 extern int machine_at_p6bap_init(const machine_t *);
 extern int machine_at_p6bat_init(const machine_t *);
+extern int machine_at_prosignias31x_bx_init(const machine_t *);
 
 /* m_at_misc.c */
 extern int machine_at_vpc2007_init(const machine_t *);
diff --git a/src/machine/m_at_socket370.c b/src/machine/m_at_socket370.c
index 6d7b8c710..9be2d45b8 100644
--- a/src/machine/m_at_socket370.c
+++ b/src/machine/m_at_socket370.c
@@ -74,6 +74,46 @@ machine_at_s370slm_init(const machine_t *model)
     return ret;
 }
 
+int
+machine_at_prosignias31x_bx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/prosignias31x_bx/p6bxt-ap-092600.bin",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0a, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0b, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x0c, PCI_CARD_NORMAL, 4, 1, 2, 3);
+    pci_register_slot(0x0d, PCI_CARD_SOUND,  4, 3, 2, 1); /* assumed */
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 4);
+    device_add(&i440bx_device);
+    device_add(&piix4e_device);
+    device_add(&w83977ef_device);
+    device_add(&keyboard_ps2_ami_pci_device);
+    device_add(&winbond_flash_w29c020_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
+    device_add(&gl520sm_2d_device);  /* fans: CPU, Chassis; temperature: System */
+    hwm_values.temperatures[0] += 2; /* System offset */
+    hwm_values.temperatures[1] += 2; /* CPU offset */
+    hwm_values.voltages[0] = 3300;   /* Vcore and 3.3V are swapped */
+    hwm_values.voltages[2] = hwm_get_vcore();
+
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        device_add(&cmi8738_onboard_device);
+
+    return ret;
+}
+
 int
 machine_at_s1857_init(const machine_t *model)
 {
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 99bb44771..26997eb61 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -15130,6 +15130,47 @@ const machine_t machines[] = {
 
     /* Slot 1/Socket 370 machines */
     /* 440BX */
+    /* OEM version of ECS P6BXT-A+ REV 1.3x/2.2x. Has a Winbond W83977EF Super
+    I/O chip with on-chip KBC with AMIKey-2 KBC firmware.*/
+    {
+        .name = "[i440BX] Compaq ProSignia S316/318 (Intel)",
+        .internal_name = "prosignias31x_bx",
+        .type = MACHINE_TYPE_SLOT1_370,
+        .chipset = MACHINE_CHIPSET_VIA_APOLLO_PRO_133,
+        .init = machine_at_prosignias31x_bx_init,
+        .p1_handler = NULL,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SLOT1 | CPU_PKG_SOCKET370,
+            .block = CPU_BLOCK(CPU_PENTIUMPRO, CPU_CYRIX3S), /* Instability issues with PPro, and garbled text in POST with Cyrix */
+            .min_bus = 66666667,
+            .max_bus = 100000000,
+            .min_voltage = 1300,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 8.0
+        },
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 786432,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .kbc_device = NULL,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = &cmi8738_onboard_device,
+        .net_device = NULL
+    },
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
     {