From 564f0f8331d226358f9449da60ebe6576649bb16 Mon Sep 17 00:00:00 2001 From: Marcos Alves Date: Sun, 16 Jul 2017 15:28:09 +0100 Subject: [PATCH] Re-arranged roms' paths to be a bit more sane. --- src/SOUND/midi_mt32.c | 4 +- src/SOUND/snd_emu8k.c | 4 +- src/SOUND/snd_sb.c | 2 +- src/VIDEO/vid_ati18800.c | 4 +- src/VIDEO/vid_ati28800.c | 16 +-- src/VIDEO/vid_ati_mach64.c | 8 +- src/VIDEO/vid_cl_gd.c | 36 +++--- src/VIDEO/vid_ega.c | 16 +-- src/VIDEO/vid_et4000.c | 4 +- src/VIDEO/vid_et4000w32.c | 4 +- src/VIDEO/vid_genius.c | 2 +- src/VIDEO/vid_nv_riva128.c | 16 +-- src/VIDEO/vid_oti067.c | 8 +- src/VIDEO/vid_paradise.c | 10 +- src/VIDEO/vid_pc1640.c | 2 +- src/VIDEO/vid_s3.c | 24 ++-- src/VIDEO/vid_s3_virge.c | 16 +-- src/VIDEO/vid_tgui9440.c | 4 +- src/VIDEO/vid_tvga.c | 4 +- src/VIDEO/vid_vga.c | 6 +- src/esdi_at.c | 4 +- src/hdd_esdi.c | 4 +- src/mem.c | 230 +++++++++++++++++++------------------ src/mfm_xebec.c | 8 +- src/ps1.c | 8 +- src/scsi_aha154x.c | 10 +- src/tandy_rom.c | 4 +- src/xtide.c | 16 +-- 28 files changed, 238 insertions(+), 236 deletions(-) diff --git a/src/SOUND/midi_mt32.c b/src/SOUND/midi_mt32.c index f34ea7831..3dd9e745c 100644 --- a/src/SOUND/midi_mt32.c +++ b/src/SOUND/midi_mt32.c @@ -69,14 +69,14 @@ mt32emu_return_code mt32_check(const char* func, mt32emu_return_code ret, mt32em int mt32_available() { if (roms_present[0] < 0) - roms_present[0] = (rom_present(L"roms/mt32/mt32_control.rom") && rom_present(L"roms/mt32/mt32_pcm.rom")); + roms_present[0] = (rom_present(L"roms/sound/mt32/mt32_control.rom") && rom_present(L"roms/sound/mt32/mt32_pcm.rom")); return roms_present[0]; } int cm32l_available() { if (roms_present[1] < 0) - roms_present[1] = (rom_present(L"roms/cm32l/cm32l_control.rom") && rom_present(L"roms/cm32l/cm32l_pcm.rom")); + roms_present[1] = (rom_present(L"roms/sound/cm32l/cm32l_control.rom") && rom_present(L"roms/sound/cm32l/cm32l_pcm.rom")); return roms_present[1]; } diff --git a/src/SOUND/snd_emu8k.c b/src/SOUND/snd_emu8k.c index 67a50734f..c9982de11 100644 --- a/src/SOUND/snd_emu8k.c +++ b/src/SOUND/snd_emu8k.c @@ -696,9 +696,9 @@ void emu8k_init(emu8k_t *emu8k, int onboard_ram) int c; double out; - f = romfopen(L"roms/awe32.raw", L"rb"); + f = romfopen(L"roms/sound/awe32.raw", L"rb"); if (!f) - fatal("ROMS/AWE32.RAW not found\n"); + fatal("ROMS/SOUND/AWE32.RAW not found\n"); if (onboard_ram) { diff --git a/src/SOUND/snd_sb.c b/src/SOUND/snd_sb.c index 317d066e2..717196a20 100644 --- a/src/SOUND/snd_sb.c +++ b/src/SOUND/snd_sb.c @@ -680,7 +680,7 @@ void *sb_16_init() int sb_awe32_available() { - return rom_present(L"roms/awe32.raw"); + return rom_present(L"roms/sound/awe32.raw"); } void *sb_awe32_init() diff --git a/src/VIDEO/vid_ati18800.c b/src/VIDEO/vid_ati18800.c index ecbb4fe40..8cbb5c9c7 100644 --- a/src/VIDEO/vid_ati18800.c +++ b/src/VIDEO/vid_ati18800.c @@ -163,7 +163,7 @@ void *ati18800_init() ati18800_t *ati18800 = malloc(sizeof(ati18800_t)); memset(ati18800, 0, sizeof(ati18800_t)); - rom_init(&ati18800->bios_rom, L"roms/vga88.BIN", 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&ati18800->bios_rom, L"roms/video/ati18800/vga88.BIN", 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL); svga_init(&ati18800->svga, ati18800, 1 << 19, /*512kb*/ NULL, @@ -183,7 +183,7 @@ void *ati18800_init() static int ati18800_available() { - return rom_present(L"roms/vga88.BIN"); + return rom_present(L"roms/video/ati18800/vga88.BIN"); } void ati18800_close(void *p) diff --git a/src/VIDEO/vid_ati28800.c b/src/VIDEO/vid_ati28800.c index 84d8ec8e4..e1c0b6911 100644 --- a/src/VIDEO/vid_ati28800.c +++ b/src/VIDEO/vid_ati28800.c @@ -362,19 +362,19 @@ void *ati28800_init() if (gfxcard == GFX_VGAWONDERXL) { rom_init_interleaved(&ati28800->bios_rom, - L"roms/XLEVEN.BIN", - L"roms/XLODD.BIN", + L"roms/video/ati28800/XLEVEN.BIN", + L"roms/video/ati28800/XLODD.BIN", 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL); } else if (gfxcard == GFX_VGAWONDERXL24) { rom_init_interleaved(&ati28800->bios_rom, - L"roms/112-14318-102.bin", - L"roms/112-14319-102.bin", + L"roms/video/ati28800/112-14318-102.bin", + L"roms/video/ati28800/112-14319-102.bin", 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL); } else - rom_init(&ati28800->bios_rom, L"roms/bios.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&ati28800->bios_rom, L"roms/video/ati28800/bios.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); svga_init(&ati28800->svga, ati28800, memory, /*512kb*/ ati28800_recalctimings, @@ -394,17 +394,17 @@ void *ati28800_init() static int ati28800_available() { - return rom_present(L"roms/bios.bin"); + return rom_present(L"roms/video/ati28800/bios.bin"); } static int compaq_ati28800_available() { - return (rom_present(L"roms/XLEVEN.bin") && rom_present(L"roms/XLODD.bin")); + return (rom_present(L"roms/video/ati28800/XLEVEN.bin") && rom_present(L"roms/video/ati28800/XLODD.bin")); } static int ati28800_wonderxl24_available() { - return (rom_present(L"roms/112-14318-102.bin") && rom_present(L"roms/112-14319-102.bin")); + return (rom_present(L"roms/video/ati28800/112-14318-102.bin") && rom_present(L"roms/video/ati28800/112-14319-102.bin")); } void ati28800_close(void *p) diff --git a/src/VIDEO/vid_ati_mach64.c b/src/VIDEO/vid_ati_mach64.c index 4d530c7b9..a7684dcd9 100644 --- a/src/VIDEO/vid_ati_mach64.c +++ b/src/VIDEO/vid_ati_mach64.c @@ -3349,7 +3349,7 @@ static void *mach64gx_init() ati_eeprom_load(&mach64->eeprom, L"mach64.nvr", 1); - rom_init(&mach64->bios_rom, L"roms/mach64gx/bios.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&mach64->bios_rom, L"roms/video/mach64/bios.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); return mach64; } @@ -3367,7 +3367,7 @@ static void *mach64vt2_init() ati_eeprom_load(&mach64->eeprom, L"mach64vt.nvr", 1); - rom_init(&mach64->bios_rom, L"roms/atimach64vt2pci.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&mach64->bios_rom, L"roms/video/mach64/atimach64vt2pci.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); svga->vblank_start = mach64_vblank_start; @@ -3376,11 +3376,11 @@ static void *mach64vt2_init() int mach64gx_available() { - return rom_present(L"roms/mach64gx/bios.bin"); + return rom_present(L"roms/video/mach64/bios.bin"); } int mach64vt2_available() { - return rom_present(L"roms/atimach64vt2pci.bin"); + return rom_present(L"roms/video/mach64/atimach64vt2pci.bin"); } void mach64_close(void *p) diff --git a/src/VIDEO/vid_cl_gd.c b/src/VIDEO/vid_cl_gd.c index 89d9d3c77..1d6932364 100644 --- a/src/VIDEO/vid_cl_gd.c +++ b/src/VIDEO/vid_cl_gd.c @@ -881,92 +881,92 @@ void *clgd_common_init(wchar_t *romfn, uint8_t id) void *gd6235_init() { - return clgd_common_init(L"roms/vga6235.rom", CIRRUS_ID_CLGD6235); + return clgd_common_init(L"roms/video/cirruslogic/vga6235.rom", CIRRUS_ID_CLGD6235); } void *gd5422_init() { - return clgd_common_init(L"roms/CL5422.ROM", CIRRUS_ID_CLGD5422); + return clgd_common_init(L"roms/video/cirruslogic/CL5422.ROM", CIRRUS_ID_CLGD5422); } void *gd5429_init() { - return clgd_common_init(L"roms/5429.vbi", CIRRUS_ID_CLGD5429); + return clgd_common_init(L"roms/video/cirruslogic/5429.vbi", CIRRUS_ID_CLGD5429); } void *gd5430_init() { - return clgd_common_init(L"roms/pci.BIN", CIRRUS_ID_CLGD5430); + return clgd_common_init(L"roms/video/cirruslogic/pci.BIN", CIRRUS_ID_CLGD5430); } void *dia5430_init() { - return clgd_common_init(L"roms/diamondvlbus.BIN", CIRRUS_ID_CLGD5430); + return clgd_common_init(L"roms/video/cirruslogic/diamondvlbus.BIN", CIRRUS_ID_CLGD5430); } void *gd5434_init() { - return clgd_common_init(L"roms/japan.BIN", CIRRUS_ID_CLGD5434); + return clgd_common_init(L"roms/video/cirruslogic/japan.BIN", CIRRUS_ID_CLGD5434); } void *gd5436_init() { - return clgd_common_init(L"roms/5436.VBI", CIRRUS_ID_CLGD5436); + return clgd_common_init(L"roms/video/cirruslogic/5436.VBI", CIRRUS_ID_CLGD5436); } void *gd5440_init() { - return clgd_common_init(L"roms/5440BIOS.BIN", CIRRUS_ID_CLGD5440); + return clgd_common_init(L"roms/video/cirruslogic/5440BIOS.BIN", CIRRUS_ID_CLGD5440); } void *gd5446_init() { - return clgd_common_init(L"roms/5446BV.VBI", CIRRUS_ID_CLGD5446); + return clgd_common_init(L"roms/video/cirruslogic/5446BV.VBI", CIRRUS_ID_CLGD5446); } static int gd5422_available() { - return rom_present(L"roms/CL5422.ROM"); + return rom_present(L"roms/video/cirruslogic/CL5422.ROM"); } static int gd5429_available() { - return rom_present(L"roms/5429.vbi"); + return rom_present(L"roms/video/cirruslogic/5429.vbi"); } static int gd5430_available() { - return rom_present(L"roms/pci.BIN"); + return rom_present(L"roms/video/cirruslogic/pci.BIN"); } static int dia5430_available() { - return rom_present(L"roms/diamondvlbus.BIN"); + return rom_present(L"roms/video/cirruslogic/diamondvlbus.BIN"); } static int gd5434_available() { - return rom_present(L"roms/japan.BIN"); + return rom_present(L"roms/video/cirruslogic/japan.BIN"); } static int gd5436_available() { - return rom_present(L"roms/5436.VBI"); + return rom_present(L"roms/video/cirruslogic/5436.VBI"); } static int gd5440_available() { - return rom_present(L"roms/5440BIOS.BIN"); + return rom_present(L"roms/video/cirruslogic/5440BIOS.BIN"); } static int gd5446_available() { - return rom_present(L"roms/5446BV.VBI"); + return rom_present(L"roms/video/cirruslogic/5446BV.VBI"); } static int gd6235_available() { - return rom_present(L"roms/vga6235.rom"); + return rom_present(L"roms/video/cirruslogic/vga6235.rom"); } void clgd_close(void *p) diff --git a/src/VIDEO/vid_ega.c b/src/VIDEO/vid_ega.c index 378db12e8..0a2e60944 100644 --- a/src/VIDEO/vid_ega.c +++ b/src/VIDEO/vid_ega.c @@ -998,7 +998,7 @@ void *ega_standalone_init() overscan_x = 16; overscan_y = 28; - rom_init(&ega->bios_rom, L"roms/ibm_6277356_ega_card_u44_27128.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&ega->bios_rom, L"roms/video/ega/ibm_6277356_ega_card_u44_27128.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); if (ega->bios_rom.rom[0x3ffe] == 0xaa && ega->bios_rom.rom[0x3fff] == 0x55) { @@ -1036,7 +1036,7 @@ void *cpqega_standalone_init() overscan_x = 16; overscan_y = 28; - rom_init(&ega->bios_rom, L"roms/108281-001.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&ega->bios_rom, L"roms/video/ega/108281-001.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); if (ega->bios_rom.rom[0x3ffe] == 0xaa && ega->bios_rom.rom[0x3fff] == 0x55) { @@ -1072,7 +1072,7 @@ void *sega_standalone_init() overscan_x = 16; overscan_y = 28; - rom_init(&ega->bios_rom, L"roms/lega.vbi", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&ega->bios_rom, L"roms/video/ega/lega.vbi", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); if (ega->bios_rom.rom[0x3ffe] == 0xaa && ega->bios_rom.rom[0x3fff] == 0x55) { @@ -1198,8 +1198,8 @@ void *jega_standalone_init() { ega_t *ega = (ega_t *) sega_standalone_init(); - LoadFontxFile(L"roms/JPNHN19X.FNT"); - LoadFontxFile(L"roms/JPNZN16X.FNT"); + LoadFontxFile(L"roms/video/ega/JPNHN19X.FNT"); + LoadFontxFile(L"roms/video/ega/JPNZN16X.FNT"); ega->is_jega = 1; @@ -1208,17 +1208,17 @@ void *jega_standalone_init() static int ega_standalone_available() { - return rom_present(L"roms/ibm_6277356_ega_card_u44_27128.bin"); + return rom_present(L"roms/video/ega/ibm_6277356_ega_card_u44_27128.bin"); } static int cpqega_standalone_available() { - return rom_present(L"roms/108281-001.bin"); + return rom_present(L"roms/video/ega/108281-001.bin"); } static int sega_standalone_available() { - return rom_present(L"roms/lega.vbi"); + return rom_present(L"roms/video/ega/lega.vbi"); } void ega_close(void *p) diff --git a/src/VIDEO/vid_et4000.c b/src/VIDEO/vid_et4000.c index 9ee0255a6..d20462972 100644 --- a/src/VIDEO/vid_et4000.c +++ b/src/VIDEO/vid_et4000.c @@ -144,7 +144,7 @@ void *et4000_init() et4000_t *et4000 = malloc(sizeof(et4000_t)); memset(et4000, 0, sizeof(et4000_t)); - rom_init(&et4000->bios_rom, L"roms/et4000.BIN", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&et4000->bios_rom, L"roms/video/et4000/et4000.BIN", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); io_sethandler(0x03c0, 0x0020, et4000_in, NULL, NULL, et4000_out, NULL, NULL, et4000); @@ -159,7 +159,7 @@ void *et4000_init() static int et4000_available() { - return rom_present(L"roms/et4000.BIN"); + return rom_present(L"roms/video/et4000/et4000.BIN"); } void et4000_close(void *p) diff --git a/src/VIDEO/vid_et4000w32.c b/src/VIDEO/vid_et4000w32.c index d0a2b1e90..ebe6fb483 100644 --- a/src/VIDEO/vid_et4000w32.c +++ b/src/VIDEO/vid_et4000w32.c @@ -1152,7 +1152,7 @@ void *et4000w32p_init() et4000w32p_hwcursor_draw, NULL); - rom_init(&et4000->bios_rom, L"roms/et4000w32.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&et4000->bios_rom, L"roms/video/et4000w32/et4000w32.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); if (PCI) mem_mapping_disable(&et4000->bios_rom.mapping); @@ -1187,7 +1187,7 @@ void *et4000w32p_init() int et4000w32p_available() { - return rom_present(L"roms/et4000w32.bin"); + return rom_present(L"roms/video/et4000w32/et4000w32.bin"); } void et4000w32p_close(void *p) diff --git a/src/VIDEO/vid_genius.c b/src/VIDEO/vid_genius.c index 35db8905f..5596d79c0 100644 --- a/src/VIDEO/vid_genius.c +++ b/src/VIDEO/vid_genius.c @@ -607,7 +607,7 @@ void genius_close(void *p) static int genius_available() { - return rom_present(L"roms/8x12.bin"); + return rom_present(L"roms/video/genius/8x12.bin"); } void genius_speed_changed(void *p) diff --git a/src/VIDEO/vid_nv_riva128.c b/src/VIDEO/vid_nv_riva128.c index c5b61a3e6..b2504f58c 100644 --- a/src/VIDEO/vid_nv_riva128.c +++ b/src/VIDEO/vid_nv_riva128.c @@ -2716,7 +2716,7 @@ static void *riva128_init() riva128_in, riva128_out, NULL, NULL); - rom_init(&riva128->bios_rom, L"roms/Diamond_V330_rev-e.vbi", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&riva128->bios_rom, L"roms/video/nv_riva128/Diamond_V330_rev-e.vbi", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); if (PCI) mem_mapping_disable(&riva128->bios_rom.mapping); @@ -2813,7 +2813,7 @@ static void riva128_close(void *p) static int riva128_available() { - return rom_present(L"roms/Diamond_V330_rev-e.vbi"); + return rom_present(L"roms/video/nv_riva128/Diamond_V330_rev-e.vbi"); } static void riva128_speed_changed(void *p) @@ -3017,7 +3017,7 @@ static void *rivatnt_init() riva128_in, riva128_out, NULL, NULL); - rom_init(&riva128->bios_rom, L"roms/NV4_diamond_revB.rom", 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&riva128->bios_rom, L"roms/video/nv_riva128/NV4_diamond_revB.rom", 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL); if (PCI) mem_mapping_disable(&riva128->bios_rom.mapping); @@ -3098,7 +3098,7 @@ static void rivatnt_close(void *p) static int rivatnt_available() { - return rom_present(L"roms/NV4_diamond_revB.rom"); + return rom_present(L"roms/video/nv_riva128/NV4_diamond_revB.rom"); } static void rivatnt_speed_changed(void *p) @@ -3220,13 +3220,13 @@ static void *rivatnt2_init() switch(model) { case 0: - rom_init(&riva128->bios_rom, L"roms/NV5diamond.bin", 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&riva128->bios_rom, L"roms/video/nv_riva128/NV5diamond.bin", 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL); break; case 1: - rom_init(&riva128->bios_rom, L"roms/inno3d64bit.BIN", 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&riva128->bios_rom, L"roms/video/nv_riva128/inno3d64bit.BIN", 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL); break; case 2: - rom_init(&riva128->bios_rom, L"roms/creative.BIN", 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&riva128->bios_rom, L"roms/video/nv_riva128/creative.BIN", 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL); break; } if (PCI) @@ -3309,7 +3309,7 @@ static void rivatnt2_close(void *p) static int rivatnt2_available() { - return rom_present(L"roms/NV5diamond.bin") || rom_present(L"roms/inno3d64bit.BIN") || rom_present(L"roms/creative.BIN"); + return rom_present(L"roms/video/nv_riva128/NV5diamond.bin") || rom_present(L"roms/video/nv_riva128/inno3d64bit.BIN") || rom_present(L"roms/video/nv_riva128/creative.BIN"); } static void rivatnt2_speed_changed(void *p) diff --git a/src/VIDEO/vid_oti067.c b/src/VIDEO/vid_oti067.c index c04a43778..7cfa434ba 100644 --- a/src/VIDEO/vid_oti067.c +++ b/src/VIDEO/vid_oti067.c @@ -186,23 +186,23 @@ void *oti067_common_init(wchar_t *bios_fn, int vram_size, int chip_id) void *oti067_init() { int vram_size = device_get_config_int("memory"); - return oti067_common_init(L"roms/oti067/bios.bin", vram_size, 2); + return oti067_common_init(L"roms/video/oti/bios.bin", vram_size, 2); } void *oti077_init() { int vram_size = device_get_config_int("memory"); - return oti067_common_init(L"roms/oti077.vbi", vram_size, 5); + return oti067_common_init(L"roms/video/oti/oti077.vbi", vram_size, 5); } static int oti067_available() { - return rom_present(L"roms/oti067/bios.bin"); + return rom_present(L"roms/video/oti/bios.bin"); } static int oti077_available() { - return rom_present(L"roms/oti077.vbi"); + return rom_present(L"roms/video/oti/oti077.vbi"); } void oti067_close(void *p) diff --git a/src/VIDEO/vid_paradise.c b/src/VIDEO/vid_paradise.c index 4527619fe..939cf506c 100644 --- a/src/VIDEO/vid_paradise.c +++ b/src/VIDEO/vid_paradise.c @@ -324,7 +324,7 @@ static void *paradise_pvga1a_pc2086_init() paradise_t *paradise = paradise_pvga1a_init(); if (paradise) - rom_init(¶dise->bios_rom, L"roms/pc2086/40186.ic171", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(¶dise->bios_rom, L"roms/machines/pc2086/40186.ic171", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); return paradise; } @@ -333,7 +333,7 @@ static void *paradise_pvga1a_pc3086_init() paradise_t *paradise = paradise_pvga1a_init(); if (paradise) - rom_init(¶dise->bios_rom, L"roms/pc3086/c000.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(¶dise->bios_rom, L"roms/machines/pc3086/c000.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); return paradise; } @@ -344,8 +344,8 @@ static void *paradise_wd90c11_megapc_init() if (paradise) rom_init_interleaved(¶dise->bios_rom, - L"roms/megapc/41651-bios lo.u18", - L"roms/megapc/211253-bios hi.u19", + L"roms/machines/megapc/41651-bios lo.u18", + L"roms/machines/megapc/211253-bios hi.u19", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); return paradise; @@ -353,7 +353,7 @@ static void *paradise_wd90c11_megapc_init() static int paradise_wd90c11_standalone_available() { - return rom_present(L"roms/megapc/41651-bios lo.u18") && rom_present(L"roms/megapc/211253-bios hi.u19"); + return rom_present(L"roms/machines/megapc/41651-bios lo.u18") && rom_present(L"roms/machines/megapc/211253-bios hi.u19"); } void paradise_close(void *p) diff --git a/src/VIDEO/vid_pc1640.c b/src/VIDEO/vid_pc1640.c index 3db12e57d..2d6638ed4 100644 --- a/src/VIDEO/vid_pc1640.c +++ b/src/VIDEO/vid_pc1640.c @@ -126,7 +126,7 @@ void *pc1640_init() ega_t *ega = &pc1640->ega; memset(pc1640, 0, sizeof(pc1640_t)); - rom_init(&pc1640->bios_rom, L"roms/pc1640/40100", 0xc0000, 0x8000, 0x7fff, 0, 0); + rom_init(&pc1640->bios_rom, L"roms/machines/pc1640/40100", 0xc0000, 0x8000, 0x7fff, 0, 0); ega_init(&pc1640->ega); pc1640->cga.vram = pc1640->ega.vram; diff --git a/src/VIDEO/vid_s3.c b/src/VIDEO/vid_s3.c index 5e569ce8e..0156f4763 100644 --- a/src/VIDEO/vid_s3.c +++ b/src/VIDEO/vid_s3.c @@ -2218,29 +2218,29 @@ void *s3_vision864_init(wchar_t *bios_fn) void *s3_bahamas64_init() { - s3_t *s3 = s3_vision864_init(L"roms/bahamas64.BIN"); + s3_t *s3 = s3_vision864_init(L"roms/video/s3/bahamas64.BIN"); return s3; } void *s3_phoenix_vision864_init() { - s3_t *s3 = s3_vision864_init(L"roms/86c864p.bin"); + s3_t *s3 = s3_vision864_init(L"roms/video/s3/86c864p.bin"); return s3; } int s3_bahamas64_available() { - return rom_present(L"roms/bahamas64.BIN"); + return rom_present(L"roms/video/s3/bahamas64.BIN"); } int s3_phoenix_vision864_available() { - return rom_present(L"roms/86c864p.bin"); + return rom_present(L"roms/video/s3/86c864p.bin"); } void *s3_phoenix_trio32_init() { - s3_t *s3 = s3_init(L"roms/86C732P.bin", S3_TRIO32); + s3_t *s3 = s3_init(L"roms/video/s3/86C732P.bin", S3_TRIO32); s3->id = 0xe1; /*Trio32*/ s3->id_ext = 0x10; @@ -2255,7 +2255,7 @@ void *s3_phoenix_trio32_init() int s3_phoenix_trio32_available() { - return rom_present(L"roms/86C732P.bin"); + return rom_present(L"roms/video/s3/86C732P.bin"); } void *s3_trio64_init(wchar_t *bios_fn) @@ -2274,35 +2274,35 @@ void *s3_trio64_init(wchar_t *bios_fn) void *s3_9fx_init() { - s3_t *s3 = s3_trio64_init(L"roms/s3_764.bin"); + s3_t *s3 = s3_trio64_init(L"roms/video/s3/s3_764.bin"); return s3; } void *s3_phoenix_trio64_init() { - s3_t *s3 = s3_trio64_init(L"roms/86C764X1.bin"); + s3_t *s3 = s3_trio64_init(L"roms/video/s3/86C764X1.bin"); return s3; } void *s3_diamond_stealth64_init() { - s3_t *s3 = s3_trio64_init(L"roms/STEALT64.BIN"); + s3_t *s3 = s3_trio64_init(L"roms/video/s3/STEALT64.BIN"); return s3; } int s3_9fx_available() { - return rom_present(L"roms/s3_764.bin"); + return rom_present(L"roms/video/s3/s3_764.bin"); } int s3_phoenix_trio64_available() { - return rom_present(L"roms/86c764x1.bin"); + return rom_present(L"roms/video/s3/86c764x1.bin"); } int s3_diamond_stealth64_available() { - return rom_present(L"roms/STEALT64.BIN"); + return rom_present(L"roms/video/s3/STEALT64.BIN"); } void s3_close(void *p) diff --git a/src/VIDEO/vid_s3_virge.c b/src/VIDEO/vid_s3_virge.c index 4cb96ab8b..7b33bdfee 100644 --- a/src/VIDEO/vid_s3_virge.c +++ b/src/VIDEO/vid_s3_virge.c @@ -3750,7 +3750,7 @@ static void *s3_virge_init() s3_virge_overlay_draw); virge->svga.vblank_start = s3_virge_vblank_start; - rom_init(&virge->bios_rom, L"roms/s3virge.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&virge->bios_rom, L"roms/video/s3virge/s3virge.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); if (PCI) mem_mapping_disable(&virge->bios_rom.mapping); @@ -3845,7 +3845,7 @@ static void *s3_virge_988_init() s3_virge_hwcursor_draw, s3_virge_overlay_draw); - rom_init(&virge->bios_rom, L"roms/diamondstealth3000.VBI", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&virge->bios_rom, L"roms/video/s3virge/diamondstealth3000.VBI", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); if (PCI) mem_mapping_disable(&virge->bios_rom.mapping); @@ -4023,12 +4023,12 @@ static void *s3_virge_375_init(wchar_t *romfn) static void *s3_virge_375_1_init() { - return s3_virge_375_init(L"roms/86c375_1.bin"); + return s3_virge_375_init(L"roms/video/s3virge/86c375_1.bin"); } static void *s3_virge_375_4_init() { - return s3_virge_375_init(L"roms/86c375_4.bin"); + return s3_virge_375_init(L"roms/video/s3virge/86c375_4.bin"); } static void s3_virge_close(void *p) @@ -4056,22 +4056,22 @@ static void s3_virge_close(void *p) static int s3_virge_available() { - return rom_present(L"roms/s3virge.bin"); + return rom_present(L"roms/video/s3virge/s3virge.bin"); } static int s3_virge_988_available() { - return rom_present(L"roms/diamondstealth3000.VBI"); + return rom_present(L"roms/video/s3virge/diamondstealth3000.VBI"); } static int s3_virge_375_1_available() { - return rom_present(L"roms/86c375_1.bin"); + return rom_present(L"roms/video/s3virge/86c375_1.bin"); } static int s3_virge_375_4_available() { - return rom_present(L"roms/86c375_4.bin"); + return rom_present(L"roms/video/s3virge/86c375_4.bin"); } static void s3_virge_speed_changed(void *p) diff --git a/src/VIDEO/vid_tgui9440.c b/src/VIDEO/vid_tgui9440.c index d0a11d317..bcd4a7c95 100644 --- a/src/VIDEO/vid_tgui9440.c +++ b/src/VIDEO/vid_tgui9440.c @@ -511,7 +511,7 @@ void *tgui9440_init() tgui->vram_size = device_get_config_int("memory") << 20; tgui->vram_mask = tgui->vram_size - 1; - rom_init(&tgui->bios_rom, L"roms/9440.vbi", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&tgui->bios_rom, L"roms/video/tgui9440/9440.vbi", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); svga_init(&tgui->svga, tgui, tgui->vram_size, tgui_recalctimings, @@ -537,7 +537,7 @@ void *tgui9440_init() static int tgui9440_available() { - return rom_present(L"roms/9440.vbi"); + return rom_present(L"roms/video/tgui9440/9440.vbi"); } void tgui_close(void *p) diff --git a/src/VIDEO/vid_tvga.c b/src/VIDEO/vid_tvga.c index 7c6c7f255..a277e0229 100644 --- a/src/VIDEO/vid_tvga.c +++ b/src/VIDEO/vid_tvga.c @@ -286,7 +286,7 @@ void *tvga8900d_init() tvga->vram_size = device_get_config_int("memory") << 10; tvga->vram_mask = tvga->vram_size - 1; - rom_init(&tvga->bios_rom, L"roms/TRIDENT.BIN", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&tvga->bios_rom, L"roms/video/tvga/TRIDENT.BIN", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); svga_init(&tvga->svga, tvga, tvga->vram_size, tvga_recalctimings, @@ -301,7 +301,7 @@ void *tvga8900d_init() static int tvga8900d_available() { - return rom_present(L"roms/TRIDENT.BIN"); + return rom_present(L"roms/video/tvga/TRIDENT.BIN"); } void tvga_close(void *p) diff --git a/src/VIDEO/vid_vga.c b/src/VIDEO/vid_vga.c index e1570b3c4..85bf30446 100644 --- a/src/VIDEO/vid_vga.c +++ b/src/VIDEO/vid_vga.c @@ -85,7 +85,7 @@ void *vga_init() vga_t *vga = malloc(sizeof(vga_t)); memset(vga, 0, sizeof(vga_t)); - rom_init(&vga->bios_rom, L"roms/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0x2000, MEM_MAPPING_EXTERNAL); + rom_init(&vga->bios_rom, L"roms/video/vga/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0x2000, MEM_MAPPING_EXTERNAL); svga_init(&vga->svga, vga, 1 << 18, /*256kb*/ NULL, @@ -107,7 +107,7 @@ void *trigem_unk_init() vga_t *vga = malloc(sizeof(vga_t)); memset(vga, 0, sizeof(vga_t)); - rom_init(&vga->bios_rom, L"roms/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0x2000, MEM_MAPPING_EXTERNAL); + rom_init(&vga->bios_rom, L"roms/video/vga/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0x2000, MEM_MAPPING_EXTERNAL); svga_init(&vga->svga, vga, 1 << 18, /*256kb*/ NULL, @@ -150,7 +150,7 @@ void *ps1vga_init() static int vga_available() { - return rom_present(L"roms/ibm_vga.bin"); + return rom_present(L"roms/video/vga/ibm_vga.bin"); } void vga_close(void *p) diff --git a/src/esdi_at.c b/src/esdi_at.c index 11d5c048c..0429b350b 100644 --- a/src/esdi_at.c +++ b/src/esdi_at.c @@ -800,7 +800,7 @@ void *wd1007vse1_init() esdi->status = STAT_READY | STAT_DSC; esdi->error = 1; /*No errors*/ - rom_init(&esdi->bios_rom, L"roms/62-000279-061.bin", 0xc8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&esdi->bios_rom, L"roms/hdd/esdi_at/62-000279-061.bin", 0xc8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL); mem_mapping_set_handler(&esdi->bios_rom.mapping, rom_read, rom_readw, rom_readl, @@ -836,7 +836,7 @@ void wd1007vse1_close(void *p) static int wd1007vse1_available() { - return rom_present(L"roms/62-000279-061.bin"); + return rom_present(L"roms/hdd/esdi_at/62-000279-061.bin"); } device_t wd1007vse1_device = diff --git a/src/hdd_esdi.c b/src/hdd_esdi.c index 88d74f4d0..eb9335836 100644 --- a/src/hdd_esdi.c +++ b/src/hdd_esdi.c @@ -816,7 +816,7 @@ static void *esdi_init() esdi_t *esdi = malloc(sizeof(esdi_t)); memset(esdi, 0, sizeof(esdi_t)); - rom_init_interleaved(&esdi->bios_rom, L"roms/90x8970.bin", L"roms/90x8969.bin", 0xc8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL); + rom_init_interleaved(&esdi->bios_rom, L"roms/hdd/esdi/90x8970.bin", L"roms/hdd/esdi/90x8969.bin", 0xc8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL); mem_mapping_disable(&esdi->bios_rom.mapping); esdi->drives[0].present = esdi->drives[1].present = 0; @@ -866,7 +866,7 @@ static void esdi_close(void *p) static int esdi_available() { - return rom_present(L"roms/90x8969.bin") && rom_present(L"roms/90x8970.bin"); + return rom_present(L"roms/hdd/esdi/90x8969.bin") && rom_present(L"roms/hdd/esdi/90x8970.bin"); } device_t hdd_esdi_device = diff --git a/src/mem.c b/src/mem.c index 8ac06a2b7..ab8f50fac 100644 --- a/src/mem.c +++ b/src/mem.c @@ -82,7 +82,7 @@ uint32_t ram_mapped_addr[64]; static void mem_load_atide115_bios() { FILE *f; - f=romfopen(L"roms/ide_at_1_1_5.bin",L"rb"); + f=romfopen(L"roms/hdd/xtide/ide_at_1_1_5.bin",L"rb"); if (f) { @@ -97,8 +97,8 @@ int loadbios() FILE *f=NULL,*ff=NULL; int c; - loadfont(L"roms/mda.rom", 0); - loadfont(L"roms/wy700.rom", 3); + loadfont(L"roms/graphics/mda/mda.rom", 0); + loadfont(L"roms/graphics/wyse700/wy700.rom", 3); biosmask = 0xffff; @@ -114,8 +114,8 @@ int loadbios() switch (romset) { case ROM_PC1512: - f=romfopen(L"roms/pc1512/40043.v1",L"rb"); - ff=romfopen(L"roms/pc1512/40044.v1",L"rb"); + f=romfopen(L"roms/machines/pc1512/40043.v1",L"rb"); + ff=romfopen(L"roms/machines/pc1512/40044.v1",L"rb"); if (!f || !ff) break; for (c=0xC000;c<0x10000;c+=2) { @@ -124,11 +124,11 @@ int loadbios() } fclose(ff); fclose(f); - loadfont(L"roms/pc1512/40078.ic127", 2); + loadfont(L"roms/machines/pc1512/40078.ic127", 2); return 1; case ROM_PC1640: - f=romfopen(L"roms/pc1640/40044.v3",L"rb"); - ff=romfopen(L"roms/pc1640/40043.v3",L"rb"); + f=romfopen(L"roms/machines/pc1640/40044.v3",L"rb"); + ff=romfopen(L"roms/machines/pc1640/40043.v3",L"rb"); if (!f || !ff) break; for (c=0xC000;c<0x10000;c+=2) { @@ -137,13 +137,13 @@ int loadbios() } fclose(ff); fclose(f); - f=romfopen(L"roms/pc1640/40100",L"rb"); + f=romfopen(L"roms/machines/pc1640/40100",L"rb"); if (!f) break; fclose(f); return 1; case ROM_PC200: - f=romfopen(L"roms/pc200/pc20v2.1",L"rb"); - ff=romfopen(L"roms/pc200/pc20v2.0",L"rb"); + f=romfopen(L"roms/machines/pc200/pc20v2.1",L"rb"); + ff=romfopen(L"roms/machines/pc200/pc20v2.0",L"rb"); if (!f || !ff) break; for (c=0xC000;c<0x10000;c+=2) { @@ -152,24 +152,24 @@ int loadbios() } fclose(ff); fclose(f); - loadfont(L"roms/pc200/40109.bin", 1); + loadfont(L"roms/machines/pc200/40109.bin", 1); return 1; case ROM_TANDY: - f=romfopen(L"roms/tandy/tandy1t1.020",L"rb"); + f=romfopen(L"roms/machines/tandy/tandy1t1.020",L"rb"); if (!f) break; fread(rom,65536,1,f); fclose(f); return 1; case ROM_TANDY1000HX: - f = romfopen(L"roms/tandy1000hx/v020000.u12", L"rb"); + f = romfopen(L"roms/machines/tandy1000hx/v020000.u12", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); biosmask = 0x1ffff; return 1; case ROM_TANDY1000SL2: - f = romfopen(L"roms/tandy1000sl2/8079047.hu1" ,L"rb"); - ff = romfopen(L"roms/tandy1000sl2/8079048.hu2",L"rb"); + f = romfopen(L"roms/machines/tandy1000sl2/8079047.hu1" ,L"rb"); + ff = romfopen(L"roms/machines/tandy1000sl2/8079048.hu2",L"rb"); if (!f || !ff) break; fseek(f, 0x30000/2, SEEK_SET); fseek(ff, 0x30000/2, SEEK_SET); @@ -182,11 +182,11 @@ int loadbios() fclose(f); return 1; case ROM_IBMXT: - f=romfopen(L"roms/ibmxt/xt.rom",L"rb"); + f=romfopen(L"roms/machines/ibmxt/xt.rom",L"rb"); if (!f) { - f = romfopen(L"roms/ibmxt/5000027.u19", L"rb"); - ff = romfopen(L"roms/ibmxt/1501512.u18", L"rb"); + f = romfopen(L"roms/machines/ibmxt/5000027.u19", L"rb"); + ff = romfopen(L"roms/machines/ibmxt/1501512.u18", L"rb"); if (!f || !ff) break; fread(rom, 0x8000, 1, f); fread(rom + 0x8000, 0x8000, 1, ff); @@ -203,22 +203,22 @@ int loadbios() break; case ROM_IBMPCJR: - f = romfopen(L"roms/ibmpcjr/bios.rom", L"rb"); + f = romfopen(L"roms/machines/ibmpcjr/bios.rom", L"rb"); if (!f) break; fread(rom, 0x10000, 1, f); fclose(f); return 1; case ROM_PORTABLE: - f=romfopen(L"roms/portable/Compaq Portable Plus 100666-001 Rev C u47.bin",L"rb"); + f=romfopen(L"roms/machines/portable/Compaq Portable Plus 100666-001 Rev C u47.bin",L"rb"); if (!f) break; fread(rom+0xE000,8192,1,f); fclose(f); return 1; case ROM_PORTABLEII: - f = romfopen(L"roms/portableii/62x0820.u27", L"rb"); - ff =romfopen(L"roms/portableii/62x0821.u47", L"rb"); + f = romfopen(L"roms/machines/portableii/62x0820.u27", L"rb"); + ff =romfopen(L"roms/machines/portableii/62x0821.u47", L"rb"); if (!f || !ff) break; for (c=0x0000;c<0x10000;c+=2) { @@ -230,9 +230,9 @@ int loadbios() return 1; case ROM_PORTABLEIII: - case ROM_PORTABLEIII386: - f = romfopen(L"roms/portableiii/62x0820.u27", L"rb"); - ff =romfopen(L"roms/portableiii/62x0821.u47", L"rb"); + case ROM_PORTABLEIII386: + f = romfopen(L"roms/machines/portableiii/62x0820.u27", L"rb"); + ff =romfopen(L"roms/machines/portableiii/62x0821.u47", L"rb"); if (!f || !ff) break; for (c=0x0000;c<0x10000;c+=2) { @@ -244,20 +244,20 @@ int loadbios() return 1; case ROM_GENXT: - f=romfopen(L"roms/genxt/pcxt.rom",L"rb"); + f=romfopen(L"roms/machines/genxt/pcxt.rom",L"rb"); if (!f) break; fread(rom+0xE000,8192,1,f); fclose(f); return 1; case ROM_DTKXT: - f=romfopen(L"roms/dtk/DTK_ERSO_2.42_2764.bin",L"rb"); + f=romfopen(L"roms/machines/dtk/DTK_ERSO_2.42_2764.bin",L"rb"); if (!f) break; fread(rom+0xE000,8192,1,f); fclose(f); return 1; case ROM_OLIM24: - f = romfopen(L"roms/olivetti_m24/olivetti_m24_version_1.43_low.bin" ,L"rb"); - ff = romfopen(L"roms/olivetti_m24/olivetti_m24_version_1.43_high.bin",L"rb"); + f = romfopen(L"roms/machines/olivetti_m24/olivetti_m24_version_1.43_low.bin" ,L"rb"); + ff = romfopen(L"roms/machines/olivetti_m24/olivetti_m24_version_1.43_high.bin",L"rb"); if (!f || !ff) break; for (c = 0x0000; c < 0x4000; c += 2) { @@ -269,8 +269,8 @@ int loadbios() return 1; case ROM_PC2086: - f = romfopen(L"roms/pc2086/40179.ic129" ,L"rb"); - ff = romfopen(L"roms/pc2086/40180.ic132",L"rb"); + f = romfopen(L"roms/machines/pc2086/40179.ic129" ,L"rb"); + ff = romfopen(L"roms/machines/pc2086/40180.ic132",L"rb"); if (!f || !ff) break; pclog("Loading BIOS\n"); for (c = 0x0000; c < 0x4000; c += 2) @@ -281,26 +281,26 @@ int loadbios() pclog("%02X %02X %02X\n", rom[0xfff0], rom[0xfff1], rom[0xfff2]); fclose(ff); fclose(f); - f = romfopen(L"roms/pc2086/40186.ic171", L"rb"); + f = romfopen(L"roms/machines/pc2086/40186.ic171", L"rb"); if (!f) break; fclose(f); biosmask = 0x3fff; return 1; case ROM_PC3086: - f = romfopen(L"roms/pc3086/fc00.bin", L"rb"); + f = romfopen(L"roms/machines/pc3086/fc00.bin", L"rb"); if (!f) break; fread(rom, 0x4000, 1, f); fclose(f); - f = romfopen(L"roms/pc3086/c000.bin", L"rb"); + f = romfopen(L"roms/machines/pc3086/c000.bin", L"rb"); if (!f) break; fclose(f); biosmask = 0x3fff; return 1; case ROM_IBMAT: - f = romfopen(L"roms/ibmat/62x0820.u27", L"rb"); - ff =romfopen(L"roms/ibmat/62x0821.u47", L"rb"); + f = romfopen(L"roms/machines/ibmat/62x0820.u27", L"rb"); + ff =romfopen(L"roms/machines/ibmat/62x0821.u47", L"rb"); if (!f || !ff) break; for (c=0x0000;c<0x10000;c+=2) { @@ -310,9 +310,10 @@ int loadbios() fclose(ff); fclose(f); return 1; + case ROM_CMDPC30: - f = romfopen(L"roms/cmdpc30/commodore pc 30 iii even.bin", L"rb"); - ff = romfopen(L"roms/cmdpc30/commodore pc 30 iii odd.bin", L"rb"); + f = romfopen(L"roms/machines/cmdpc30/commodore pc 30 iii even.bin", L"rb"); + ff = romfopen(L"roms/machines/cmdpc30/commodore pc 30 iii odd.bin", L"rb"); if (!f || !ff) break; for (c = 0x0000; c < 0x8000; c += 2) { @@ -323,68 +324,69 @@ int loadbios() fclose(f); biosmask = 0x7fff; return 1; + case ROM_AMI386SX: - f=romfopen(L"roms/ami386/ami386.bin",L"rb"); + f=romfopen(L"roms/machines/ami386/ami386.bin",L"rb"); if (!f) break; fread(rom,65536,1,f); fclose(f); return 1; case ROM_AMI386DX_OPTI495: /*This uses the OPTi 82C495 chipset*/ - f=romfopen(L"roms/ami386dx/OPT495SX.AMI",L"rb"); + f=romfopen(L"roms/machines/ami386dx/OPT495SX.AMI",L"rb"); if (!f) break; fread(rom,65536,1,f); fclose(f); return 1; case ROM_MR386DX_OPTI495: /*This uses the OPTi 82C495 chipset*/ - f=romfopen(L"roms/mr386dx/OPT495SX.MR",L"rb"); + f=romfopen(L"roms/machines/mr386dx/OPT495SX.MR",L"rb"); if (!f) break; fread(rom,65536,1,f); fclose(f); return 1; case ROM_AMI286: - f=romfopen(L"roms/ami286/amic206.bin",L"rb"); + f=romfopen(L"roms/machines/ami286/amic206.bin",L"rb"); if (!f) break; fread(rom,65536,1,f); fclose(f); return 1; case ROM_AWARD286: - f=romfopen(L"roms/award286/award.bin",L"rb"); + f=romfopen(L"roms/machines/award286/award.bin",L"rb"); if (!f) break; fread(rom,65536,1,f); fclose(f); return 1; case ROM_EUROPC: - f=romfopen(L"roms/europc/50145",L"rb"); + f=romfopen(L"roms/machines/europc/50145",L"rb"); if (!f) break; fread(rom+0x8000,32768,1,f); fclose(f); return 1; case ROM_IBMPC: - f=romfopen(L"roms/ibmpc/pc102782.bin",L"rb"); + f=romfopen(L"roms/machines/ibmpc/pc102782.bin",L"rb"); if (!f) break; fread(rom+0xE000,8192,1,f); fclose(f); f=romfopen(L"roms/ibmpc/ibm-basic-1.10.rom",L"rb"); if (!f) { - f=romfopen(L"roms/ibmpc/basicc11.f6",L"rb"); + f=romfopen(L"roms/machines/ibmpc/basicc11.f6",L"rb"); if (!f) return 1; /*I don't really care if BASIC is there or not*/ fread(rom+0x6000,8192,1,f); fclose(f); - f=romfopen(L"roms/ibmpc/basicc11.f8",L"rb"); + f=romfopen(L"roms/machines/ibmpc/basicc11.f8",L"rb"); if (!f) break; /*But if some of it is there, then all of it must be*/ fread(rom+0x8000,8192,1,f); fclose(f); - f=romfopen(L"roms/ibmpc/basicc11.fa",L"rb"); + f=romfopen(L"roms/machines/ibmpc/basicc11.fa",L"rb"); if (!f) break; fread(rom+0xA000,8192,1,f); fclose(f); - f=romfopen(L"roms/ibmpc/basicc11.fc",L"rb"); + f=romfopen(L"roms/machines/ibmpc/basicc11.fc",L"rb"); if (!f) break; fread(rom+0xC000,8192,1,f); fclose(f); @@ -399,8 +401,8 @@ int loadbios() case ROM_MEGAPC: case ROM_MEGAPCDX: - f = romfopen(L"roms/megapc/41651-bios lo.u18", L"rb"); - ff = romfopen(L"roms/megapc/211253-bios hi.u19", L"rb"); + f = romfopen(L"roms/machines/megapc/41651-bios lo.u18", L"rb"); + ff = romfopen(L"roms/machines/megapc/211253-bios hi.u19", L"rb"); if (!f || !ff) break; fseek(f, 0x8000, SEEK_SET); fseek(ff, 0x8000, SEEK_SET); @@ -414,21 +416,21 @@ int loadbios() return 1; case ROM_AMI486: - f=romfopen(L"roms/ami486/ami486.BIN",L"rb"); + f=romfopen(L"roms/machines/ami486/ami486.BIN",L"rb"); if (!f) break; fread(rom,65536,1,f); fclose(f); return 1; case ROM_WIN486: - f=romfopen(L"roms/win486/ALI1429G.AMW",L"rb"); + f=romfopen(L"roms/machines/win486/ALI1429G.AMW",L"rb"); if (!f) break; fread(rom,65536,1,f); fclose(f); return 1; case ROM_SIS496: - f = romfopen(L"roms/sis496/SIS496_3.AWA", L"rb"); + f = romfopen(L"roms/machines/sis496/SIS496_3.AWA", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -438,7 +440,7 @@ int loadbios() #if 0 case ROM_430VX: - f = romfopen(L"roms/430vx/55XWUQ0E.BIN", L"rb"); + f = romfopen(L"roms/machines/430vx/55XWUQ0E.BIN", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -447,12 +449,12 @@ int loadbios() #endif case ROM_REVENGE: - f = romfopen(L"roms/revenge/1009AF2_.BIO", L"rb"); + f = romfopen(L"roms/machines/revenge/1009AF2_.BIO", L"rb"); if (!f) break; fseek(f, 0x80, SEEK_SET); fread(rom + 0x10000, 0x10000, 1, f); fclose(f); - f = romfopen(L"roms/revenge/1009AF2_.BI1", L"rb"); + f = romfopen(L"roms/machines/revenge/1009AF2_.BI1", L"rb"); if (!f) break; fseek(f, 0x80, SEEK_SET); fread(rom, 0xc000, 1, f); @@ -460,12 +462,12 @@ int loadbios() biosmask = 0x1ffff; return 1; case ROM_ENDEAVOR: - f = romfopen(L"roms/endeavor/1006CB0_.BIO", L"rb"); + f = romfopen(L"roms/machines/endeavor/1006CB0_.BIO", L"rb"); if (!f) break; fseek(f, 0x80, SEEK_SET); fread(rom + 0x10000, 0x10000, 1, f); fclose(f); - f = romfopen(L"roms/endeavor/1006CB0_.BI1", L"rb"); + f = romfopen(L"roms/machines/endeavor/1006CB0_.BI1", L"rb"); if (!f) break; fseek(f, 0x80, SEEK_SET); fread(rom, 0xd000, 1, f); @@ -474,7 +476,7 @@ int loadbios() return 1; case ROM_IBMPS1_2011: - f = romfopen(L"roms/ibmps1es/f80000.bin", L"rb"); + f = romfopen(L"roms/machines/ibmps1es/f80000.bin", L"rb"); if (!f) break; fseek(f, 0x60000, SEEK_SET); fread(rom, 0x20000, 1, f); @@ -484,7 +486,7 @@ int loadbios() case ROM_IBMPS1_2121: case ROM_IBMPS1_2121_ISA: - f = romfopen(L"roms/ibmps1_2121/fc0000.bin", L"rb"); + f = romfopen(L"roms/machines/ibmps1_2121/fc0000.bin", L"rb"); if (!f) break; fseek(f, 0x20000, SEEK_SET); fread(rom, 0x20000, 1, f); @@ -497,7 +499,7 @@ int loadbios() return 1; case ROM_IBMPS1_2133: - f = romfopen(L"roms/ibmps1_2133/PS1_2133_52G2974_ROM.bin", L"rb"); + f = romfopen(L"roms/machines/ibmps1_2133/PS1_2133_52G2974_ROM.bin", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -505,8 +507,8 @@ int loadbios() return 1; case ROM_DESKPRO_386: - f=romfopen(L"roms/deskpro386/109592-005.U11.bin",L"rb"); - ff=romfopen(L"roms/deskpro386/109591-005.U13.bin",L"rb"); + f=romfopen(L"roms/machines/deskpro386/109592-005.U11.bin",L"rb"); + ff=romfopen(L"roms/machines/deskpro386/109591-005.U13.bin",L"rb"); if (!f || !ff) break; for (c = 0x0000; c < 0x8000; c += 2) { @@ -519,33 +521,33 @@ int loadbios() return 1; case ROM_AMIXT: - f = romfopen(L"roms/amixt/AMI_8088_BIOS_31JAN89.BIN", L"rb"); + f = romfopen(L"roms/machines/amixt/AMI_8088_BIOS_31JAN89.BIN", L"rb"); if (!f) break; fread(rom + 0xE000, 8192, 1, f); fclose(f); return 1; case ROM_LTXT: - f = romfopen(L"roms/ltxt/27C64.bin", L"rb"); + f = romfopen(L"roms/machines/ltxt/27C64.bin", L"rb"); if (!f) break; fread(rom + 0xE000, 8192, 1, f); fclose(f); f=romfopen(L"roms/ltxt/ibm-basic-1.10.rom",L"rb"); if (!f) { - f=romfopen(L"roms/ltxt/basicc11.f6",L"rb"); + f=romfopen(L"roms/machines/ltxt/basicc11.f6",L"rb"); if (!f) return 1; /*I don't really care if BASIC is there or not*/ fread(rom+0x6000,8192,1,f); fclose(f); - f=romfopen(L"roms/ltxt/basicc11.f8",L"rb"); + f=romfopen(L"roms/machines/ltxt/basicc11.f8",L"rb"); if (!f) break; /*But if some of it is there, then all of it must be*/ fread(rom+0x8000,8192,1,f); fclose(f); - f=romfopen(L"roms/ltxt/basicc11.fa",L"rb"); + f=romfopen(L"roms/machines/ltxt/basicc11.fa",L"rb"); if (!f) break; fread(rom+0xA000,8192,1,f); fclose(f); - f=romfopen(L"roms/ltxt/basicc11.fc",L"rb"); + f=romfopen(L"roms/machines/ltxt/basicc11.fc",L"rb"); if (!f) break; fread(rom+0xC000,8192,1,f); fclose(f); @@ -559,26 +561,26 @@ int loadbios() return 1; case ROM_LXT3: - f = romfopen(L"roms/lxt3/27C64D.bin", L"rb"); + f = romfopen(L"roms/machines/lxt3/27C64D.bin", L"rb"); if (!f) break; fread(rom + 0xE000, 8192, 1, f); fclose(f); - f=romfopen(L"roms/lxt3/ibm-basic-1.10.rom",L"rb"); + f=romfopen(L"roms/machines/lxt3/ibm-basic-1.10.rom",L"rb"); if (!f) { - f=romfopen(L"roms/lxt3/basicc11.f6",L"rb"); + f=romfopen(L"roms/machines/lxt3/basicc11.f6",L"rb"); if (!f) return 1; /*I don't really care if BASIC is there or not*/ fread(rom+0x6000,8192,1,f); fclose(f); - f=romfopen(L"roms/lxt3/basicc11.f8",L"rb"); + f=romfopen(L"roms/machines/lxt3/basicc11.f8",L"rb"); if (!f) break; /*But if some of it is there, then all of it must be*/ fread(rom+0x8000,8192,1,f); fclose(f); - f=romfopen(L"roms/lxt3/basicc11.fa",L"rb"); + f=romfopen(L"roms/machines/lxt3/basicc11.fa",L"rb"); if (!f) break; fread(rom+0xA000,8192,1,f); fclose(f); - f=romfopen(L"roms/lxt3/basicc11.fc",L"rb"); + f=romfopen(L"roms/machines/lxt3/basicc11.fc",L"rb"); if (!f) break; fread(rom+0xC000,8192,1,f); fclose(f); @@ -592,42 +594,42 @@ int loadbios() return 1; case ROM_SPC4200P: /*Samsung SPC-4200P*/ - f = romfopen(L"roms/spc4200p/U8.01", L"rb"); + f = romfopen(L"roms/machines/spc4200p/U8.01", L"rb"); if (!f) break; fread(rom, 65536, 1, f); fclose(f); return 1; case ROM_SUPER286TR: /*Hyundai Super-286TR*/ - f = romfopen(L"roms/super286tr/hyundai_award286.bin", L"rb"); + f = romfopen(L"roms/machines/super286tr/hyundai_award286.bin", L"rb"); if (!f) break; fread(rom, 65536, 1, f); fclose(f); return 1; case ROM_DTK386: /*Uses NEAT chipset*/ - f = romfopen(L"roms/dtk386/3cto001.bin", L"rb"); + f = romfopen(L"roms/machines/dtk386/3cto001.bin", L"rb"); if (!f) break; fread(rom, 65536, 1, f); fclose(f); return 1; case ROM_PXXT: - f = romfopen(L"roms/pxxt/000p001.bin", L"rb"); + f = romfopen(L"roms/machines/pxxt/000p001.bin", L"rb"); if (!f) break; fread(rom + 0xE000, 8192, 1, f); fclose(f); return 1; case ROM_JUKOPC: - f = romfopen(L"roms/jukopc/000o001.bin", L"rb"); + f = romfopen(L"roms/machines/jukopc/000o001.bin", L"rb"); if (!f) break; fread(rom + 0xE000, 8192, 1, f); fclose(f); return 1; case ROM_IBMPS2_M30_286: - f = romfopen(L"roms/ibmps2_m30_286/33f5381a.bin", L"rb"); + f = romfopen(L"roms/machines/ibmps2_m30_286/33f5381a.bin", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -639,14 +641,14 @@ int loadbios() return 1; case ROM_DTK486: - f = romfopen(L"roms/dtk486/4siw005.bin", L"rb"); + f = romfopen(L"roms/machines/dtk486/4siw005.bin", L"rb"); if (!f) break; fread(rom, 0x10000, 1, f); fclose(f); return 1; case ROM_R418: - f = romfopen(L"roms/r418/r418i.bin", L"rb"); + f = romfopen(L"roms/machines/r418/r418i.bin", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -656,7 +658,7 @@ int loadbios() #if 0 case ROM_586MC1: - f = romfopen(L"roms/586mc1/IS.34", L"rb"); + f = romfopen(L"roms/machines/586mc1/IS.34", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -665,12 +667,12 @@ int loadbios() #endif case ROM_PLATO: - f = romfopen(L"roms/plato/1016AX1_.BIO", L"rb"); + f = romfopen(L"roms/machines/plato/1016AX1_.BIO", L"rb"); if (!f) break; fseek(f, 0x80, SEEK_SET); fread(rom + 0x10000, 0x10000, 1, f); fclose(f); - f = romfopen(L"roms/plato/1016AX1_.BI1", L"rb"); + f = romfopen(L"roms/machines/plato/1016AX1_.BI1", L"rb"); if (!f) break; fseek(f, 0x80, SEEK_SET); fread(rom, 0xd000, 1, f); @@ -679,7 +681,7 @@ int loadbios() return 1; case ROM_MB500N: - f = romfopen(L"roms/mb500n/031396S.BIN", L"rb"); /* Works */ + f = romfopen(L"roms/machines/mb500n/031396S.BIN", L"rb"); /* Works */ if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -687,7 +689,7 @@ int loadbios() return 1; case ROM_AP53: - f = romfopen(L"roms/ap53/AP53R2C0.ROM", L"rb"); /* Works */ + f = romfopen(L"roms/machines/ap53/AP53R2C0.ROM", L"rb"); /* Works */ if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -695,7 +697,7 @@ int loadbios() return 1; case ROM_P55T2S: - f = romfopen(L"roms/p55t2s/S6Y08T.ROM", L"rb"); /* Works */ + f = romfopen(L"roms/machines/p55t2s/S6Y08T.ROM", L"rb"); /* Works */ if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -703,7 +705,7 @@ int loadbios() return 1; case ROM_PRESIDENT: - f = romfopen(L"roms/president/BIOS.BIN", L"rb"); + f = romfopen(L"roms/machines/president/BIOS.BIN", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -711,7 +713,7 @@ int loadbios() return 1; case ROM_P54TP4XE: - f = romfopen(L"roms/p54tp4xe/T15I0302.AWD", L"rb"); + f = romfopen(L"roms/machines/p54tp4xe/T15I0302.AWD", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -719,15 +721,15 @@ int loadbios() return 1; case ROM_ACERM3A: - f = romfopen(L"roms/acerm3a/r01-b3.bin", L"rb"); + f = romfopen(L"roms/machines/acerm3a/r01-b3.bin", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); biosmask = 0x1ffff; return 1; - case ROM_ACERV35N: - f = romfopen(L"roms/acerv35n/V35ND1S1.BIN", L"rb"); + case ROM_ACERV35N: + f = romfopen(L"roms/machines/acerv35n/V35ND1S1.BIN", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -735,7 +737,7 @@ int loadbios() return 1; case ROM_P55VA: - f = romfopen(L"roms/p55va/VA021297.BIN", L"rb"); + f = romfopen(L"roms/machines/p55va/VA021297.BIN", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -743,7 +745,7 @@ int loadbios() return 1; case ROM_P55T2P4: - f = romfopen(L"roms/p55t2p4/0207_J2.BIN", L"rb"); + f = romfopen(L"roms/machines/p55t2p4/0207_J2.BIN", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -751,7 +753,7 @@ int loadbios() return 1; case ROM_P55TVP4: - f = romfopen(L"roms/p55tvp4/TV5I0204.AWD", L"rb"); + f = romfopen(L"roms/machines/p55tvp4/TV5I0204.AWD", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -759,7 +761,7 @@ int loadbios() return 1; case ROM_440FX: - f = romfopen(L"roms/440fx/NTMAW501.BIN", L"rb"); /* Working Tyan BIOS. */ + f = romfopen(L"roms/machines/440fx/NTMAW501.BIN", L"rb"); /* Working Tyan BIOS. */ if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -767,7 +769,7 @@ int loadbios() return 1; case ROM_S1668: - f = romfopen(L"roms/tpatx/S1668P.ROM", L"rb"); /* Working Tyan BIOS. */ + f = romfopen(L"roms/machines/tpatx/S1668P.ROM", L"rb"); /* Working Tyan BIOS. */ if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -775,12 +777,12 @@ int loadbios() return 1; case ROM_THOR: - f = romfopen(L"roms/thor/1006CN0_.BIO", L"rb"); + f = romfopen(L"roms/machines/thor/1006CN0_.BIO", L"rb"); if (!f) break; fseek(f, 0x80, SEEK_SET); fread(rom + 0x10000, 0x10000, 1, f); fclose(f); - f = romfopen(L"roms/thor/1006CN0_.BI1", L"rb"); + f = romfopen(L"roms/machines/thor/1006CN0_.BI1", L"rb"); if (!f) break; fseek(f, 0x80, SEEK_SET); fread(rom, 0x10000, 1, f); @@ -789,7 +791,7 @@ int loadbios() return 1; case ROM_MRTHOR: - f = romfopen(L"roms/mrthor/MR_ATX.BIO", L"rb"); + f = romfopen(L"roms/machines/mrthor/MR_ATX.BIO", L"rb"); if (!f) break; fread(rom, 0x20000, 1, f); fclose(f); @@ -797,12 +799,12 @@ int loadbios() return 1; case ROM_ZAPPA: - f = romfopen(L"roms/zappa/1006BS0_.BIO", L"rb"); + f = romfopen(L"roms/machines/zappa/1006BS0_.BIO", L"rb"); if (!f) break; fseek(f, 0x80, SEEK_SET); fread(rom + 0x10000, 0x10000, 1, f); fclose(f); - f = romfopen(L"roms/zappa/1006BS0_.BI1", L"rb"); + f = romfopen(L"roms/machines/zappa/1006BS0_.BI1", L"rb"); if (!f) break; fseek(f, 0x80, SEEK_SET); fread(rom, 0x10000, 1, f); @@ -811,8 +813,8 @@ int loadbios() return 1; case ROM_IBMPS2_M50: - f=romfopen(L"roms/i8550021/90x7423.zm14",L"rb"); - ff=romfopen(L"roms/i8550021/90x7426.zm16",L"rb"); + f=romfopen(L"roms/machines/ibmps2_m50/90x7423.zm14",L"rb"); + ff=romfopen(L"roms/machines/ibmps2_m50/90x7426.zm16",L"rb"); if (!f || !ff) break; for (c = 0x0000; c < 0x10000; c += 2) { @@ -821,8 +823,8 @@ int loadbios() } fclose(ff); fclose(f); - f=romfopen(L"roms/i8550021/90x7420.zm13",L"rb"); - ff=romfopen(L"roms/i8550021/90x7429.zm18",L"rb"); + f=romfopen(L"roms/machines/ibmps2_m50/90x7420.zm13",L"rb"); + ff=romfopen(L"roms/machines/ibmps2_m50/90x7429.zm18",L"rb"); if (!f || !ff) break; for (c = 0x10000; c < 0x20000; c += 2) { @@ -835,8 +837,8 @@ int loadbios() return 1; case ROM_IBMPS2_M55SX: - f=romfopen(L"roms/i8555081/33f8146.zm41",L"rb"); - ff=romfopen(L"roms/i8555081/33f8145.zm40",L"rb"); + f=romfopen(L"roms/machines/ibmps2_m55sx/33f8146.zm41",L"rb"); + ff=romfopen(L"roms/machines/ibmps2_m55sx/33f8145.zm40",L"rb"); if (!f || !ff) break; for (c = 0x0000; c < 0x20000; c += 2) { @@ -849,8 +851,8 @@ int loadbios() return 1; case ROM_IBMPS2_M80: - f=romfopen(L"roms/i8580111/15f6637.bin",L"rb"); - ff=romfopen(L"roms/i8580111/15f6639.bin",L"rb"); + f=romfopen(L"roms/machines/ibmps2_m80/15f6637.bin",L"rb"); + ff=romfopen(L"roms/machines/ibmps2_m80/15f6639.bin",L"rb"); if (!f || !ff) break; for (c = 0x0000; c < 0x20000; c += 2) { diff --git a/src/mfm_xebec.c b/src/mfm_xebec.c index eb56d2ec0..800d0eb44 100644 --- a/src/mfm_xebec.c +++ b/src/mfm_xebec.c @@ -823,7 +823,7 @@ static void *xebec_init() xebec_set_switches(xebec); - rom_init(&xebec->bios_rom, L"roms/ibm_xebec_62x0822_1985.bin", 0xc8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&xebec->bios_rom, L"roms/hdd/mfm_xebec/ibm_xebec_62x0822_1985.bin", 0xc8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL); io_sethandler(0x0320, 0x0004, xebec_read, NULL, NULL, xebec_write, NULL, NULL, xebec); @@ -849,7 +849,7 @@ static void xebec_close(void *p) static int xebec_available() { - return rom_present(L"roms/ibm_xebec_62x0822_1985.bin"); + return rom_present(L"roms/hdd/mfm_xebec/ibm_xebec_62x0822_1985.bin"); } device_t mfm_xebec_device = @@ -890,7 +890,7 @@ static void *dtc_5150x_init() xebec->drives[1].cfg_cyl = xebec->drives[1].tracks; xebec->drives[1].cfg_hpc = xebec->drives[1].hpc; - rom_init(&xebec->bios_rom, L"roms/dtc_cxd21a.bin", 0xc8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&xebec->bios_rom, L"roms/hdd/mfm_xebec/dtc_cxd21a.bin", 0xc8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL); io_sethandler(0x0320, 0x0004, xebec_read, NULL, NULL, xebec_write, NULL, NULL, xebec); @@ -900,7 +900,7 @@ static void *dtc_5150x_init() } static int dtc_5150x_available() { - return rom_present(L"roms/dtc_cxd21a.bin"); + return rom_present(L"roms/hdd/mfm_xebec/dtc_cxd21a.bin"); } device_t dtc_5150x_device = diff --git a/src/ps1.c b/src/ps1.c index f75a0f205..935bcef0d 100644 --- a/src/ps1.c +++ b/src/ps1.c @@ -141,7 +141,7 @@ void ps1mb_init(void) if (!enable_xtide) { rom_init(&ps1_high_rom, - L"roms/ibmps1es/f80000_shell.bin", + L"roms/machines/ibmps1es/f80000_shell.bin", 0xf80000, 0x80000, 0x7ffff, @@ -149,8 +149,8 @@ void ps1mb_init(void) MEM_MAPPING_EXTERNAL); } /* rom_init_interleaved(&ps1_high_rom, - L"roms/ibmps1es/ibm_1057757_24-05-90.bin", - L"roms/ibmps1es/ibm_1057757_29-15-90.bin", + L"roms/machines/ibmps1es/ibm_1057757_24-05-90.bin", + L"roms/machines/ibmps1es/ibm_1057757_29-15-90.bin", 0xfc0000, 0x40000, 0x3ffff, @@ -294,7 +294,7 @@ void ps1mb_m2121_init(void) io_sethandler(0x0190, 0x0001, ps1_m2121_read, NULL, NULL, ps1_m2121_write, NULL, NULL, NULL); rom_init(&ps1_high_rom, - L"roms/ibmps1_2121/fc0000_shell.bin", + L"roms/machines/ibmps1_2121/fc0000_shell.bin", 0xfc0000, 0x40000, 0x3ffff, diff --git a/src/scsi_aha154x.c b/src/scsi_aha154x.c index 83d32d55d..d3a27084c 100644 --- a/src/scsi_aha154x.c +++ b/src/scsi_aha154x.c @@ -47,12 +47,12 @@ #if AHA == AHA154xB -# define ROMFILE L"roms/adaptec/aha1540b310.bin" +# define ROMFILE L"roms/scsi/adaptec/aha1540b310.bin" # define AHA_BID 'A' /* AHA-154x B */ #endif #if AHA == AHA154xC -# define ROMFILE L"roms/adaptec/aha1542c101.bin" +# define ROMFILE L"roms/scsi/adaptec/aha1542c101.bin" # define AHA_BID 'D' /* AHA-154x C */ # define ROM_FWHIGH 0x0022 /* firmware version (hi/lo) */ # define ROM_SHRAM 0x3F80 /* shadow RAM address base */ @@ -62,7 +62,7 @@ #endif #if AHA == AHA154xCF -# define ROMFILE L"roms/adaptec/aha1542cf201.bin" +# define ROMFILE L"roms/scsi/adaptec/aha1542cf201.bin" # define AHA_BID 'E' /* AHA-154x CF */ # define ROM_FWHIGH 0x0022 /* firmware version (hi/lo) */ # define ROM_SHRAM 0x3F80 /* shadow RAM address base */ @@ -72,7 +72,7 @@ #endif #if AHA == AHA154xCP -# define ROMFILE L"roms/adaptec/aha1542cp102.bin" +# define ROMFILE L"roms/scsi/adaptec/aha1542cp102.bin" # define AHA_BID 'F' /* AHA-154x CP */ # define ROM_FWHIGH 0x0055 /* firmware version (hi/lo) */ # define ROM_SHRAM 0x3F80 /* shadow RAM address base */ @@ -2462,4 +2462,4 @@ device_t aha1640_device = { NULL, NULL, NULL -}; \ No newline at end of file +}; diff --git a/src/tandy_rom.c b/src/tandy_rom.c index a3b912c5f..f3aee6eaf 100644 --- a/src/tandy_rom.c +++ b/src/tandy_rom.c @@ -53,8 +53,8 @@ void *tandy_rom_init() tandy_rom = malloc(0x80000); - f = romfopen(L"roms/tandy1000sl2/8079047.hu1", L"rb"); - ff = romfopen(L"roms/tandy1000sl2/8079048.hu2", L"rb"); + f = romfopen(L"roms/machines/tandy1000sl2/8079047.hu1", L"rb"); + ff = romfopen(L"roms/machines/tandy1000sl2/8079048.hu2", L"rb"); for (c = 0x0000; c < 0x80000; c += 2) { tandy_rom[c] = getc(f); diff --git a/src/xtide.c b/src/xtide.c index e7997d8fa..30c19180c 100644 --- a/src/xtide.c +++ b/src/xtide.c @@ -25,8 +25,8 @@ #include "xtide.h" -#define XTIDE_ROM_PATH L"roms/ide_xt.bin" -#define ATIDE_ROM_PATH L"roms/ide_at.bin" +#define XTIDE_ROM_PATH L"roms/hdd/xtide/ide_xt.bin" +#define ATIDE_ROM_PATH L"roms/hdd/xtide/ide_at.bin" typedef struct xtide_t @@ -120,7 +120,7 @@ static void *xtide_ps2_init(void) xtide_t *xtide = malloc(sizeof(xtide_t)); memset(xtide, 0, sizeof(xtide_t)); - rom_init(&xtide->bios_rom, L"roms/SIDE1V12.BIN", 0xc8000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&xtide->bios_rom, L"roms/hdd/xtide/SIDE1V12.BIN", 0xc8000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); ide_xtide_init(); io_sethandler(0x0360, 0x0010, xtide_read, NULL, NULL, xtide_write, NULL, NULL, xtide); @@ -133,7 +133,7 @@ static void *xtide_at_ps2_init(void) xtide_t *xtide = malloc(sizeof(xtide_t)); memset(xtide, 0, sizeof(xtide_t)); - rom_init(&xtide->bios_rom, L"roms/ide_at_1_1_5.bin", 0xc8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&xtide->bios_rom, L"roms/hdd/xtide/ide_at_1_1_5.bin", 0xc8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL); ide_init(); return xtide; @@ -150,25 +150,25 @@ static void xtide_close(void *p) static int xtide_available(void) { - return rom_present(L"roms/ide_xt.bin"); + return rom_present(L"roms/hdd/xtide/ide_xt.bin"); } static int xtide_at_available(void) { - return rom_present(L"roms/ide_at.bin"); + return rom_present(L"roms/hdd/xtide/ide_at.bin"); } static int xtide_ps2_available(void) { - return rom_present(L"roms/SIDE1V12.BIN"); + return rom_present(L"roms/hdd/xtide/SIDE1V12.BIN"); } static int xtide_at_ps2_available(void) { - return rom_present(L"roms/ide_at_1_1_5.bin"); + return rom_present(L"roms/hdd/xtide/ide_at_1_1_5.bin"); }