From 37efc07d594270cf6df5b9dfcc7b5ab48207194a Mon Sep 17 00:00:00 2001 From: tiseno100 <58827426+tiseno100@users.noreply.github.com> Date: Sat, 14 Dec 2019 22:50:44 +0200 Subject: [PATCH] Added the IBM Ambra DP60 and DP90 variants DP60 and DP90 use standard Intel OEM boards but they have their own special BIOS --- src/machine/m_at_socket4_5.c | 34 +++++++++++++++++++++++++++++++++ src/machine/machine.h | 2 ++ src/machine/machine_table_new.c | 2 ++ 3 files changed, 38 insertions(+) diff --git a/src/machine/m_at_socket4_5.c b/src/machine/m_at_socket4_5.c index 102d3ddca..5dd1c23db 100644 --- a/src/machine/m_at_socket4_5.c +++ b/src/machine/m_at_socket4_5.c @@ -104,6 +104,23 @@ machine_at_batman_init(const machine_t *model) return ret; } +int +machine_at_ambradp60_init(const machine_t *model) +{ + int ret; + + ret = bios_load_linear_combined(L"roms/machines/ambrapci/1004AF1P.BIO", + L"roms/machines/ambrapci/1004AF1P.BI1", 0x1c000, 128); + + if (bios_only || !ret) + return ret; + + machine_at_premiere_common_init(model); + + device_add(&i430lx_device); + + return ret; +} int machine_at_586mc1_init(const machine_t *model) @@ -142,6 +159,23 @@ machine_at_plato_init(const machine_t *model) return ret; } +int +machine_at_ambradp90_init(const machine_t *model) +{ + int ret; + + ret = bios_load_linear_combined(L"roms/machines/ambrapciii/1002AX1P.BIO", + L"roms/machines/ambrapciii/1002AX1P.BI1", 0x1d000, 128); + + if (bios_only || !ret) + return ret; + + machine_at_premiere_common_init(model); + + device_add(&i430nx_device); + + return ret; +} int machine_at_430nx_init(const machine_t *model) diff --git a/src/machine/machine.h b/src/machine/machine.h index 5fbd735f5..8762eb1cf 100644 --- a/src/machine/machine.h +++ b/src/machine/machine.h @@ -222,9 +222,11 @@ extern int machine_at_portableiii386_init(const machine_t *); /* m_at_socket4_5.c */ extern int machine_at_batman_init(const machine_t *); +extern int machine_at_ambradp60_init(const machine_t *); extern int machine_at_586mc1_init(const machine_t *); extern int machine_at_plato_init(const machine_t *); +extern int machine_at_ambradp90_init(const machine_t *); extern int machine_at_430nx_init(const machine_t *); extern int machine_at_p54tp4xe_init(const machine_t *); diff --git a/src/machine/machine_table_new.c b/src/machine/machine_table_new.c index e598db7da..27fa3b28c 100644 --- a/src/machine/machine_table_new.c +++ b/src/machine/machine_table_new.c @@ -143,9 +143,11 @@ const machine_t machines[] = { { "[486 PCI] Rise Computer R418", "r418", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 255, 1, 127, machine_at_r418_init, NULL }, { "[Socket 4 LX] Intel Premiere/PCI", "revenge", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_batman_init, NULL }, + { "[Socket 4 LX] IBM Ambra DP60 PCI", "ambradp60", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_ambradp60_init, NULL }, { "[Socket 4 LX] Micro Star 586MC1", "586mc1", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_586mc1_init, NULL }, { "[Socket 5 NX] Intel Premiere/PCI II", "plato", MACHINE_CPUS_PENTIUM_S5, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_plato_init, NULL }, + { "[Socket 5 NX] IBM Ambra DP90 PCI", "ambradp90", MACHINE_CPUS_PENTIUM_S5, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_ambradp90_init, NULL }, { "[Socket 5 NX] Gigabyte GA-586IP", "430nx", MACHINE_CPUS_PENTIUM_S5, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_430nx_init, NULL }, { "[Socket 5 FX] ASUS P/I-P54TP4XE", "p54tp4xe", MACHINE_CPUS_PENTIUM_S5, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_p54tp4xe_init, NULL },