diff options
author | 2011-03-27 17:34:05 +0000 | |
---|---|---|
committer | 2011-03-27 17:34:05 +0000 | |
commit | a80dcb629bcdd2e755014d25dfc53baacb1f18df (patch) | |
tree | e0f1aec41ce48ed0ef8785f597b86429dae830bb /src/mame/drivers/witch.c | |
parent | 0b87c6e06ad0943b3c9b89721f9bc14967fc10a4 (diff) |
Deprecate the old memory_install_* macros. Dynamic installation is now handled
directly by calling methods on the address_space, which have been expanded with
aliases to cover all previous situations. In addition, variants with no mirror
or mask value are provided to cover the common cases:
memory_install_read*_handler(space, begin, end, mirror, mask, handler) ==>
space->install_legacy_read_handler(begin, end [, mirror, mask], FUNC(handler))
memory_install_write*_handler(space, begin, end, mirror, mask, handler) ==>
space->install_legacy_write_handler(begin, end [, mirror, mask], FUNC(handler))
memory_install_readwrite*_handler(space, begin, end, mirror, mask, rhandler, whandler) ==>
space->install_legacy_readwrite_handler(begin, end [, mirror, mask], FUNC(rhandler), FUNC(whandler))
memory_install_read*_device_handler(space, device, begin, end, mirror, mask, handler) ==>
space->install_legacy_read_handler(*device, begin, end [, mirror, mask], FUNC(handler))
memory_install_write*_device_handler(space, device, begin, end, mirror, mask, handler) ==>
space->install_legacy_write_handler(*device, begin, end [, mirror, mask], FUNC(handler))
memory_install_readwrite*_device_handler(space, device, begin, end, mirror, mask, rhandler, whandler) ==>
space->install_legacy_readwrite_handler(*device, begin, end [, mirror, mask], FUNC(rhandler), FUNC(whandler))
memory_install_read_port(space, begin, end, mirror, mask, port) ==>
space->install_read_port(begin, end [, mirror, mask], port)
memory_install_read_bank(space, begin, end, mirror, mask, bank) ==>
space->install_read_bank(begin, end [, mirror, mask], bank)
memory_install_rom(space, begin, end, mirror, mask, ptr) ==>
space->install_rom(begin, end [, mirror, mask], ptr)
memory_install_ram(space, begin, end, mirror, mask, ptr) ==>
space->install_ram(begin, end [, mirror, mask], ptr)
memory_unmap_read(space, begin, end, mirror, mask) ==>
space->unmap_read(begin, end [, mirror, mask])
memory_nop_read(space, begin, end, mirror, mask) ==>
space->nop_read(begin, end [, mirror, mask])
Below are the bulk search & replace regex'es used for this
memory_install_read([0-9]+)_handler( *)\(( *)([^,]+), *([^,]+,[^,]+, *)0 *, *0 *, *([^ )]+)( *)\)
\4->install_legacy_read_handler\2\(\3\5FUNC\(\6\)\7\)
memory_install_read([0-9]+)_handler( *)\(( *)([^,]+), *([^,]+,[^,]+,[^,]+,[^,]+, *)([^ )]+)( *)\)
\4->install_legacy_read_handler\2\(\3\5FUNC\(\6\)\7\)
memory_install_write([0-9]+)_handler( *)\(( *)([^,]+), *([^,]+,[^,]+, *)0 *, *0 *, *([^ )]+)( *)\)
\4->install_legacy_write_handler\2\(\3\5FUNC\(\6\)\7\)
memory_install_write([0-9]+)_handler( *)\(( *)([^,]+), *([^,]+,[^,]+,[^,]+,[^,]+, *)([^ )]+)( *)\)
\4->install_legacy_write_handler\2\(\3\5FUNC\(\6\)\7\)
memory_install_readwrite([0-9]+)_handler( *)\(( *)([^,]+), *([^,]+,[^,]+, *)0 *, *0 *, *([^ ,]+)( *, *)([^ )]+)( *)\)
\4->install_legacy_readwrite_handler\2\(\3\5FUNC\(\6\)\7FUNC\(\8\)\9\)
memory_install_readwrite([0-9]+)_handler( *)\(( *)([^,]+), *([^,]+,[^,]+,[^,]+,[^,]+, *)([^ ,]+)( *, *)([^ )]+)( *)\)
\4->install_legacy_readwrite_handler\2\(\3\5FUNC\(\6\)\7FUNC\(\8\)\9\)
memory_install_read([0-9]+)_device_handler( *)\(( *)([^,]+), *([^,]+), *([^,]+,[^,]+, *)0 *, *0 *, *([^ )]+)( *)\)
\4->install_legacy_read_handler\2\(\3\*\5, \6FUNC\(\7\)\8\)
memory_install_read([0-9]+)_device_handler( *)\(( *)([^,]+), *([^,]+), *([^,]+,[^,]+,[^,]+,[^,]+, *)([^ )]+)( *)\)
\4->install_legacy_read_handler\2\(\3\*\5, \6FUNC\(\7\)\8\)
memory_install_write([0-9]+)_device_handler( *)\(( *)([^,]+), *([^,]+), *([^,]+,[^,]+, *)0 *, *0 *, *([^ )]+)( *)\)
\4->install_legacy_write_handler\2\(\3\*\5, \6FUNC\(\7\)\8\)
memory_install_write([0-9]+)_device_handler( *)\(( *)([^,]+), *([^,]+), *([^,]+,[^,]+,[^,]+,[^,]+, *)([^ )]+)( *)\)
\4->install_legacy_write_handler\2\(\3\*\5, \6FUNC\(\7\)\8\)
memory_install_readwrite8_device_handler( *)\(( *)([^,]+), *([^,]+), *([^,]+,[^,]+, *)0 *, *0 *, *([^ ,]+)( *, *)([^ )]+)( *)\)
\3->install_legacy_readwrite_handler\1\(\2\*\4, \5FUNC\(\6\)\7FUNC\(\8\)\9\)
memory_install_readwrite8_device_handler( *)\(( *)([^,]+), *([^,]+), *([^,]+,[^,]+,[^,]+,[^,]+, *)([^ ,]+)( *, *)([^ )]+)( *)\)
\3->install_legacy_readwrite_handler\1\(\2\*\4, \5FUNC\(\6\)\7FUNC\(\8\)\9\)
memory_install_readwrite16_device_handler( *)\(( *)([^,]+), *([^,]+), *([^,]+,[^,]+, *)0 *, *0 *, *([^ ,]+)( *, *)([^ )]+)( *)\)
\3->install_legacy_readwrite_handler\1\(\2\*\4, \5FUNC\(\6\)\7FUNC\(\8\)\9\)
memory_install_readwrite16_device_handler( *)\(( *)([^,]+), *([^,]+), *([^,]+,[^,]+,[^,]+,[^,]+, *)([^ ,]+)( *, *)([^ )]+)( *)\)
\3->install_legacy_readwrite_handler\1\(\2\*\4, \5FUNC\(\6\)\7FUNC\(\8\)\9\)
memory_install_readwrite32_device_handler( *)\(( *)([^,]+), *([^,]+), *([^,]+,[^,]+, *)0 *, *0 *, *([^ ,]+)( *, *)([^ )]+)( *)\)
\3->install_legacy_readwrite_handler\1\(\2\*\4, \5FUNC\(\6\)\7FUNC\(\8\)\9\)
memory_install_readwrite32_device_handler( *)\(( *)([^,]+), *([^,]+), *([^,]+,[^,]+,[^,]+,[^,]+, *)([^ ,]+)( *, *)([^ )]+)( *)\)
\3->install_legacy_readwrite_handler\1\(\2\*\4, \5FUNC\(\6\)\7FUNC\(\8\)\9\)
memory_install_readwrite64_device_handler( *)\(( *)([^,]+), *([^,]+), *([^,]+,[^,]+, *)0 *, *0 *, *([^ ,]+)( *, *)([^ )]+)( *)\)
\3->install_legacy_readwrite_handler\1\(\2\*\4, \5FUNC\(\6\)\7FUNC\(\8\)\9\)
memory_install_readwrite64_device_handler( *)\(( *)([^,]+), *([^,]+), *([^,]+,[^,]+,[^,]+,[^,]+, *)([^ ,]+)( *, *)([^ )]+)( *)\)
\3->install_legacy_readwrite_handler\1\(\2\*\4, \5FUNC\(\6\)\7FUNC\(\8\)\9\)
memory_install_read_port( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *,
\3->install_read_port\1\(\2\4,
memory_install_read_port( *)\(( *)([^,]+), *
\3->install_read_port\1\(\2
memory_install_write_port( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *,
\3->install_write_port\1\(\2\4,
memory_install_write_port( *)\(( *)([^,]+), *
\3->install_write_port\1\(\2
memory_install_readwrite_port( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *,
\3->install_readwrite_port\1\(\2\4,
memory_install_readwrite_port( *)\(( *)([^,]+), *
\3->install_readwrite_port\1\(\2
memory_install_read_bank( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *,
\3->install_read_bank\1\(\2\4,
memory_install_read_bank( *)\(( *)([^,]+), *
\3->install_read_bank\1\(\2
memory_install_write_bank( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *,
\3->install_write_bank\1\(\2\4,
memory_install_write_bank( *)\(( *)([^,]+), *
\3->install_write_bank\1\(\2
memory_install_readwrite_bank( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *,
\3->install_readwrite_bank\1\(\2\4,
memory_install_readwrite_bank( *)\(( *)([^,]+), *
\3->install_readwrite_bank\1\(\2
memory_install_rom( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *,
\3->install_rom\1\(\2\4,
memory_install_rom( *)\(( *)([^,]+), *
\3->install_rom\1\(\2
memory_install_ram( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *,
\3->install_ram\1\(\2\4,
memory_install_ram( *)\(( *)([^,]+), *
\3->install_ram\1\(\2
memory_install_writeonly( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *,
\3->install_writeonly\1\(\2\4,
memory_install_writeonly( *)\(( *)([^,]+), *
\3->install_writeonly\1\(\2
memory_unmap_read( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *\)
\3->unmap_read\1\(\2\4\)
memory_unmap_read( *)\(( *)([^,]+), *
\3->unmap_read\1\(\2
memory_unmap_write( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *\)
\3->unmap_write\1\(\2\4\)
memory_unmap_write( *)\(( *)([^,]+), *
\3->unmap_write\1\(\2
memory_unmap_readwrite( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *\)
\3->unmap_readwrite\1\(\2\4\)
memory_unmap_readwrite( *)\(( *)([^,]+), *
\3->unmap_readwrite\1\(\2
memory_nop_read( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *\)
\3->nop_read\1\(\2\4\)
memory_nop_read( *)\(( *)([^,]+), *
\3->nop_read\1\(\2
memory_nop_write( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *\)
\3->nop_write\1\(\2\4\)
memory_nop_write( *)\(( *)([^,]+), *
\3->nop_write\1\(\2
memory_nop_readwrite( *)\(( *)([^,]+), *([^,]+,[^,]+), *0 *, *0 *\)
\3->nop_readwrite\1\(\2\4\)
memory_nop_readwrite( *)\(( *)([^,]+), *
\3->nop_readwrite\1\(\2
Diffstat (limited to 'src/mame/drivers/witch.c')
-rw-r--r-- | src/mame/drivers/witch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index a01a4dd48c4..cbbdc70da23 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -868,7 +868,7 @@ static DRIVER_INIT(witch) UINT8 *ROM = (UINT8 *)machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", &ROM[0x10000+UNBANKED_SIZE]); - memory_install_read8_handler(machine->device("sub")->memory().space(AS_PROGRAM), 0x7000, 0x700f, 0, 0, prot_read_700x); + machine->device("sub")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x7000, 0x700f, FUNC(prot_read_700x)); state->bank = -1; } |