From d328cf321562b30c4156fe23d7f3a2d3cb1e20e4 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sat, 18 Jan 2020 06:27:35 +0100 Subject: [PATCH] Fixed Xi8088 with 128k BIOS (requires ROM set update), fixed compile-breaking machine table entries, and updated README.md to link to the latest ROM set. --- README.md | 2 +- src/machine/m_xt_xi8088.c | 8 +++++--- src/machine/machine_table.c | 2 -- src/machine/machine_table_new.c | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7984a775f..809443a5e 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ guide: 8. In order to test your fresh build, replace the `86Box.exe` in your current 86Box enviroment with your freshly built one. If you do not have a pre-existing 86Box environment, download the latest successful build from - http://ci.86box.net, and the ROM set from https://tinyurl.com/rs20191022. + http://ci.86box.net, and the ROM set from https://tinyurl.com/rs20200118. 9. Enjoy using and testing the emulator! :) If you encounter issues at any step or have additional questions, please join diff --git a/src/machine/m_xt_xi8088.c b/src/machine/m_xt_xi8088.c index bd832e96c..162b6da11 100644 --- a/src/machine/m_xt_xi8088.c +++ b/src/machine/m_xt_xi8088.c @@ -151,13 +151,15 @@ machine_xt_xi8088_init(const machine_t *model) int ret; if (bios_only) { - ret = bios_load_linear(L"roms/machines/xi8088/bios-xi8088.bin", - 0x000f0000, 65536, 0); + ret = bios_load_linear_inverted(L"roms/machines/xi8088/bios-xi8088-128k.bin", + 0x000e0000, 131072, 0); + ret |= bios_load_linear(L"roms/machines/xi8088/bios-xi8088.bin", + 0x000f0000, 65536, 0); } else { device_add(&xi8088_device); if (xi8088_bios_128kb()) { - ret = bios_load_linear_inverted(L"roms/machines/xi8088/bios-xi8088.bin", + ret = bios_load_linear_inverted(L"roms/machines/xi8088/bios-xi8088-128k.bin", 0x000e0000, 131072, 0); } else { ret = bios_load_linear(L"roms/machines/xi8088/bios-xi8088.bin", diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 7668af65a..1ad05263d 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -116,8 +116,6 @@ const machine_t machines[] = { { "[286 ISA] Toshiba T3100e", "t3100e", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_VIDEO | MACHINE_VIDEO_FIXED | MACHINE_HDC, 1024, 5120, 256, 63, machine_at_t3100e_init, NULL }, { "[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] 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", {{"Intel", cpus_ps2_m30_286}, {"IBM", cpus_IBM486SLC}, {"", 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 b630da425..fd8f3ba01 100644 --- a/src/machine/machine_table_new.c +++ b/src/machine/machine_table_new.c @@ -101,8 +101,6 @@ const machine_t machines[] = { { "[286 ISA] Toshiba T3100e", "t3100e", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_VIDEO | MACHINE_VIDEO_FIXED | MACHINE_HDC, 1024, 5120, 256, 63, machine_at_t3100e_init, NULL }, { "[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] 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", {{"Intel", cpus_ps2_m30_286}, {"IBM", cpus_IBM486SLC}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_VIDEO, 1, 10, 1, 63, machine_ps2_model_50_init, NULL },