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

16
src/machine/m_tandy.c
View File

@@ -1446,8 +1446,8 @@ init_rom(tandy_t *dev)
dev->rom = (uint8_t *)malloc(0x80000);
#if 1
if (! rom_load_interleaved(L"roms/machines/tandy/tandy1000sl2/8079047.hu1",
L"roms/machines/tandy/tandy1000sl2/8079048.hu2",
if (! rom_load_interleaved(L"roms/machines/tandy1000sl2/8079047.hu1",
L"roms/machines/tandy1000sl2/8079048.hu2",
0x000000, 0x80000, 0, dev->rom)) {
tandy_log("TANDY: unable to load BIOS for 1000/SL2 !\n");
free(dev->rom);
@@ -1455,8 +1455,8 @@ init_rom(tandy_t *dev)
return;
}
#else
f = rom_fopen(L"roms/machines/tandy/tandy1000sl2/8079047.hu1", L"rb");
ff = rom_fopen(L"roms/machines/tandy/tandy1000sl2/8079048.hu2", L"rb");
f = rom_fopen(L"roms/machines/tandy1000sl2/8079047.hu1", L"rb");
ff = rom_fopen(L"roms/machines/tandy1000sl2/8079048.hu2", L"rb");
for (c = 0x0000; c < 0x80000; c += 2) {
dev->rom[c] = getc(f);
dev->rom[c + 1] = getc(ff);
@@ -1545,7 +1545,7 @@ machine_tandy_init(const machine_t *model)
{
int ret;
ret = bios_load_linearr(L"roms/machines/tandy/tandy/tandy1t1.020",
ret = bios_load_linearr(L"roms/machines/tandy/tandy1t1.020",
0x000f0000, 131072, 0);
if (bios_only || !ret)
@@ -1562,7 +1562,7 @@ machine_tandy1000hx_init(const machine_t *model)
{
int ret;
ret = bios_load_linear(L"roms/machines/tandy/tandy1000hx/v020000.u12",
ret = bios_load_linear(L"roms/machines/tandy1000hx/v020000.u12",
0x000e0000, 131072, 0);
if (bios_only || !ret)
@@ -1579,8 +1579,8 @@ machine_tandy1000sl2_init(const machine_t *model)
{
int ret;
ret = bios_load_interleaved(L"roms/machines/tandy/tandy1000sl2/8079047.hu1",
L"roms/machines/tandy/tandy1000sl2/8079048.hu2",
ret = bios_load_interleaved(L"roms/machines/tandy1000sl2/8079047.hu1",
L"roms/machines/tandy1000sl2/8079048.hu2",
0x000f0000, 65536, 0x18000);
if (bios_only || !ret)