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

42
src/machine/m_amstrad.c
View File

@@ -844,7 +844,7 @@ vid_init_1640(amstrad_t *ams)
vid = (amsvid_t *)malloc(sizeof(amsvid_t));
memset(vid, 0x00, sizeof(amsvid_t));
rom_init(&vid->bios_rom, L"roms/machines/amstrad/pc1640/40100",
rom_init(&vid->bios_rom, L"roms/machines/pc1640/40100",
0xc0000, 0x8000, 0x7fff, 0, 0);
ega_init(&vid->ega, 9, 0);
@@ -2435,7 +2435,7 @@ machine_amstrad_init(const machine_t *model, int type)
if (gfxcard == VID_INTERNAL) switch(type) {
case AMS_PC1512:
loadfont(L"roms/machines/amstrad/pc1512/40078", 8);
loadfont(L"roms/machines/pc1512/40078", 8);
device_context(&vid_1512_device);
ams->language = device_get_config_int("language");
vid_init_1512(ams);
@@ -2444,7 +2444,7 @@ machine_amstrad_init(const machine_t *model, int type)
break;
case AMS_PPC512:
loadfont(L"roms/machines/amstrad/ppc512/40109", 1);
loadfont(L"roms/machines/ppc512/40109", 1);
device_context(&vid_ppc512_device);
ams->language = device_get_config_int("language");
vid_init_200(ams);
@@ -2462,7 +2462,7 @@ machine_amstrad_init(const machine_t *model, int type)
break;
case AMS_PC200:
loadfont(L"roms/machines/amstrad/pc200/40109", 1);
loadfont(L"roms/machines/pc200/40109", 1);
device_context(&vid_200_device);
ams->language = device_get_config_int("language");
vid_init_200(ams);
@@ -2517,10 +2517,10 @@ machine_pc1512_init(const machine_t *model)
{
int ret;
ret = bios_load_interleaved(L"roms/machines/amstrad/pc1512/40044",
L"roms/machines/amstrad/pc1512/40043",
ret = bios_load_interleaved(L"roms/machines/pc1512/40044",
L"roms/machines/pc1512/40043",
0x000fc000, 16384, 0);
ret &= rom_present(L"roms/machines/amstrad/pc1512/40078");
ret &= rom_present(L"roms/machines/pc1512/40078");
if (bios_only || !ret)
return ret;
@@ -2536,10 +2536,10 @@ machine_pc1640_init(const machine_t *model)
{
int ret;
ret = bios_load_interleaved(L"roms/machines/amstrad/pc1640/40044.v3",
L"roms/machines/amstrad/pc1640/40043.v3",
ret = bios_load_interleaved(L"roms/machines/pc1640/40044.v3",
L"roms/machines/pc1640/40043.v3",
0x000fc000, 16384, 0);
ret &= rom_present(L"roms/machines/amstrad/pc1640/40100");
ret &= rom_present(L"roms/machines/pc1640/40100");
if (bios_only || !ret)
return ret;
@@ -2555,10 +2555,10 @@ machine_pc200_init(const machine_t *model)
{
int ret;
ret = bios_load_interleaved(L"roms/machines/amstrad/pc200/pc20v2.1",
L"roms/machines/amstrad/pc200/pc20v2.0",
ret = bios_load_interleaved(L"roms/machines/pc200/pc20v2.1",
L"roms/machines/pc200/pc20v2.0",
0x000fc000, 16384, 0);
ret &= rom_present(L"roms/machines/amstrad/pc200/40109");
ret &= rom_present(L"roms/machines/pc200/40109");
if (bios_only || !ret)
return ret;
@@ -2574,10 +2574,10 @@ machine_ppc512_init(const machine_t *model)
{
int ret;
ret = bios_load_interleaved(L"roms/machines/amstrad/ppc512/40107.v2",
L"roms/machines/amstrad/ppc512/40108.v2",
ret = bios_load_interleaved(L"roms/machines/ppc512/40107.v2",
L"roms/machines/ppc512/40108.v2",
0x000fc000, 16384, 0);
ret &= rom_present(L"roms/machines/amstrad/ppc512/40109");
ret &= rom_present(L"roms/machines/ppc512/40109");
if (bios_only || !ret)
return ret;
@@ -2593,10 +2593,10 @@ machine_pc2086_init(const machine_t *model)
{
int ret;
ret = bios_load_interleavedr(L"roms/machines/amstrad/pc2086/40179.ic129",
L"roms/machines/amstrad/pc2086/40180.ic132",
ret = bios_load_interleavedr(L"roms/machines/pc2086/40179.ic129",
L"roms/machines/pc2086/40180.ic132",
0x000fc000, 65536, 0);
ret &= rom_present(L"roms/machines/amstrad/pc2086/40186.ic171");
ret &= rom_present(L"roms/machines/pc2086/40186.ic171");
if (bios_only || !ret)
return ret;
@@ -2612,9 +2612,9 @@ machine_pc3086_init(const machine_t *model)
{
int ret;
ret = bios_load_linearr(L"roms/machines/amstrad/pc3086/fc00.bin",
ret = bios_load_linearr(L"roms/machines/pc3086/fc00.bin",
0x000fc000, 65536, 0);
ret &= rom_present(L"roms/machines/amstrad/pc3086/c000.bin");
ret &= rom_present(L"roms/machines/pc3086/c000.bin");
if (bios_only || !ret)
return ret;