diff --git a/src/emu/romload.h b/src/emu/romload.h index 7064e36a341..9a653ffd9ae 100644 --- a/src/emu/romload.h +++ b/src/emu/romload.h @@ -234,6 +234,9 @@ struct _rom_entry #define ROM_LOAD32_WORD(name,offset,length,hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_SKIP(2)) #define ROM_LOAD32_WORD_SWAP(name,offset,length,hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_REVERSE | ROM_SKIP(2)) #define ROM_LOAD32_DWORD(name,offset,length,hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPDWORD) +#define ROM_LOAD64_WORD(name,offset,length,hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_SKIP(6)) +#define ROM_LOAD64_WORD_SWAP(name,offset,length,hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_REVERSE | ROM_SKIP(6)) + /* ----- ROM_RELOAD related macros ----- */ #define ROM_RELOAD(offset,length) { NULL, NULL, offset, length, ROMENTRYTYPE_RELOAD | ROM_INHERITFLAGS }, diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c index 2bbe5943ad0..36f30cebd53 100644 --- a/src/mame/drivers/dbz.c +++ b/src/mame/drivers/dbz.c @@ -380,8 +380,6 @@ MACHINE_DRIVER_END /**********************************************************************************/ -#define ROM_LOAD64_WORD(name,offset,length,crc) ROMX_LOAD(name, offset, length, crc, ROM_GROUPWORD | ROM_SKIP(6)) - ROM_START( dbz ) /* main program */ ROM_REGION( 0x400000, "main", 0) diff --git a/src/mame/drivers/esripsys.c b/src/mame/drivers/esripsys.c index e892a277d5a..11c27c865d2 100644 --- a/src/mame/drivers/esripsys.c +++ b/src/mame/drivers/esripsys.c @@ -139,12 +139,12 @@ static READ8_HANDLER( g_status_r ) static WRITE8_HANDLER( g_status_w ) { int bankaddress; - UINT8* const ROM = memory_region(space->machine, "game_cpu"); + UINT8 *rom = memory_region(space->machine, "game_cpu"); g_status = data; bankaddress = 0x10000 + (data & 0x03) * 0x10000; - memory_set_bankptr(space->machine, 1, &ROM[bankaddress]); + memory_set_bankptr(space->machine, 1, &rom[bankaddress]); cpu_set_input_line(space->machine->cpu[ESRIPSYS_FRAME_CPU], M6809_FIRQ_LINE, data & 0x10 ? CLEAR_LINE : ASSERT_LINE); cpu_set_input_line(space->machine->cpu[ESRIPSYS_FRAME_CPU], INPUT_LINE_NMI, data & 0x80 ? CLEAR_LINE : ASSERT_LINE); @@ -522,7 +522,7 @@ static WRITE8_HANDLER( s_200e_w ) static WRITE8_HANDLER( s_200f_w ) { - UINT8* const ROM = memory_region(space->machine, "sound_data"); + UINT8 *rom = memory_region(space->machine, "sound_data"); int rombank = data & 0x20 ? 0x2000 : 0; /* Bit 6 -> Reset latch U56A */ @@ -537,9 +537,9 @@ static WRITE8_HANDLER( s_200f_w ) u56b = 1; /* Speech data resides in the upper 8kB of the ROMs */ - memory_set_bankptr(space->machine, 2, &ROM[0x0000 + rombank]); - memory_set_bankptr(space->machine, 3, &ROM[0x4000 + rombank]); - memory_set_bankptr(space->machine, 4, &ROM[0x8000 + rombank]); + memory_set_bankptr(space->machine, 2, &rom[0x0000 + rombank]); + memory_set_bankptr(space->machine, 3, &rom[0x4000 + rombank]); + memory_set_bankptr(space->machine, 4, &rom[0x8000 + rombank]); s_to_g_latch2 = data; } @@ -672,7 +672,7 @@ ADDRESS_MAP_END static DRIVER_INIT( esripsys ) { - UINT8* const ROM = memory_region(machine, "sound_data"); + UINT8 *rom = memory_region(machine, "sound_data"); fdt_a = auto_malloc(FDT_RAM_SIZE); fdt_b = auto_malloc(FDT_RAM_SIZE); @@ -680,9 +680,9 @@ static DRIVER_INIT( esripsys ) ptm6840_config(machine, 0, &ptm_intf); - memory_set_bankptr(machine, 2, &ROM[0x0000]); - memory_set_bankptr(machine, 3, &ROM[0x4000]); - memory_set_bankptr(machine, 4, &ROM[0x8000]); + memory_set_bankptr(machine, 2, &rom[0x0000]); + memory_set_bankptr(machine, 3, &rom[0x4000]); + memory_set_bankptr(machine, 4, &rom[0x8000]); /* Register stuff for state saving */ state_save_register_global_pointer(machine, fdt_a, FDT_RAM_SIZE); diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index 5a1f2086684..18d3b71d1d8 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -1014,8 +1014,6 @@ MACHINE_DRIVER_END /*************************************************************************/ -#define ROM_LOAD64_WORD(name,offset,length,hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_SKIP(6)) - ROM_START(gticlub) ROM_REGION(0x200000, "user1", 0) /* PowerPC program roms */ ROM_LOAD32_BYTE("688aaa01.21u", 0x000003, 0x80000, CRC(06a56474) SHA1(3a457b885a35e3ee030fd51d847bcf75fce46208)) diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index d79f7aac89f..5793f59fe50 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -1806,10 +1806,7 @@ static INPUT_PORTS_START( skichamp ) INPUT_PORTS_END -#define ROM_LOAD64_WORD(name,offset,length,hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_SKIP(6)) -#define ROM_LOAD64_WORD_SWAP(name,offset,length,hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_REVERSE| ROM_SKIP(6)) #define ROM_LOAD_VROM(name, offset, length, hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_SKIP(14) ) -//#define ROM_REGION64_BE(length,rclass,rtag,flags) ROM_REGION(length, rclass, rtype, (flags) | ROMREGION_64BIT | ROMREGION_BE) ROM_START( lemans24 ) /* step 1.5 */ ROM_REGION64_BE( 0x4800000, "user1", 0 ) /* program + data ROMs */ diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index 6e4c694983b..90b7a5060dd 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -1431,8 +1431,6 @@ INPUT_PORTS_END /**********************************************************************************/ -#define ROM_LOAD64_WORD(name,offset,length,crc) ROMX_LOAD(name, offset, length, crc, ROM_GROUPWORD | ROM_SKIP(6)) - #define ROM_LOADTILE_WORD(name,offset,length,crc) ROMX_LOAD(name, offset, length, crc, ROM_GROUPWORD | ROM_SKIP(3) | ROM_REVERSE) #define ROM_LOADTILE_BYTE(name,offset,length,crc) ROMX_LOAD(name, offset, length, crc, ROM_GROUPBYTE | ROM_SKIP(4)) diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index 0348f932363..287ad555399 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -446,7 +446,6 @@ static INPUT_PORTS_START( rng ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 ) INPUT_PORTS_END -#define ROM_LOAD64_WORD(name,offset,length,crc) ROMX_LOAD(name, offset, length, crc, ROM_GROUPWORD | ROM_SKIP(6)) ROM_START( rungun ) /* main program Europe Version AA 1993, 10.8 */ diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c index 1887305493f..b74a5152a0c 100644 --- a/src/mame/drivers/vcombat.c +++ b/src/mame/drivers/vcombat.c @@ -626,9 +626,6 @@ static MACHINE_DRIVER_START( shadfgtr ) MACHINE_DRIVER_END -/* Perhaps add this to the core romload.h file? */ -#define ROM_LOAD64_WORD(name,offset,length,hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_SKIP(6)) - ROM_START( vcombat ) ROM_REGION( 0x100000, "main", 0 ) ROM_LOAD16_BYTE( "ep8v2.b49", 0x00000, 0x80000, CRC(98d5a45d) SHA1(099e314f11c93ad6e642ceaa311e2a5b6fd7193c) ) diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index d5a09cf8063..fed17616aac 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -858,8 +858,6 @@ static DRIVER_INIT(jetwave) /*****************************************************************************/ -#define ROM_LOAD64_WORD(name,offset,length,hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_SKIP(6)) - ROM_START(midnrun) ROM_REGION(0x200000, "user1", 0) /* PowerPC program roms */ ROM_LOAD32_BYTE("midnight.20u", 0x000003, 0x80000, CRC(ea70edf2) SHA1(51c882383a150ba118ccd39eb869525fcf5eee3c) )