From 384405ab28fce40f1d75f8f1eb52b594d0f58078 Mon Sep 17 00:00:00 2001 From: tiseno100 <58827426+tiseno100@users.noreply.github.com> Date: Thu, 19 Dec 2019 11:06:21 +0200 Subject: [PATCH] Removed the Headland IQS. Added the G2 12HS. Headland IQS seems to be troublesome with the Headland chipset emulation of 86Box thus it was removed. The G2 12HS on the other hand replaces the "Unknown Quadtel Headland". --- src/machine/m_at_286_386sx.c | 27 ++++----------------------- src/machine/machine.h | 3 +-- src/machine/machine_table.c | 3 +-- src/machine/machine_table_new.c | 3 +-- 4 files changed, 7 insertions(+), 29 deletions(-) diff --git a/src/machine/m_at_286_386sx.c b/src/machine/m_at_286_386sx.c index 35a969cc6..2c95c7118 100644 --- a/src/machine/m_at_286_386sx.c +++ b/src/machine/m_at_286_386sx.c @@ -142,32 +142,13 @@ machine_at_headlandpho_init(const machine_t *model) } int -machine_at_headlandquadtel_init(const machine_t *model) +machine_at_g212hs_init(const machine_t *model) { int ret; - ret = bios_load_interleaved(L"roms/machines/headlandquadtel/Amiht-l.BIN", - L"roms/machines/headlandquadtel/AMIHT-H.BIN", - 0x000f0000, 131072, 0); - - if (bios_only || !ret) - return ret; - - machine_at_common_ide_init(model); - - machine_at_headland_common_init(1); - - return ret; -} - -int -machine_at_iqs_init(const machine_t *model) -{ - int ret; - - ret = bios_load_interleaved(L"roms/machines/iqs/286-Headland-IQS-LO.BIN", - L"roms/machines/iqs/286-Headland-IQS-HI.BIN", - 0x000f0000, 131072, 0); + ret = bios_load_interleaved(L"roms/machines/g212hs/BIOS-LO.BIN", + L"roms/machines/g212hs/BIOS-HI.BIN", + 0x000f0000, 65536, 0); if (bios_only || !ret) return ret; diff --git a/src/machine/machine.h b/src/machine/machine.h index 9b236dd4b..164a22b0f 100644 --- a/src/machine/machine.h +++ b/src/machine/machine.h @@ -180,8 +180,7 @@ extern int machine_at_headland_init(const machine_t *); extern int machine_at_tg286m_init(const machine_t *); extern int machine_at_ama932j_init(const machine_t *); extern int machine_at_headlandpho_init(const machine_t *); -extern int machine_at_headlandquadtel_init(const machine_t *); -extern int machine_at_iqs_init(const machine_t *); +extern int machine_at_g212hs_init(const machine_t *); extern int machine_at_neat_init(const machine_t *); extern int machine_at_neat_ami_init(const machine_t *); diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 9609d693c..c7594124b 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -110,8 +110,7 @@ const machine_t machines[] = { { "[286 ISA] Trigem 286M", "tg286m", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_tg286m_init, NULL }, { "[286 ISA] Unknown Phoenix Headland", "headlandpho", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 8192, 128, 127, machine_at_headlandpho_init, NULL }, - { "[286 ISA] Unknown Quadtel Headland", "headlandquadtel", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 8192, 128, 127, machine_at_headlandquadtel_init, NULL }, - { "[286 ISA] Headland IQS", "iqs", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 8192, 128, 127, machine_at_iqs_init, NULL }, + { "[286 ISA] G2 12HS", "g212hs", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 8192, 128, 127, machine_at_g212hs_init, NULL }, { "[286 ISA] Samsung Deskmaster 286", "deskmaster286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_deskmaster286_init, NULL }, { "[286 MCA] IBM PS/2 model 50", "ibmps2_m50", {{"", cpus_ps2_m30_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_VIDEO, 1, 10, 1, 63, machine_ps2_model_50_init, NULL }, diff --git a/src/machine/machine_table_new.c b/src/machine/machine_table_new.c index e98b03662..5aedfdb52 100644 --- a/src/machine/machine_table_new.c +++ b/src/machine/machine_table_new.c @@ -97,8 +97,7 @@ const machine_t machines[] = { { "[286 ISA] Trigem 286M", "tg286m", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_tg286m_init, NULL }, { "[286 ISA] Unknown Phoenix Headland", "headlandpho", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 8192, 128, 127, machine_at_headlandpho_init, NULL }, - { "[286 ISA] Unknown Quadtel Headland", "headlandquadtel", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 8192, 128, 127, machine_at_headlandquadtel_init, NULL }, - { "[286 ISA] Headland IQS", "iqs", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 8192, 128, 127, machine_at_iqs_init, NULL }, + { "[286 ISA] G2 12HS", "g212hs", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 8192, 128, 127, machine_at_g212hs_init, NULL }, { "[286 ISA] Samsung Deskmaster 286", "deskmaster286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_deskmaster286_init, NULL }, { "[286 MCA] IBM PS/2 model 50", "ibmps2_m50", {{"", cpus_ps2_m30_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_VIDEO, 1, 10, 1, 63, machine_ps2_model_50_init, NULL },