claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Machine path reorganisation"

Browse Source 
This reverts commit 0a48dbcfcd.
This commit is contained in:
David Hrdlička
2020-05-22 22:32:46 +02:00
parent 91607994f1
commit dfa28eb8e9
25 changed files with 233 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/machine/m_xt.c
View File

@@ -36,16 +36,16 @@ machine_pc_init(const machine_t *model)
{
int ret;
ret = bios_load_linear(L"roms/machines/xt/ibmpc/BIOS_5150_24APR81_U33.BIN",
ret = bios_load_linear(L"roms/machines/ibmpc/BIOS_5150_24APR81_U33.BIN",
0x000fe000, 40960, 0);
if (ret) {
bios_load_aux_linear(L"roms/machines/xt/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U29 - 5700019.bin",
bios_load_aux_linear(L"roms/machines/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U29 - 5700019.bin",
0x000f6000, 8192, 0);
bios_load_aux_linear(L"roms/machines/xt/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U30 - 5700027.bin",
bios_load_aux_linear(L"roms/machines/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U30 - 5700027.bin",
0x000f8000, 8192, 0);
bios_load_aux_linear(L"roms/machines/xt/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U31 - 5700035.bin",
bios_load_aux_linear(L"roms/machines/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U31 - 5700035.bin",
0x000fa000, 8192, 0);
bios_load_aux_linear(L"roms/machines/xt/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U32 - 5700043.bin",
bios_load_aux_linear(L"roms/machines/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U32 - 5700043.bin",
0x000fc000, 8192, 0);
}
@@ -65,19 +65,19 @@ machine_pc82_init(const machine_t *model)
{
int ret, ret2;
ret = bios_load_linear(L"roms/machines/xt/ibmpc82/pc102782.bin",
ret = bios_load_linear(L"roms/machines/ibmpc82/pc102782.bin",
0x000fe000, 40960, 0);
if (ret) {
ret2 = bios_load_aux_linear(L"roms/machines/xt/ibmpc82/ibm-basic-1.10.rom",
ret2 = bios_load_aux_linear(L"roms/machines/ibmpc82/ibm-basic-1.10.rom",
0x000f6000, 32768, 0);
if (!ret2) {
bios_load_aux_linear(L"roms/machines/xt/ibmpc82/basicc11.f6",
bios_load_aux_linear(L"roms/machines/ibmpc82/basicc11.f6",
0x000f6000, 8192, 0);
bios_load_aux_linear(L"roms/machines/xt/ibmpc82/basicc11.f8",
bios_load_aux_linear(L"roms/machines/ibmpc82/basicc11.f8",
0x000f8000, 8192, 0);
bios_load_aux_linear(L"roms/machines/xt/ibmpc82/basicc11.fa",
bios_load_aux_linear(L"roms/machines/ibmpc82/basicc11.fa",
0x000fa000, 8192, 0);
bios_load_aux_linear(L"roms/machines/xt/ibmpc82/basicc11.fc",
bios_load_aux_linear(L"roms/machines/ibmpc82/basicc11.fc",
0x000fc000, 8192, 0);
}
}
@@ -108,15 +108,15 @@ machine_xt_init(const machine_t *model)
{
int ret;
ret = bios_load_linear(L"roms/machines/xt/ibmxt/xt.rom",
ret = bios_load_linear(L"roms/machines/ibmxt/xt.rom",
0x000f0000, 65536, 0);
if (!ret) {
ret = bios_load_linear(L"roms/machines/xt/ibmxt/1501512.u18",
ret = bios_load_linear(L"roms/machines/ibmxt/1501512.u18",
0x000fe000, 65536, 0x6000);
if (ret) {
bios_load_aux_linear(L"roms/machines/xt/ibmxt/1501512.u18",
bios_load_aux_linear(L"roms/machines/ibmxt/1501512.u18",
0x000f8000, 24576, 0);
bios_load_aux_linear(L"roms/machines/xt/ibmxt/5000027.u19",
bios_load_aux_linear(L"roms/machines/ibmxt/5000027.u19",
0x000f0000, 32768, 0);
}
}
@@ -137,7 +137,7 @@ machine_genxt_init(const machine_t *model)
{
int ret;
ret = bios_load_linear(L"roms/machines/xt/genxt/pcxt.rom",
ret = bios_load_linear(L"roms/machines/genxt/pcxt.rom",
0x000fe000, 8192, 0);
if (bios_only || !ret)
@@ -154,12 +154,12 @@ machine_xt86_init(const machine_t *model)
{
int ret;
ret = bios_load_linear(L"roms/machines/xt/ibmxt86/BIOS_5160_09MAY86_U18_59X7268_62X0890_27256_F800.BIN",
ret = bios_load_linear(L"roms/machines/ibmxt86/BIOS_5160_09MAY86_U18_59X7268_62X0890_27256_F800.BIN",
0x000fe000, 65536, 0x6000);
if (ret) {
(void) bios_load_aux_linear(L"roms/machines/xt/ibmxt86/BIOS_5160_09MAY86_U18_59X7268_62X0890_27256_F800.BIN",
(void) bios_load_aux_linear(L"roms/machines/ibmxt86/BIOS_5160_09MAY86_U18_59X7268_62X0890_27256_F800.BIN",
0x000f8000, 24576, 0);
(void) bios_load_aux_linear(L"roms/machines/xt/ibmxt86/BIOS_5160_09MAY86_U19_62X0819_68X4370_27256_F000.BIN",
(void) bios_load_aux_linear(L"roms/machines/ibmxt86/BIOS_5160_09MAY86_U19_62X0819_68X4370_27256_F000.BIN",
0x000f0000, 32768, 0);
}
@@ -189,7 +189,7 @@ machine_xt_amixt_init(const machine_t *model)
{
int ret;
ret = bios_load_linear(L"roms/machines/xt/amixt/ami_8088_bios_31jan89.bin",
ret = bios_load_linear(L"roms/machines/amixt/ami_8088_bios_31jan89.bin",
0x000fe000, 8192, 0);
if (bios_only || !ret)
@@ -206,7 +206,7 @@ machine_xt_dtk_init(const machine_t *model)
{
int ret;
ret = bios_load_linear(L"roms/machines/xt/dtk/dtk_erso_2.42_2764.bin",
ret = bios_load_linear(L"roms/machines/dtk/dtk_erso_2.42_2764.bin",
0x000fe000, 8192, 0);
if (bios_only || !ret)
@@ -223,7 +223,7 @@ machine_xt_jukopc_init(const machine_t *model)
{
int ret;
ret = bios_load_linear(L"roms/machines/xt/jukopc/000o001.bin",
ret = bios_load_linear(L"roms/machines/jukopc/000o001.bin",
0x000fe000, 8192, 0);
if (bios_only || !ret)
@@ -240,7 +240,7 @@ machine_xt_open_xt_init(const machine_t *model)
{
int ret;
ret = bios_load_linear(L"roms/machines/xt/open_xt/pcxt31.bin",
ret = bios_load_linear(L"roms/machines/open_xt/pcxt31.bin",
0x000fe000, 8192, 0);
if (bios_only || !ret)
@@ -256,7 +256,7 @@ machine_xt_hed919_init(const machine_t *model)
{
int ret;
ret = bios_load_linear(L"roms/machines/xt/hed919/Hedaka_HED-919_bios_version_3.28f.bin",
ret = bios_load_linear(L"roms/machines/hed919/Hedaka_HED-919_bios_version_3.28f.bin",
0x000fe000, 8192, 0);
if (bios_only || !ret)
@@ -272,7 +272,7 @@ machine_xt_pxxt_init(const machine_t *model)
{
int ret;
ret = bios_load_linear(L"roms/machines/xt/pxxt/000p001.bin",
ret = bios_load_linear(L"roms/machines/pxxt/000p001.bin",
0x000fe000, 8192, 0);
if (bios_only || !ret)