summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-12-05 07:59:31 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-12-05 07:59:31 +0000
commitee315fe99d656a10941f7f82cafbb879bcd2ec33 (patch)
tree77501480d2fc29129dd14ab16ca941135672e832
parent9eda9e163e06bd85a19a4e06b966cb9829e14488 (diff)
Renamed functions:
memory_install_read/write_port_handler -> memory_install_read/write_port memory_install_read/write_bank_handler -> memory_install_read/write_bank
-rw-r--r--src/emu/cpu/mips/psx.c2
-rw-r--r--src/emu/memory.c8
-rw-r--r--src/emu/memory.h32
-rw-r--r--src/emu/sound/okim6295.c2
-rw-r--r--src/mame/audio/dcs.c16
-rw-r--r--src/mame/audio/mario.c2
-rw-r--r--src/mame/drivers/alg.c2
-rw-r--r--src/mame/drivers/arcadia.c4
-rw-r--r--src/mame/drivers/asteroid.c4
-rw-r--r--src/mame/drivers/astrocde.c18
-rw-r--r--src/mame/drivers/ataxx.c26
-rw-r--r--src/mame/drivers/btime.c4
-rw-r--r--src/mame/drivers/bzone.c6
-rw-r--r--src/mame/drivers/cham24.c2
-rw-r--r--src/mame/drivers/chqflag.c6
-rw-r--r--src/mame/drivers/combatsc.c2
-rw-r--r--src/mame/drivers/crimfght.c4
-rw-r--r--src/mame/drivers/cubocd32.c2
-rw-r--r--src/mame/drivers/ddragon.c2
-rw-r--r--src/mame/drivers/decocass.c2
-rw-r--r--src/mame/drivers/dkong.c4
-rw-r--r--src/mame/drivers/exidy.c2
-rw-r--r--src/mame/drivers/exidy440.c6
-rw-r--r--src/mame/drivers/galaxian.c32
-rw-r--r--src/mame/drivers/galivan.c4
-rw-r--r--src/mame/drivers/itech8.c10
-rw-r--r--src/mame/drivers/konamigv.c10
-rw-r--r--src/mame/drivers/kyugo.c4
-rw-r--r--src/mame/drivers/leland.c18
-rw-r--r--src/mame/drivers/liberate.c4
-rw-r--r--src/mame/drivers/m72.c4
-rw-r--r--src/mame/drivers/megadriv.c18
-rw-r--r--src/mame/drivers/megaplay.c2
-rw-r--r--src/mame/drivers/mitchell.c4
-rw-r--r--src/mame/drivers/model3.c14
-rw-r--r--src/mame/drivers/mquake.c2
-rw-r--r--src/mame/drivers/multigam.c18
-rw-r--r--src/mame/drivers/namcos11.c16
-rw-r--r--src/mame/drivers/namcos12.c2
-rw-r--r--src/mame/drivers/neodrvr.c16
-rw-r--r--src/mame/drivers/pacman.c2
-rw-r--r--src/mame/drivers/phoenix.c2
-rw-r--r--src/mame/drivers/pingpong.c16
-rw-r--r--src/mame/drivers/pipedrm.c2
-rw-r--r--src/mame/drivers/polepos.c6
-rw-r--r--src/mame/drivers/segae.c12
-rw-r--r--src/mame/drivers/segamsys.c10
-rw-r--r--src/mame/drivers/ssf2md.c2
-rw-r--r--src/mame/drivers/starwars.c2
-rw-r--r--src/mame/drivers/system1.c8
-rw-r--r--src/mame/drivers/toaplan2.c10
-rw-r--r--src/mame/drivers/topshoot.c8
-rw-r--r--src/mame/drivers/trackfld.c8
-rw-r--r--src/mame/drivers/upscope.c2
-rw-r--r--src/mame/drivers/vendetta.c2
-rw-r--r--src/mame/drivers/wardner.c8
-rw-r--r--src/mame/drivers/williams.c12
-rw-r--r--src/mame/drivers/zaxxon.c6
-rw-r--r--src/mame/drivers/zn.c42
-rw-r--r--src/mame/machine/atari.c2
-rw-r--r--src/mame/machine/beezer.c2
-rw-r--r--src/mame/machine/midtunit.c10
-rw-r--r--src/mame/machine/midyunit.c6
-rw-r--r--src/mame/machine/namcos1.c4
-rw-r--r--src/mame/machine/playch10.c12
-rw-r--r--src/mame/machine/scramble.c4
-rw-r--r--src/mame/machine/segaic16.c4
-rw-r--r--src/mame/machine/tnzs.c6
-rw-r--r--src/mame/machine/vsnes.c34
-rw-r--r--src/mame/machine/williams.c12
-rw-r--r--src/mame/video/combatsc.c2
-rw-r--r--src/mame/video/simpsons.c2
72 files changed, 298 insertions, 298 deletions
diff --git a/src/emu/cpu/mips/psx.c b/src/emu/cpu/mips/psx.c
index d5bbf621008..1cbe4a8c6f9 100644
--- a/src/emu/cpu/mips/psx.c
+++ b/src/emu/cpu/mips/psx.c
@@ -1316,7 +1316,7 @@ static void mips_update_scratchpad( const address_space *space )
}
else
{
- memory_install_readwrite_bank_handler( space, 0x1f800000, 0x1f8003ff, 0, 0, "bank32" );
+ memory_install_readwrite_bank( space, 0x1f800000, 0x1f8003ff, 0, 0, "bank32" );
memory_set_bankptr(space->machine, "bank32", psxcpu->dcache );
}
}
diff --git a/src/emu/memory.c b/src/emu/memory.c
index a7aac8c8f8d..1eea3a0b2ae 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -1345,11 +1345,11 @@ UINT64 *_memory_install_device_handler64(const address_space *space, const devic
/*-------------------------------------------------
- _memory_install_port_handler - install a
+ _memory_install_port - install a
new port handler into the given address space
-------------------------------------------------*/
-void _memory_install_port_handler(const address_space *space, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *rtag, const char *wtag)
+void _memory_install_port(const address_space *space, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *rtag, const char *wtag)
{
address_space *spacerw = (address_space *)space;
genf *rhandler = NULL;
@@ -1386,11 +1386,11 @@ void _memory_install_port_handler(const address_space *space, offs_t addrstart,
/*-------------------------------------------------
- _memory_install_bank_handler - install a
+ _memory_install_bank - install a
new port handler into the given address space
-------------------------------------------------*/
-void _memory_install_bank_handler(const address_space *space, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *rtag, const char *wtag)
+void _memory_install_bank(const address_space *space, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *rtag, const char *wtag)
{
address_space *spacerw = (address_space *)space;
diff --git a/src/emu/memory.h b/src/emu/memory.h
index 79bdd6ec527..c982f194b9d 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -490,10 +490,10 @@ union _addrmap64_token
#define memory_install_read64_device_handler(space, device, start, end, mask, mirror, rhandler) \
_memory_install_device_handler64(space, device, start, end, mask, mirror, rhandler, NULL, #rhandler, NULL)
-#define memory_install_read_port_handler(space, start, end, mask, mirror, rtag) \
- _memory_install_port_handler(space, start, end, mask, mirror, rtag, NULL)
-#define memory_install_read_bank_handler(space, start, end, mask, mirror, rtag) \
- _memory_install_bank_handler(space, start, end, mask, mirror, rtag, NULL)
+#define memory_install_read_port(space, start, end, mask, mirror, rtag) \
+ _memory_install_port(space, start, end, mask, mirror, rtag, NULL)
+#define memory_install_read_bank(space, start, end, mask, mirror, rtag) \
+ _memory_install_bank(space, start, end, mask, mirror, rtag, NULL)
#define memory_unmap_read(space, start, end, mask, mirror) \
_memory_unmap(space, start, end, mask, mirror, TRUE, FALSE, FALSE)
#define memory_nop_read(space, start, end, mask, mirror) \
@@ -522,10 +522,10 @@ union _addrmap64_token
#define memory_install_write64_device_handler(space, device, start, end, mask, mirror, whandler) \
_memory_install_device_handler64(space, device, start, end, mask, mirror, NULL, whandler, NULL, #whandler)
-#define memory_install_write_port_handler(space, start, end, mask, mirror, wtag) \
- _memory_install_port_handler(space, start, end, mask, mirror, NULL, wtag)
-#define memory_install_write_bank_handler(space, start, end, mask, mirror, wtag) \
- _memory_install_bank_handler(space, start, end, mask, mirror, NULL, wtag)
+#define memory_install_write_port(space, start, end, mask, mirror, wtag) \
+ _memory_install_port(space, start, end, mask, mirror, NULL, wtag)
+#define memory_install_write_bank(space, start, end, mask, mirror, wtag) \
+ _memory_install_bank(space, start, end, mask, mirror, NULL, wtag)
#define memory_unmap_write(space, start, end, mask, mirror) \
_memory_unmap(space, start, end, mask, mirror, FALSE, TRUE, FALSE)
#define memory_nop_write(space, start, end, mask, mirror) \
@@ -554,10 +554,10 @@ union _addrmap64_token
#define memory_install_readwrite64_device_handler(space, device, start, end, mask, mirror, rhandler, whandler) \
_memory_install_device_handler64(space, device, start, end, mask, mirror, rhandler, whandler, #rhandler, #whandler)
-#define memory_install_readwrite_port_handler(space, start, end, mask, mirror, rtag, wtag) \
- _memory_install_port_handler(space, start, end, mask, mirror, rtag, wtag)
-#define memory_install_readwrite_bank_handler(space, start, end, mask, mirror, tag) \
- _memory_install_bank_handler(space, start, end, mask, mirror, tag, tag)
+#define memory_install_readwrite_port(space, start, end, mask, mirror, rtag, wtag) \
+ _memory_install_port(space, start, end, mask, mirror, rtag, wtag)
+#define memory_install_readwrite_bank(space, start, end, mask, mirror, tag) \
+ _memory_install_bank(space, start, end, mask, mirror, tag, tag)
#define memory_unmap_readwrite(space, start, end, mask, mirror) \
_memory_unmap(space, start, end, mask, mirror, TRUE, TRUE, FALSE)
#define memory_nop_readwrite(space, start, end, mask, mirror) \
@@ -1019,11 +1019,11 @@ UINT32 *_memory_install_device_handler32(const address_space *space, const devic
/* same as above but explicitly for 64-bit handlers */
UINT64 *_memory_install_device_handler64(const address_space *space, const device_config *device, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, read64_device_func rhandler, write64_device_func whandler, const char *rhandler_name, const char *whandler_name) ATTR_NONNULL(1, 2);
-/* install a new port handler into the given address space */
-void _memory_install_port_handler(const address_space *space, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *rtag, const char *wtag) ATTR_NONNULL(1);
+/* install a new port into the given address space */
+void _memory_install_port(const address_space *space, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *rtag, const char *wtag) ATTR_NONNULL(1);
-/* install a new bank handler into the given address space */
-void _memory_install_bank_handler(const address_space *space, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *rtag, const char *wtag) ATTR_NONNULL(1);
+/* install a new bank into the given address space */
+void _memory_install_bank(const address_space *space, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *rtag, const char *wtag) ATTR_NONNULL(1);
/* unmap a section of address space */
void _memory_unmap(const address_space *space, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, UINT8 unmap_read, UINT8 unmap_write, UINT8 quiet) ATTR_NONNULL(1);
diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c
index 7614a80f4b6..6d3cb0a0dc4 100644
--- a/src/emu/sound/okim6295.c
+++ b/src/emu/sound/okim6295.c
@@ -407,7 +407,7 @@ void okim6295_set_bank_base(const device_config *device, int base)
if (!info->bank_installed && base != 0)
{
/* override our memory map with a bank */
- memory_install_read_bank_handler(device->space[0], 0x00000, 0x3ffff, 0, 0, device->tag);
+ memory_install_read_bank(device->space[0], 0x00000, 0x3ffff, 0, 0, device->tag);
info->bank_installed = TRUE;
}
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index 552ca87d114..9bbcaa88b1a 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -1122,16 +1122,16 @@ static void sdrc_remap_memory(running_machine *machine)
else
{
/* first start with a clean program map */
- memory_install_readwrite_bank_handler(dcs.program, 0x0800, 0x3fff, 0, 0, "bank21");
+ memory_install_readwrite_bank(dcs.program, 0x0800, 0x3fff, 0, 0, "bank21");
memory_set_bankptr(machine, "bank21", dcs_sram + 0x4800);
/* set up the data map based on the SRAM banking */
/* map 0: ram from 0800-37ff */
if (SDRC_SM_BK == 0)
{
- memory_install_readwrite_bank_handler(dcs.data, 0x0800, 0x17ff, 0, 0, "bank22");
- memory_install_readwrite_bank_handler(dcs.data, 0x1800, 0x27ff, 0, 0, "bank23");
- memory_install_readwrite_bank_handler(dcs.data, 0x2800, 0x37ff, 0, 0, "bank24");
+ memory_install_readwrite_bank(dcs.data, 0x0800, 0x17ff, 0, 0, "bank22");
+ memory_install_readwrite_bank(dcs.data, 0x1800, 0x27ff, 0, 0, "bank23");
+ memory_install_readwrite_bank(dcs.data, 0x2800, 0x37ff, 0, 0, "bank24");
memory_set_bankptr(machine, "bank22", dcs_sram + 0x0000);
memory_set_bankptr(machine, "bank23", dcs_sram + 0x1000);
memory_set_bankptr(machine, "bank24", dcs_sram + 0x2000);
@@ -1141,8 +1141,8 @@ static void sdrc_remap_memory(running_machine *machine)
else
{
memory_unmap_readwrite(dcs.data, 0x0800, 0x17ff, 0, 0);
- memory_install_readwrite_bank_handler(dcs.data, 0x1800, 0x27ff, 0, 0, "bank23");
- memory_install_readwrite_bank_handler(dcs.data, 0x2800, 0x37ff, 0, 0, "bank24");
+ memory_install_readwrite_bank(dcs.data, 0x1800, 0x27ff, 0, 0, "bank23");
+ memory_install_readwrite_bank(dcs.data, 0x2800, 0x37ff, 0, 0, "bank24");
memory_set_bankptr(machine, "bank23", dcs_sram + 0x3000);
memory_set_bankptr(machine, "bank24", dcs_sram + 0x2000);
}
@@ -1153,14 +1153,14 @@ static void sdrc_remap_memory(running_machine *machine)
{
int baseaddr = (SDRC_ROM_ST == 0) ? 0x0000 : (SDRC_ROM_ST == 1) ? 0x3000 : 0x3400;
int pagesize = (SDRC_ROM_SZ == 0 && SDRC_ROM_ST != 0) ? 4096 : 1024;
- memory_install_read_bank_handler(dcs.data, baseaddr, baseaddr + pagesize - 1, 0, 0, "bank25");
+ memory_install_read_bank(dcs.data, baseaddr, baseaddr + pagesize - 1, 0, 0, "bank25");
}
/* map the DRAM page as bank 26 */
if (SDRC_DM_ST != 0)
{
int baseaddr = (SDRC_DM_ST == 1) ? 0x0000 : (SDRC_DM_ST == 2) ? 0x3000 : 0x3400;
- memory_install_readwrite_bank_handler(dcs.data, baseaddr, baseaddr + 0x3ff, 0, 0, "bank26");
+ memory_install_readwrite_bank(dcs.data, baseaddr, baseaddr + 0x3ff, 0, 0, "bank26");
}
/* update the bank pointers */
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index 9c4b224e3d4..7789503c7dd 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -477,7 +477,7 @@ static SOUND_START( mario )
if (audiocpu != NULL && cpu_get_type(audiocpu) != CPU_Z80)
{
state->eabank = "bank1";
- memory_install_read_bank_handler(cpu_get_address_space(audiocpu, ADDRESS_SPACE_PROGRAM), 0x000, 0x7ff, 0, 0, "bank1");
+ memory_install_read_bank(cpu_get_address_space(audiocpu, ADDRESS_SPACE_PROGRAM), 0x000, 0x7ff, 0, 0, "bank1");
memory_configure_bank(machine, "bank1", 0, 1, memory_region(machine, "audiocpu"), 0);
memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "audiocpu") + 0x1000, 0x800);
}
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index 867266eca9a..7e090df4774 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -206,7 +206,7 @@ static WRITE8_DEVICE_HANDLER( alg_cia_0_porta_w )
/* swap the write handlers between ROM and bank 1 based on the bit */
if ((data & 1) == 0)
/* overlay disabled, map RAM on 0x000000 */
- memory_install_write_bank_handler(space, 0x000000, 0x07ffff, 0, 0, "bank1");
+ memory_install_write_bank(space, 0x000000, 0x07ffff, 0, 0, "bank1");
else
/* overlay enabled, map Amiga system ROM on 0x000000 */
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index b7044ddc78a..6b7927fa12b 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -73,7 +73,7 @@ static UINT8 coin_counter[2];
static WRITE16_HANDLER( arcadia_multibios_change_game )
{
if (data == 0)
- memory_install_read_bank_handler(space, 0x800000, 0x97ffff, 0, 0, "bank2");
+ memory_install_read_bank(space, 0x800000, 0x97ffff, 0, 0, "bank2");
else
memory_nop_read(space, 0x800000, 0x97ffff, 0, 0);
}
@@ -103,7 +103,7 @@ static WRITE8_DEVICE_HANDLER( arcadia_cia_0_porta_w )
/* swap the write handlers between ROM and bank 1 based on the bit */
if ((data & 1) == 0)
/* overlay disabled, map RAM on 0x000000 */
- memory_install_write_bank_handler(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1");
+ memory_install_write_bank(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1");
else
/* overlay enabled, map Amiga system ROM on 0x000000 */
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index bc047dda5f3..6a547c9746f 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -922,8 +922,8 @@ ROM_END
static DRIVER_INIT( asteroib )
{
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2000, 0x2000, 0, 0, "IN0");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2003, 0x2003, 0, 0, "HS");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2000, 0x2000, 0, 0, "IN0");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2003, 0x2003, 0, 0, "HS");
}
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index b7de066ecc7..16139c4575c 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -428,7 +428,7 @@ static WRITE8_HANDLER( profpac_banksw_w )
profpac_bank = data;
/* set the main banking */
- memory_install_read_bank_handler(space, 0x4000, 0xbfff, 0, 0, "bank1");
+ memory_install_read_bank(space, 0x4000, 0xbfff, 0, 0, "bank1");
memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "user1") + 0x8000 * bank);
/* bank 0 reads video RAM in the 4000-7FFF range */
@@ -444,7 +444,7 @@ static WRITE8_HANDLER( profpac_banksw_w )
/* if the bank is in range, map the appropriate bank */
if (bank < 0x28)
{
- memory_install_read_bank_handler(space, 0x4000, 0x7fff, 0, 0, "bank2");
+ memory_install_read_bank(space, 0x4000, 0x7fff, 0, 0, "bank2");
memory_set_bankptr(space->machine, "bank2", memory_region(space->machine, "user2") + 0x4000 * bank);
}
else
@@ -1784,8 +1784,8 @@ static DRIVER_INIT( demndrgn )
astrocade_video_config = 0x00;
memory_install_read8_handler(iospace, 0x14, 0x14, 0x1fff, 0xff00, demndrgn_io_r);
- memory_install_read_port_handler(iospace, 0x1c, 0x1c, 0x0000, 0xff00, "FIREX");
- memory_install_read_port_handler(iospace, 0x1d, 0x1d, 0x0000, 0xff00, "FIREY");
+ memory_install_read_port(iospace, 0x1c, 0x1c, 0x0000, 0xff00, "FIREX");
+ memory_install_read_port(iospace, 0x1d, 0x1d, 0x0000, 0xff00, "FIREY");
memory_install_write8_handler(iospace, 0x97, 0x97, 0x0000, 0xff00, demndrgn_sound_w);
/* reset banking */
@@ -1799,11 +1799,11 @@ static DRIVER_INIT( tenpindx )
const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
astrocade_video_config = 0x00;
- memory_install_read_port_handler(iospace, 0x60, 0x60, 0x0000, 0xff00, "P60");
- memory_install_read_port_handler(iospace, 0x61, 0x61, 0x0000, 0xff00, "P61");
- memory_install_read_port_handler(iospace, 0x62, 0x62, 0x0000, 0xff00, "P62");
- memory_install_read_port_handler(iospace, 0x63, 0x63, 0x0000, 0xff00, "P63");
- memory_install_read_port_handler(iospace, 0x64, 0x64, 0x0000, 0xff00, "P64");
+ memory_install_read_port(iospace, 0x60, 0x60, 0x0000, 0xff00, "P60");
+ memory_install_read_port(iospace, 0x61, 0x61, 0x0000, 0xff00, "P61");
+ memory_install_read_port(iospace, 0x62, 0x62, 0x0000, 0xff00, "P62");
+ memory_install_read_port(iospace, 0x63, 0x63, 0x0000, 0xff00, "P63");
+ memory_install_read_port(iospace, 0x64, 0x64, 0x0000, 0xff00, "P64");
memory_install_write8_handler(iospace, 0x65, 0x66, 0x0000, 0xff00, tenpindx_lamp_w);
memory_install_write8_handler(iospace, 0x67, 0x67, 0x0000, 0xff00, tenpindx_counter_w);
memory_install_write8_handler(iospace, 0x68, 0x68, 0x0000, 0xff00, tenpindx_lights_w);
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index b3c40c18771..e70d64858fd 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -697,9 +697,9 @@ static DRIVER_INIT( wsf )
leland_rotate_memory(machine, "slave");
/* set up additional input ports */
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0d, 0x0d, 0, 0, "P1_P2");
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0e, 0x0e, 0, 0, "P3_P4");
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, "BUTTONS");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0d, 0x0d, 0, 0, "P1_P2");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0e, 0x0e, 0, 0, "P3_P4");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, "BUTTONS");
}
@@ -724,9 +724,9 @@ static DRIVER_INIT( indyheat )
/* set up additional input ports */
memory_install_read8_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x00, 0x02, 0, 0, indyheat_wheel_r);
memory_install_read8_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x08, 0x0b, 0, 0, indyheat_analog_r);
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0d, 0x0d, 0, 0, "P1");
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0e, 0x0e, 0, 0, "P2");
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, "P3");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0d, 0x0d, 0, 0, "P1");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0e, 0x0e, 0, 0, "P2");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, "P3");
/* set up additional output ports */
memory_install_write8_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x08, 0x0b, 0, 0, indyheat_analog_w);
@@ -752,9 +752,9 @@ static DRIVER_INIT( brutforc )
leland_rotate_memory(machine, "slave");
/* set up additional input ports */
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0d, 0x0d, 0, 0, "P2");
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0e, 0x0e, 0, 0, "P1");
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, "P3");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0d, 0x0d, 0, 0, "P2");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0e, 0x0e, 0, 0, "P1");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, "P3");
}
@@ -777,13 +777,13 @@ static DRIVER_INIT( asylum )
leland_rotate_memory(machine, "slave");
/* asylum appears to have some extra RAM for the slave CPU */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "slave", ADDRESS_SPACE_PROGRAM), 0xf000, 0xfffb, 0, 0, "bank4");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "slave", ADDRESS_SPACE_PROGRAM), 0xf000, 0xfffb, 0, 0, "bank4");
memory_set_bankptr(machine, "bank4", auto_alloc_array(machine, UINT8, 0x1000));
/* set up additional input ports */
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0d, 0x0d, 0, 0, "P2");
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0e, 0x0e, 0, 0, "P1");
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, "P3");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0d, 0x0d, 0, 0, "P2");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0e, 0x0e, 0, 0, "P1");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, "P3");
}
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index 3ee661454e8..5c18dc9df37 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -2165,7 +2165,7 @@ static DRIVER_INIT( cookrace )
btime_state *state = (btime_state *)machine->driver_data;
decrypt_C10707_cpu(machine, "maincpu");
- memory_install_read_bank_handler(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0200, 0x0fff, 0, 0, "bank10");
+ memory_install_read_bank(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0200, 0x0fff, 0, 0, "bank10");
memory_set_bankptr(machine, "bank10", memory_region(machine, "audiocpu") + 0xe200);
state->audio_nmi_enable_type = AUDIO_ENABLE_DIRECT;
}
@@ -2184,7 +2184,7 @@ static DRIVER_INIT( wtennis )
memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc15f, 0xc15f, 0, 0, wtennis_reset_hack_r);
- memory_install_read_bank_handler(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0200, 0x0fff, 0, 0, "bank10");
+ memory_install_read_bank(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0200, 0x0fff, 0, 0, "bank10");
memory_set_bankptr(machine, "bank10", memory_region(machine, "audiocpu") + 0xe200);
state->audio_nmi_enable_type = AUDIO_ENABLE_AY8910;
}
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index bc6a02c4659..3554696b931 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -800,11 +800,11 @@ static WRITE8_HANDLER( analog_select_w )
static DRIVER_INIT( bradley )
{
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x400, 0x7ff, 0, 0, "bank1");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x400, 0x7ff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x400));
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1808, 0x1808, 0, 0, "1808");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1809, 0x1809, 0, 0, "1809");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1808, 0x1808, 0, 0, "1808");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1809, 0x1809, 0, 0, "1809");
memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x180a, 0x180a, 0, 0, analog_data_r);
memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1848, 0x1850, 0, 0, analog_select_w);
}
diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c
index eb7078d951e..b40d8ede4ee 100644
--- a/src/mame/drivers/cham24.c
+++ b/src/mame/drivers/cham24.c
@@ -287,7 +287,7 @@ static MACHINE_START( cham24 )
memcpy(&dst[0xc000], &src[0x0f8000], 0x4000);
/* uses 8K swapping, all ROM!*/
- memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
+ memory_install_read_bank(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", memory_region(machine, "gfx1"));
/* need nametable ram, though. I doubt this uses more than 2k, but it starts up configured for 4 */
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index 89677f09398..a5ae79d4982 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -56,7 +56,7 @@ static WRITE8_HANDLER( chqflag_bankswitch_w )
/* bit 5 = memory bank select */
if (data & 0x20)
{
- memory_install_read_bank_handler(space, 0x1800, 0x1fff, 0, 0, "bank5");
+ memory_install_read_bank(space, 0x1800, 0x1fff, 0, 0, "bank5");
memory_install_write8_handler(space, 0x1800, 0x1fff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w);
memory_set_bankptr(space->machine, "bank5", space->machine->generic.paletteram.v);
@@ -67,8 +67,8 @@ static WRITE8_HANDLER( chqflag_bankswitch_w )
}
else
{
- memory_install_readwrite_bank_handler(space, 0x1000, 0x17ff, 0, 0, "bank1"); /* RAM */
- memory_install_readwrite_bank_handler(space, 0x1800, 0x1fff, 0, 0, "bank2"); /* RAM */
+ memory_install_readwrite_bank(space, 0x1000, 0x17ff, 0, 0, "bank1"); /* RAM */
+ memory_install_readwrite_bank(space, 0x1800, 0x1fff, 0, 0, "bank2"); /* RAM */
}
/* other bits unknown/unused */
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index f3b47b5a9f7..d98c3540f35 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -800,7 +800,7 @@ static DRIVER_INIT( combasct )
static DRIVER_INIT( combasc )
{
/* joystick instead of trackball */
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0404, 0x0404, 0, 0, "IN1");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0404, 0x0404, 0, 0, "IN1");
combasc_init_common(machine);
}
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index 775f4840e4c..0437e9f2994 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -344,12 +344,12 @@ static KONAMI_SETLINES_CALLBACK( crimfght_banking )
/* bit 5 = select work RAM or palette */
if (lines & 0x20)
{
- memory_install_read_bank_handler(cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank3");
+ memory_install_read_bank(cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank3");
memory_install_write8_handler(cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w);
memory_set_bankptr(device->machine, "bank3", device->machine->generic.paletteram.v);
}
else
- memory_install_readwrite_bank_handler(cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank1"); /* RAM */
+ memory_install_readwrite_bank(cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank1"); /* RAM */
/* bit 6 = enable char ROM reading through the video RAM */
K052109_set_RMRD_line((lines & 0x40) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c
index 10c0a76eeed..15444d9f3a7 100644
--- a/src/mame/drivers/cubocd32.c
+++ b/src/mame/drivers/cubocd32.c
@@ -351,7 +351,7 @@ static WRITE32_HANDLER( aga_overlay_w )
/* swap the write handlers between ROM and bank 1 based on the bit */
if ((data & 1) == 0)
/* overlay disabled, map RAM on 0x000000 */
- memory_install_write_bank_handler(space, 0x000000, 0x1fffff, 0, 0, "bank1");
+ memory_install_write_bank(space, 0x000000, 0x1fffff, 0, 0, "bank1");
else
/* overlay enabled, map Amiga system ROM on 0x000000 */
memory_unmap_write(space, 0x000000, 0x1fffff, 0, 0);
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index c08c6a0d989..0897a51002b 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -287,7 +287,7 @@ static WRITE8_HANDLER( darktowr_bankswitch_w )
if (newbank == 4 && oldbank != 4)
memory_install_readwrite8_handler(space, 0x4000, 0x7fff, 0, 0, darktowr_mcu_bank_r, darktowr_mcu_bank_w);
else if (newbank != 4 && oldbank == 4)
- memory_install_readwrite_bank_handler(space, 0x4000, 0x7fff, 0, 0, "bank1");
+ memory_install_readwrite_bank(space, 0x4000, 0x7fff, 0, 0, "bank1");
}
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index fc9e3de50f3..779bebdf296 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -1366,7 +1366,7 @@ static DRIVER_INIT( decocrom )
state->decrypted2[i] = swap_bits_5_6(rom[i]);
/* convert charram to a banked ROM */
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0xafff, 0, 0, "bank1");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0xafff, 0, 0, "bank1");
memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0xafff, 0, 0, decocass_de0091_w);
memory_configure_bank(machine, "bank1", 0, 1, state->charram, 0);
memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "user3"), 0);
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index b0da5f55119..288ad4e784b 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -2904,7 +2904,7 @@ static DRIVER_INIT( drakton )
{7,1,4,0,3,6,2,5},
};
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1" );
/* While the PAL supports up to 16 decryption methods, only four
are actually used in the PAL. Therefore, we'll take a little
@@ -2926,7 +2926,7 @@ static DRIVER_INIT( strtheat )
{6,3,4,1,0,7,2,5},
};
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1" );
/* While the PAL supports up to 16 decryption methods, only four
are actually used in the PAL. Therefore, we'll take a little
diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c
index e29495c779c..f9f46fe5cf2 100644
--- a/src/mame/drivers/exidy.c
+++ b/src/mame/drivers/exidy.c
@@ -1392,7 +1392,7 @@ static DRIVER_INIT( phantoma )
exidy_color_latch[0] = 0x09;
/* the ROM is actually mapped high */
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf800, 0xffff, 0, 0, "bank1");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf800, 0xffff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0xf800);
}
diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c
index 4d420e1cb16..7e0250704c0 100644
--- a/src/mame/drivers/exidy440.c
+++ b/src/mame/drivers/exidy440.c
@@ -312,7 +312,7 @@ void exidy440_bank_select(running_machine *machine, UINT8 bank)
if (bank == 0 && exidy440_bank != 0)
memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, showdown_bank0_r);
else if (bank != 0 && exidy440_bank == 0)
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank1");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank1");
}
/* select the bank and update the bank pointer */
@@ -1947,8 +1947,8 @@ static DRIVER_INIT( topsecex )
/* extra input ports and scrolling */
memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2ec5, 0x2ec5, 0, 0, topsecex_input_port_5_r);
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2ec6, 0x2ec6, 0, 0, "AN0");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2ec7, 0x2ec7, 0, 0, "IN4");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2ec6, 0x2ec6, 0, 0, "AN0");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2ec7, 0x2ec7, 0, 0, "IN4");
topsecex_yscroll = memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2ec1, 0x2ec1, 0, 0, topsecex_yscroll_w);
}
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index e302f406215..3a1d94483a2 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -2481,7 +2481,7 @@ static DRIVER_INIT( gmgalax )
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, gmgalax_extend_tile_info, gmgalax_extend_sprite_info);
/* ROM is banked */
- memory_install_read_bank_handler(space, 0x0000, 0x3fff, 0, 0, "bank1");
+ memory_install_read_bank(space, 0x0000, 0x3fff, 0, 0, "bank1");
memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000);
/* callback when the game select is toggled */
@@ -2522,7 +2522,7 @@ static DRIVER_INIT( frogg )
common_init(machine, galaxian_draw_bullet, frogger_draw_background, frogger_extend_tile_info, frogger_extend_sprite_info);
/* ...but needs a full 2k of RAM */
- memory_install_readwrite_bank_handler(space, 0x4000, 0x47ff, 0, 0, "bank1");
+ memory_install_readwrite_bank(space, 0x4000, 0x47ff, 0, 0, "bank1");
frogg_ram = auto_alloc_array(machine, UINT8, 0x800);
memory_set_bankptr(machine, "bank1", frogg_ram);
@@ -2695,14 +2695,14 @@ static DRIVER_INIT( zigzag )
common_init(machine, NULL, galaxian_draw_background, NULL, NULL);
/* make ROMs 2 & 3 swappable */
- memory_install_read_bank_handler(space, 0x2000, 0x2fff, 0, 0, "bank1");
- memory_install_read_bank_handler(space, 0x3000, 0x3fff, 0, 0, "bank2");
+ memory_install_read_bank(space, 0x2000, 0x2fff, 0, 0, "bank1");
+ memory_install_read_bank(space, 0x3000, 0x3fff, 0, 0, "bank2");
memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x2000, 0x1000);
memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "maincpu") + 0x2000, 0x1000);
/* also re-install the fixed ROM area as a bank in order to inform the memory system that
the fixed area only extends to 0x1fff */
- memory_install_read_bank_handler(space, 0x0000, 0x1fff, 0, 0, "bank3");
+ memory_install_read_bank(space, 0x0000, 0x1fff, 0, 0, "bank3");
memory_set_bankptr(machine, "bank3", memory_region(machine, "maincpu") + 0x0000);
/* handler for doing the swaps */
@@ -2810,11 +2810,11 @@ static DRIVER_INIT( skybase )
memory_install_write8_handler(space, 0xa002, 0xa002, 0, 0x7f8, galaxian_gfxbank_w);
/* needs a full 2k of RAM */
- memory_install_readwrite_bank_handler(space, 0x8000, 0x87ff, 0, 0, "bank1");
+ memory_install_readwrite_bank(space, 0x8000, 0x87ff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x800));
/* extend ROM */
- memory_install_read_bank_handler(space, 0x0000, 0x5fff, 0, 0, "bank2");
+ memory_install_read_bank(space, 0x0000, 0x5fff, 0, 0, "bank2");
memory_set_bankptr(machine, "bank2", memory_region(machine, "maincpu"));
}
@@ -2874,11 +2874,11 @@ static DRIVER_INIT( scorpnmc )
memory_install_write8_handler(space, 0xb001, 0xb001, 0, 0x7f8, irq_enable_w);
/* extra ROM */
- memory_install_read_bank_handler(space, 0x5000, 0x67ff, 0, 0, "bank1");
+ memory_install_read_bank(space, 0x5000, 0x67ff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x5000);
/* install RAM at $4000-$4800 */
- memory_install_readwrite_bank_handler(space, 0x4000, 0x47ff, 0, 0, "bank2");
+ memory_install_readwrite_bank(space, 0x4000, 0x47ff, 0, 0, "bank2");
memory_set_bankptr(machine, "bank2", auto_alloc_array(machine, UINT8, 0x800));
/* doesn't appear to use original RAM */
@@ -2924,10 +2924,10 @@ static DRIVER_INIT( explorer )
/* I/O appears to be direct, not via PPIs */
memory_unmap_readwrite(space, 0x8000, 0xffff, 0, 0);
- memory_install_read_port_handler(space, 0x8000, 0x8000, 0, 0xffc, "IN0");
- memory_install_read_port_handler(space, 0x8001, 0x8001, 0, 0xffc, "IN1");
- memory_install_read_port_handler(space, 0x8002, 0x8002, 0, 0xffc, "IN2");
- memory_install_read_port_handler(space, 0x8003, 0x8003, 0, 0xffc, "IN3");
+ memory_install_read_port(space, 0x8000, 0x8000, 0, 0xffc, "IN0");
+ memory_install_read_port(space, 0x8001, 0x8001, 0, 0xffc, "IN1");
+ memory_install_read_port(space, 0x8002, 0x8002, 0, 0xffc, "IN2");
+ memory_install_read_port(space, 0x8003, 0x8003, 0, 0xffc, "IN3");
memory_install_write8_handler(space, 0x8000, 0x8000, 0, 0xfff, soundlatch_w);
memory_install_write8_handler(space, 0x9000, 0x9000, 0, 0xfff, explorer_sound_control_w);
}
@@ -2940,7 +2940,7 @@ static DRIVER_INIT( sfx )
galaxian_sfx_tilemap = TRUE;
/* sound board has space for extra ROM */
- memory_install_read_bank_handler(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1");
+ memory_install_read_bank(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", memory_region(machine, "audiocpu"));
}
@@ -2998,7 +2998,7 @@ static DRIVER_INIT( froggrmc )
memory_install_write8_handler(space, 0xb001, 0xb001, 0, 0x7f8, froggrmc_sound_control_w);
/* actually needs 2k of RAM */
- memory_install_readwrite_bank_handler(space, 0x8000, 0x87ff, 0, 0, "bank1");
+ memory_install_readwrite_bank(space, 0x8000, 0x87ff, 0, 0, "bank1");
frogg_ram = auto_alloc_array(machine, UINT8, 0x800);
memory_set_bankptr(machine, "bank1", frogg_ram);
@@ -3046,7 +3046,7 @@ static DRIVER_INIT( scorpion )
memory_install_readwrite8_handler(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_IO), 0x00, 0xff, 0, 0, scorpion_ay8910_r, scorpion_ay8910_w);
/* extra ROM */
- memory_install_read_bank_handler(space, 0x5800, 0x67ff, 0, 0, "bank1");
+ memory_install_read_bank(space, 0x5800, 0x67ff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x5800);
/* no background related */
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index e82592855f8..e3ae705c10b 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -1020,10 +1020,10 @@ static WRITE8_HANDLER( youmab_84_w )
static DRIVER_INIT( youmab )
{
memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x82, 0x82, 0, 0, youmab_extra_bank_w); // banks rom at 0x8000? writes 0xff and 0x00 before executing code there
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x7fff, 0, 0, "bank3");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x7fff, 0, 0, "bank3");
memory_set_bankptr(machine, "bank3", memory_region(machine, "maincpu"));
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, "bank2");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, "bank2");
memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "user2"), 0x4000);
memory_set_bank(machine, "bank2", 0);
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index 80f73b1a257..7f5f4027421 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -2715,11 +2715,11 @@ static DRIVER_INIT( neckneck )
static DRIVER_INIT( rimrockn )
{
/* additional input ports */
- memory_install_read_port_handler (cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0161, 0x0161, 0, 0, "161");
- memory_install_read_port_handler (cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0162, 0x0162, 0, 0, "162");
- memory_install_read_port_handler (cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0163, 0x0163, 0, 0, "163");
- memory_install_read_port_handler (cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0164, 0x0164, 0, 0, "164");
- memory_install_read_port_handler (cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0165, 0x0165, 0, 0, "165");
+ memory_install_read_port (cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0161, 0x0161, 0, 0, "161");
+ memory_install_read_port (cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0162, 0x0162, 0, 0, "162");
+ memory_install_read_port (cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0163, 0x0163, 0, 0, "163");
+ memory_install_read_port (cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0164, 0x0164, 0, 0, "164");
+ memory_install_read_port (cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0165, 0x0165, 0, 0, "165");
/* different banking mechanism (disable the old one) */
memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x01a0, 0x01a0, 0, 0, rimrockn_bank_w);
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index 3f19ec13e24..7f33f9c3b2f 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -722,11 +722,11 @@ static DRIVER_INIT( kdeadeye )
{
intelflash_init( machine, 0, FLASH_SHARP_LH28F400, NULL );
- memory_install_read_port_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f680080, 0x1f680083, 0, 0, "GUNX1" );
- memory_install_read_port_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f680090, 0x1f680093, 0, 0, "GUNY1" );
- memory_install_read_port_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f6800a0, 0x1f6800a3, 0, 0, "GUNX2" );
- memory_install_read_port_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f6800b0, 0x1f6800b3, 0, 0, "GUNY2" );
- memory_install_read_port_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f6800c0, 0x1f6800c3, 0, 0, "BUTTONS" );
+ memory_install_read_port ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f680080, 0x1f680083, 0, 0, "GUNX1" );
+ memory_install_read_port ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f680090, 0x1f680093, 0, 0, "GUNY1" );
+ memory_install_read_port ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f6800a0, 0x1f6800a3, 0, 0, "GUNX2" );
+ memory_install_read_port ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f6800b0, 0x1f6800b3, 0, 0, "GUNY2" );
+ memory_install_read_port ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f6800c0, 0x1f6800c3, 0, 0, "BUTTONS" );
memory_install_write32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f6800e0, 0x1f6800e3, 0, 0, kdeadeye_0_w );
memory_install_readwrite32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f380000, 0x1f3fffff, 0, 0, btcflash_r, btcflash_w );
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index 127ed82f6b4..07a16f6afaa 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -1212,11 +1212,11 @@ static DRIVER_INIT( gyrodine )
static DRIVER_INIT( srdmissn )
{
/* shared RAM is mapped at 0xe000 as well */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xe000, 0xe7ff, 0, 0, "bank1");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xe000, 0xe7ff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", shared_ram);
/* extra RAM on sub CPU */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0x8800, 0x8fff, 0, 0, "bank2");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0x8800, 0x8fff, 0, 0, "bank2");
memory_set_bankptr(machine, "bank2", auto_alloc_array(machine, UINT8, 0x800));
}
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index 5990d723982..8e82daa82d3 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -2285,8 +2285,8 @@ static DRIVER_INIT( teamqb )
init_master_ports(machine, 0x40, 0x80);
/* set up additional input ports */
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7c, 0x7c, 0, 0, "IN4");
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN5");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7c, 0x7c, 0, 0, "IN4");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN5");
}
@@ -2315,8 +2315,8 @@ static DRIVER_INIT( aafb )
init_master_ports(machine, 0x00, 0xc0);
/* set up additional input ports */
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7c, 0x7c, 0, 0, "IN4");
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN5");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7c, 0x7c, 0, 0, "IN4");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN5");
}
@@ -2345,8 +2345,8 @@ static DRIVER_INIT( aafbb )
init_master_ports(machine, 0x80, 0x40);
/* set up additional input ports */
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7c, 0x7c, 0, 0, "IN4");
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN5");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7c, 0x7c, 0, 0, "IN4");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN5");
}
@@ -2375,8 +2375,8 @@ static DRIVER_INIT( aafbd2p )
init_master_ports(machine, 0x00, 0x40);
/* set up additional input ports */
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7c, 0x7c, 0, 0, "IN4");
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN5");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7c, 0x7c, 0, 0, "IN4");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN5");
}
@@ -2481,7 +2481,7 @@ static DRIVER_INIT( pigout )
init_master_ports(machine, 0x00, 0x40);
/* set up additional input ports */
- memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN4");
+ memory_install_read_port(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN4");
}
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index 2089a2a3ad5..6843a558d14 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -85,7 +85,7 @@ static WRITE8_HANDLER( deco16_bank_w )
if (deco16_bank)
memory_install_read8_handler(cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0x800f, 0, 0, deco16_io_r);
else
- memory_install_read_bank_handler(cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0x800f, 0, 0, "bank1");
+ memory_install_read_bank(cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0x800f, 0, 0, "bank1");
}
static UINT8 gfx_rom_readback;
@@ -1354,7 +1354,7 @@ static DRIVER_INIT( yellowcb )
{
DRIVER_INIT_CALL(prosport);
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa000, 0xa000, 0, 0, "IN0");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa000, 0xa000, 0, 0, "IN0");
}
static DRIVER_INIT( liberate )
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index 5b7ca38c995..8473404162f 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -328,7 +328,7 @@ INLINE DRIVER_INIT( m72_8751 )
const device_config *dac = devtag_get_device(machine, "dac");
protection_ram = auto_alloc_array(machine, UINT16, 0x10000/2);
- memory_install_read_bank_handler(program, 0xb0000, 0xbffff, 0, 0, "bank1");
+ memory_install_read_bank(program, 0xb0000, 0xbffff, 0, 0, "bank1");
memory_install_write16_handler(program, 0xb0000, 0xb0fff, 0, 0, m72_main_mcu_w);
memory_set_bankptr(machine, "bank1", protection_ram);
@@ -701,7 +701,7 @@ static void install_protection_handler(running_machine *machine, const UINT8 *co
protection_ram = auto_alloc_array(machine, UINT16, 0x1000/2);
protection_code = code;
protection_crc = crc;
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xb0000, 0xb0fff, 0, 0, "bank1");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xb0000, 0xb0fff, 0, 0, "bank1");
memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xb0ffa, 0xb0ffb, 0, 0, protection_r);
memory_install_write16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xb0000, 0xb0fff, 0, 0, protection_w);
memory_set_bankptr(machine, "bank1", protection_ram);
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 69cbdbeb17d..ce1e0e086fe 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -2533,13 +2533,13 @@ static WRITE16_HANDLER( _32x_68k_a15100_w )
if (data & 0x01)
{
_32x_adapter_enabled = 1;
- memory_install_readwrite_bank_handler(space, 0x0880000, 0x08fffff, 0, 0, "bank11"); // 'fixed' 512kb rom bank
+ memory_install_readwrite_bank(space, 0x0880000, 0x08fffff, 0, 0, "bank11"); // 'fixed' 512kb rom bank
memory_set_bankptr(space->machine, "bank11", memory_region(space->machine, "gamecart") );
- memory_install_readwrite_bank_handler(space, 0x0900000, 0x09fffff, 0, 0, "bank12"); // 'bankable' 1024kb rom bank
+ memory_install_readwrite_bank(space, 0x0900000, 0x09fffff, 0, 0, "bank12"); // 'bankable' 1024kb rom bank
memory_set_bankptr(space->machine, "bank12", memory_region(space->machine, "gamecart") );
- memory_install_readwrite_bank_handler(space, 0x0000000, 0x03fffff, 0, 0, "bank10");
+ memory_install_readwrite_bank(space, 0x0000000, 0x03fffff, 0, 0, "bank10");
memory_set_bankptr(space->machine, "bank10", memory_region(space->machine, "32x_68k_bios") );
memory_install_readwrite16_handler(space, 0x0a15180, 0x0a15181, 0, 0, _32x_68k_a15180_r, _32x_68k_a15180_w); // mode control regs
@@ -2562,7 +2562,7 @@ static WRITE16_HANDLER( _32x_68k_a15100_w )
{
_32x_adapter_enabled = 0;
- memory_install_readwrite_bank_handler(space, 0x0000000, 0x03fffff, 0, 0, "bank10");
+ memory_install_readwrite_bank(space, 0x0000000, 0x03fffff, 0, 0, "bank10");
memory_set_bankptr(space->machine, "bank10", memory_region(space->machine, "gamecart") );
@@ -3728,7 +3728,7 @@ static void svp_init(running_machine *machine)
/* SVP stuff */
svp.dram = auto_alloc_array(machine, UINT8, 0x20000);
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x300000, 0x31ffff, 0, 0, "bank2");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x300000, 0x31ffff, 0, 0, "bank2");
memory_set_bankptr(machine, "bank2", svp.dram );
memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa15000, 0xa150ff, 0, 0, svp_68k_io_r, svp_68k_io_w);
// "cell arrange" 1 and 2
@@ -6411,15 +6411,15 @@ void megatech_set_megadrive_z80_as_megadrive_z80(running_machine *machine, const
memory_install_readwrite8_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0xffff, 0, 0, z80_unmapped_r, z80_unmapped_w);
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", genz80.z80_prgram );
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank6");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank6");
memory_set_bankptr(machine, "bank6", genz80.z80_prgram );
// not allowed??
-// memory_install_readwrite_bank_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x2000, 0x3fff, 0, 0, "bank1");
+// memory_install_readwrite_bank(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x2000, 0x3fff, 0, 0, "bank1");
memory_install_readwrite8_device_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), ym, 0x4000, 0x4003, 0, 0, ym2612_r, ym2612_w);
memory_install_write8_handler (cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x6000, 0x6000, 0, 0, megadriv_z80_z80_bank_w);
@@ -6458,7 +6458,7 @@ DRIVER_INIT( _32x )
if (_32x_adapter_enabled == 0)
{
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000000, 0x03fffff, 0, 0, "bank10");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000000, 0x03fffff, 0, 0, "bank10");
memory_set_bankptr(machine, "bank10", memory_region(machine, "gamecart") );
};
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index 09d7af96415..7d12e7ebfbe 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -892,7 +892,7 @@ static DRIVER_INIT (megaplay)
memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa10000, 0xa1001f, 0, 0, megaplay_io_read, megaplay_io_write);
/* megaplay has ram shared with the bios cpu here */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "genesis_snd_z80", ADDRESS_SPACE_PROGRAM), 0x2000, 0x3fff, 0, 0, "bank7");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "genesis_snd_z80", ADDRESS_SPACE_PROGRAM), 0x2000, 0x3fff, 0, 0, "bank7");
memory_set_bankptr(machine, "bank7", &ic36_ram[0]);
/* instead of a RAM mirror the 68k sees the extra ram of the 2nd z80 too */
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index 84f8dcf6a16..60bae7e31ac 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -2077,8 +2077,8 @@ static DRIVER_INIT( mgakuen )
{
input_type = 1;
configure_banks(machine);
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x03, 0x03, 0, 0, "DSW1");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x04, 0x04, 0, 0, "DSW2");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x03, 0x03, 0, 0, "DSW1");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x04, 0x04, 0, 0, "DSW2");
}
static DRIVER_INIT( mgakuen2 )
{
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 0ef8eb313c4..eb07facbf9b 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -4922,7 +4922,7 @@ static DRIVER_INIT( model3_10 )
memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc0000000, 0xc00000ff, 0, 0, scsi_r, scsi_w );
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_r, mpc105_addr_w );
memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc105_data_r, mpc105_data_w );
@@ -4932,7 +4932,7 @@ static DRIVER_INIT( model3_10 )
static DRIVER_INIT( model3_15 )
{
interleave_vroms(machine);
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_r, mpc105_addr_w );
memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc105_data_r, mpc105_data_w );
@@ -4942,7 +4942,7 @@ static DRIVER_INIT( model3_15 )
static DRIVER_INIT( model3_20 )
{
interleave_vroms(machine);
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc2000000, 0xc20000ff, 0, 0, real3d_dma_r, real3d_dma_w );
@@ -5027,7 +5027,7 @@ static DRIVER_INIT( vs215 )
rom[(0x70e710^4)/4] = 0x60000000;
interleave_vroms(machine);
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
@@ -5046,7 +5046,7 @@ static DRIVER_INIT( vs29815 )
rom[(0x60290c^4)/4] = 0x60000000;
interleave_vroms(machine);
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
@@ -5065,7 +5065,7 @@ static DRIVER_INIT( bass )
rom[(0x7999c8^4)/4] = 0x60000000;
interleave_vroms(machine);
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
@@ -5079,7 +5079,7 @@ static DRIVER_INIT( bass )
static DRIVER_INIT( getbass )
{
interleave_vroms(machine);
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index ed2c738259d..145af313758 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -38,7 +38,7 @@ static WRITE8_DEVICE_HANDLER( mquake_cia_0_porta_w )
/* swap the write handlers between ROM and bank 1 based on the bit */
if ((data & 1) == 0)
/* overlay disabled, map RAM on 0x000000 */
- memory_install_write_bank_handler(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1");
+ memory_install_write_bank(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1");
else
/* overlay enabled, map Amiga system ROM on 0x000000 */
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index bbbf2a86fd1..17011fe5877 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -660,7 +660,7 @@ static MACHINE_START( multigam )
nt_page[3] = nt_ram + 0xc00;
memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, multigam_nt_r, multigam_nt_w);
- memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
+ memory_install_read_bank(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", memory_region(machine, "gfx1"));
}
@@ -674,14 +674,14 @@ static MACHINE_START( multigm3 )
memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, multigam_nt_r, multigam_nt_w);
- memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank2");
- memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0400, 0x07ff, 0, 0, "bank3");
- memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0800, 0x0bff, 0, 0, "bank4");
- memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0c00, 0x0fff, 0, 0, "bank5");
- memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1000, 0x13ff, 0, 0, "bank6");
- memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1400, 0x17ff, 0, 0, "bank7");
- memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1800, 0x1bff, 0, 0, "bank8");
- memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1c00, 0x1fff, 0, 0, "bank9");
+ memory_install_read_bank(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank2");
+ memory_install_read_bank(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0400, 0x07ff, 0, 0, "bank3");
+ memory_install_read_bank(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0800, 0x0bff, 0, 0, "bank4");
+ memory_install_read_bank(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0c00, 0x0fff, 0, 0, "bank5");
+ memory_install_read_bank(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1000, 0x13ff, 0, 0, "bank6");
+ memory_install_read_bank(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1400, 0x17ff, 0, 0, "bank7");
+ memory_install_read_bank(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1800, 0x1bff, 0, 0, "bank8");
+ memory_install_read_bank(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1c00, 0x1fff, 0, 0, "bank9");
set_videorom_bank(machine, 0, 8, 0, 8);
};
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index 8d3c2ac128f..031cde1b182 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -820,14 +820,14 @@ static DRIVER_INIT( namcos11 )
UINT32 len = memory_region_length( machine, "user2" );
UINT8 *rgn = memory_region( machine, "user2" );
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f0fffff, 0, 0, "bank1" );
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f100000, 0x1f1fffff, 0, 0, "bank2" );
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f200000, 0x1f2fffff, 0, 0, "bank3" );
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f300000, 0x1f3fffff, 0, 0, "bank4" );
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f4fffff, 0, 0, "bank5" );
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f500000, 0x1f5fffff, 0, 0, "bank6" );
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f600000, 0x1f6fffff, 0, 0, "bank7" );
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f700000, 0x1f7fffff, 0, 0, "bank8" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f0fffff, 0, 0, "bank1" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f100000, 0x1f1fffff, 0, 0, "bank2" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f200000, 0x1f2fffff, 0, 0, "bank3" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f300000, 0x1f3fffff, 0, 0, "bank4" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f4fffff, 0, 0, "bank5" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f500000, 0x1f5fffff, 0, 0, "bank6" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f600000, 0x1f6fffff, 0, 0, "bank7" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f700000, 0x1f7fffff, 0, 0, "bank8" );
for( bank = 0; bank < 8; bank++ )
{
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index f453ac6d374..1f7eaf82c58 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1260,7 +1260,7 @@ static MACHINE_RESET( namcos12 )
strcmp( machine->gamedrv->name, "ghlpanic" ) == 0 )
{
/* this is based on guesswork, it might not even be keycus. */
- memory_install_read_bank_handler (space, 0x1fc20280, 0x1fc2028b, 0, 0, "bank2" );
+ memory_install_read_bank (space, 0x1fc20280, 0x1fc2028b, 0, 0, "bank2" );
memory_install_write32_handler(space, 0x1f008000, 0x1f008003, 0, 0, kcon_w );
memory_install_write32_handler(space, 0x1f018000, 0x1f018003, 0, 0, kcoff_w );
diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c
index 37a9d0ee060..238dec456be 100644
--- a/src/mame/drivers/neodrvr.c
+++ b/src/mame/drivers/neodrvr.c
@@ -7684,7 +7684,7 @@ static DRIVER_INIT( kf2k3pcb )
neogeo_fixed_layer_bank_type = 2;
DRIVER_INIT_CALL(neogeo);
install_pvc_protection(machine);
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc7ffff, 0, 0, "bank6" ); // 512k bios
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc7ffff, 0, 0, "bank6" ); // 512k bios
}
static DRIVER_INIT( kof2003 )
@@ -7760,11 +7760,11 @@ static DRIVER_INIT( jockeygp )
extra_ram = auto_alloc_array(machine, UINT16, 0x2000/2);
state_save_register_global_pointer(machine, extra_ram, 0x2000 / 2);
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200000, 0x201fff, 0, 0, "bank8");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200000, 0x201fff, 0, 0, "bank8");
memory_set_bankptr(machine, NEOGEO_BANK_EXTRA_RAM, extra_ram);
-// memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x280000, 0x280001, 0, 0, "IN5");
-// memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2c0000, 0x2c0001, 0, 0, "IN6");
+// memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x280000, 0x280001, 0, 0, "IN5");
+// memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2c0000, 0x2c0001, 0, 0, "IN6");
DRIVER_INIT_CALL(neogeo);
}
@@ -7777,11 +7777,11 @@ static DRIVER_INIT( vliner )
extra_ram = auto_alloc_array(machine, UINT16, 0x2000/2);
state_save_register_global_pointer(machine, extra_ram, 0x2000 / 2);
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200000, 0x201fff, 0, 0, "bank8");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200000, 0x201fff, 0, 0, "bank8");
memory_set_bankptr(machine, NEOGEO_BANK_EXTRA_RAM, extra_ram);
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x280000, 0x280001, 0, 0, "IN5");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2c0000, 0x2c0001, 0, 0, "IN6");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x280000, 0x280001, 0, 0, "IN5");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2c0000, 0x2c0001, 0, 0, "IN6");
DRIVER_INIT_CALL(neogeo);
}
@@ -7789,7 +7789,7 @@ static DRIVER_INIT( vliner )
static DRIVER_INIT( kog )
{
/* overlay cartridge ROM */
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0ffffe, 0x0fffff, 0, 0, "JUMPER");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0ffffe, 0x0fffff, 0, 0, "JUMPER");
kog_px_decrypt(machine);
neogeo_bootleg_sx_decrypt(machine, 1);
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index 81239eeb4f9..37e2b541473 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -5724,7 +5724,7 @@ static READ8_HANDLER( cannonbp_protection_r )
static DRIVER_INIT( cannonbp )
{
/* extra memory */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4800, 0x4bff, 0, 0, "bank5");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4800, 0x4bff, 0, 0, "bank5");
memory_set_bankptr(machine, "bank5", auto_alloc_array(machine, UINT8, 0x400));
/* protection? */
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index f044cb76dd9..16554a45cbe 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -1058,7 +1058,7 @@ ROM_END
static DRIVER_INIT( condor )
{
/* additional inputs for coinage */
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x5000, 0, 0, "DSW1");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x5000, 0, 0, "DSW1");
}
diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c
index 664a12403be..536d93f569a 100644
--- a/src/mame/drivers/pingpong.c
+++ b/src/mame/drivers/pingpong.c
@@ -599,14 +599,14 @@ static DRIVER_INIT( cashquiz )
memory_install_write8_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x4001, 0x4001, 0, 0, cashquiz_question_bank_low_w);
// 8 independents banks for questions
- memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x50ff, 0, 0, "bank1");
- memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5100, 0x51ff, 0, 0, "bank2");
- memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5200, 0x52ff, 0, 0, "bank3");
- memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5300, 0x53ff, 0, 0, "bank4");
- memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5400, 0x54ff, 0, 0, "bank5");
- memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5500, 0x55ff, 0, 0, "bank6");
- memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5600, 0x56ff, 0, 0, "bank7");
- memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5700, 0x57ff, 0, 0, "bank8");
+ memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x50ff, 0, 0, "bank1");
+ memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5100, 0x51ff, 0, 0, "bank2");
+ memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5200, 0x52ff, 0, 0, "bank3");
+ memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5300, 0x53ff, 0, 0, "bank4");
+ memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5400, 0x54ff, 0, 0, "bank5");
+ memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5500, 0x55ff, 0, 0, "bank6");
+ memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5600, 0x56ff, 0, 0, "bank7");
+ memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5700, 0x57ff, 0, 0, "bank8");
// setup default banks
memory_set_bankptr(machine, "bank1", memory_region(machine, "user1") + 0x100*0 );
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index cc85299e819..1b2c2973019 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -848,7 +848,7 @@ static DRIVER_INIT( pipedrm )
/* sprite RAM lives at the end of palette RAM */
machine->generic.spriteram.u8 = &machine->generic.paletteram.u8[0xc00];
machine->generic.spriteram_size = 0x400;
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xcc00, 0xcfff, 0, 0, "bank3");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xcc00, 0xcfff, 0, 0, "bank3");
memory_set_bankptr(machine, "bank3", machine->generic.spriteram.v);
}
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 70df1c34d7e..693803c0ebb 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -2040,9 +2040,9 @@ static DRIVER_INIT( topracern )
polepos_gear_bit = 0x20;
/* extra direct mapped inputs read */
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x02, 0x02, 0, 0, "STEER");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x03, 0x03, 0, 0, "IN0");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x04, 0x04, 0, 0, "DSWA");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x02, 0x02, 0, 0, "STEER");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x03, 0x03, 0, 0, "IN0");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x04, 0x04, 0, 0, "DSWA");
}
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index c51237bd282..7a610f732f9 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -377,11 +377,11 @@ static void init_ports_systeme(running_machine *machine)
memory_install_readwrite8_handler(io, 0xbe, 0xbe, 0, 0, sms_vdp_2_data_r, sms_vdp_2_data_w);
memory_install_readwrite8_handler(io, 0xbf, 0xbf, 0, 0, sms_vdp_2_ctrl_r, sms_vdp_2_ctrl_w);
- memory_install_read_port_handler (io, 0xe0, 0xe0, 0, 0, "e0");
- memory_install_read_port_handler (io, 0xe1, 0xe1, 0, 0, "e1");
- memory_install_read_port_handler (io, 0xe2, 0xe2, 0, 0, "e2");
- memory_install_read_port_handler (io, 0xf2, 0xf2, 0, 0, "f2");
- memory_install_read_port_handler (io, 0xf3, 0xf3, 0, 0, "f3");
+ memory_install_read_port (io, 0xe0, 0xe0, 0, 0, "e0");
+ memory_install_read_port (io, 0xe1, 0xe1, 0, 0, "e1");
+ memory_install_read_port (io, 0xe2, 0xe2, 0, 0, "e2");
+ memory_install_read_port (io, 0xf2, 0xf2, 0, 0, "f2");
+ memory_install_read_port (io, 0xf3, 0xf3, 0, 0, "f3");
memory_install_write8_handler (io, 0xf7, 0xf7, 0, 0, systeme_bank_w );
}
@@ -397,7 +397,7 @@ static void init_systeme_map(running_machine *machine)
/* main ram area */
sms_mainram = auto_alloc_array(machine, UINT8, 0x4000);
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc000, 0xffff, 0, 0, "bank2");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc000, 0xffff, 0, 0, "bank2");
memory_set_bankptr(machine, "bank2", sms_mainram );
memset(sms_mainram,0x00,0x4000);
diff --git a/src/mame/drivers/segamsys.c b/src/mame/drivers/segamsys.c
index d33347fada0..6d302769bcb 100644
--- a/src/mame/drivers/segamsys.c
+++ b/src/mame/drivers/segamsys.c
@@ -1601,7 +1601,7 @@ static WRITE8_HANDLER( mt_sms_standard_rom_bank_w )
}
else
{
- memory_install_read_bank_handler(space, 0x0000, 0xbfff, 0, 0, "bank5");
+ memory_install_read_bank(space, 0x0000, 0xbfff, 0, 0, "bank5");
memory_unmap_write(space, 0x0000, 0xbfff, 0, 0);
}
@@ -1670,9 +1670,9 @@ void megatech_set_genz80_as_sms_standard_map(running_machine *machine, const cha
/* main ram area */
sms_mainram = auto_alloc_array(machine, UINT8, 0x2000); // 8kb of main ram
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0xc000, 0xdfff, 0, 0, "bank6");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0xc000, 0xdfff, 0, 0, "bank6");
memory_set_bankptr(machine, "bank6", sms_mainram );
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0xe000, 0xffff, 0, 0, "bank7");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0xe000, 0xffff, 0, 0, "bank7");
memory_set_bankptr(machine, "bank7", sms_mainram );
memset(sms_mainram,0x00,0x2000);
@@ -1682,7 +1682,7 @@ void megatech_set_genz80_as_sms_standard_map(running_machine *machine, const cha
{
/* fixed rom bank area */
sms_rom = auto_alloc_array(machine, UINT8, 0x400000);
- memory_install_read_bank_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, "bank5");
+ memory_install_read_bank(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, "bank5");
memory_unmap_write(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0);
memory_set_bankptr(machine, "bank5", sms_rom );
@@ -1696,7 +1696,7 @@ void megatech_set_genz80_as_sms_standard_map(running_machine *machine, const cha
{
/* fixed rom bank area */
sms_rom = auto_alloc_array(machine, UINT8, 0xc000);
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, "bank5");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, "bank5");
memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0);
memory_set_bankptr(machine, "bank5", sms_rom );
diff --git a/src/mame/drivers/ssf2md.c b/src/mame/drivers/ssf2md.c
index f9c5acaf397..abe24962ac1 100644
--- a/src/mame/drivers/ssf2md.c
+++ b/src/mame/drivers/ssf2md.c
@@ -19,7 +19,7 @@ static READ16_HANDLER( ssf2ghw_dsw_r )
static DRIVER_INIT( ssf2ghw )
{
memory_nop_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xA130F0, 0xA130FF, 0, 0); // custom banking is disabled (!)
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x400000, 0x5fffff, 0, 0, "bank5");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x400000, 0x5fffff, 0, 0, "bank5");
memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x400000, 0x5fffff, 0, 0);
memory_set_bankptr(machine, "bank5", memory_region( machine, "maincpu" ) + 0x400000 );
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index 48297c20012..301a727aa7b 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -536,7 +536,7 @@ static DRIVER_INIT( esb )
memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0x9fff, 0, 0, esb_slapstic_r, esb_slapstic_w);
/* install additional banking */
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa000, 0xffff, 0, 0, "bank2");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa000, 0xffff, 0, 0, "bank2");
/* prepare the matrix processor */
starwars_is_esb = 1;
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index e856c6997b0..dabd8549122 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -4671,10 +4671,10 @@ static DRIVER_INIT( choplift )
static DRIVER_INIT( shtngmst )
{
const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
- memory_install_read_port_handler(iospace, 0x12, 0x12, 0x00, 0x00, "TRIGGER");
- memory_install_read_port_handler(iospace, 0x18, 0x18, 0x00, 0x03, "18");
- memory_install_read_port_handler(iospace, 0x1c, 0x1c, 0x00, 0x02, "GUNX");
- memory_install_read_port_handler(iospace, 0x1d, 0x1d, 0x00, 0x02, "GUNY");
+ memory_install_read_port(iospace, 0x12, 0x12, 0x00, 0x00, "TRIGGER");
+ memory_install_read_port(iospace, 0x18, 0x18, 0x00, 0x03, "18");
+ memory_install_read_port(iospace, 0x1c, 0x1c, 0x00, 0x02, "GUNX");
+ memory_install_read_port(iospace, 0x1d, 0x1d, 0x00, 0x02, "GUNY");
DRIVER_INIT_CALL(bank0c);
}
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 57bf67d5a96..19ceeeb357a 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -406,7 +406,7 @@ static DRIVER_INIT( fixeight )
if (fixeight_sec_cpu_mem)
{
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x28f002, 0x28fbff, 0, 0, "bank2" );
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x28f002, 0x28fbff, 0, 0, "bank2" );
memory_set_bankptr(machine, "bank2", fixeight_sec_cpu_mem);
}
@@ -936,11 +936,11 @@ static WRITE16_HANDLER( fixeight_sec_cpu_w )
/* game keeping service mode. It writes/reads the settings to/from */
/* these shared RAM locations. The secondary CPU reads/writes them */
/* from/to nvram to store the settings (a 93C45 EEPROM) */
- //memory_install_readwrite_bank_handler(space, 0x28f002, 0x28fbff, 0, 0, "bank2");
+ //memory_install_readwrite_bank(space, 0x28f002, 0x28fbff, 0, 0, "bank2");
//memory_set_bankptr(space->machine, "bank2", fixeight_sec_cpu_mem);
- memory_install_read_port_handler(space, 0x28f004, 0x28f005, 0, 0, "DSWA"); /* Dip Switch A - Wrong !!! */
- memory_install_read_port_handler(space, 0x28f006, 0x28f007, 0, 0, "DSWB"); /* Dip Switch B - Wrong !!! */
- memory_install_read_port_handler(space, 0x28f008, 0x28f009, 0, 0, "JMPR"); /* Territory Jumper block - Wrong !!! */
+ memory_install_read_port(space, 0x28f004, 0x28f005, 0, 0, "DSWA"); /* Dip Switch A - Wrong !!! */
+ memory_install_read_port(space, 0x28f006, 0x28f007, 0, 0, "DSWB"); /* Dip Switch B - Wrong !!! */
+ memory_install_read_port(space, 0x28f008, 0x28f009, 0, 0, "JMPR"); /* Territory Jumper block - Wrong !!! */
mcu_data = data;
}
diff --git a/src/mame/drivers/topshoot.c b/src/mame/drivers/topshoot.c
index 5633ca674ce..236d260559c 100644
--- a/src/mame/drivers/topshoot.c
+++ b/src/mame/drivers/topshoot.c
@@ -157,10 +157,10 @@ static READ16_HANDLER(topshoot_200051_r)
static DRIVER_INIT(topshoot)
{
memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200050, 0x200051, 0, 0, topshoot_200051_r );
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200042, 0x200043, 0, 0, "IN0");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200044, 0x200045, 0, 0, "IN1");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200046, 0x200047, 0, 0, "IN2");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200048, 0x200049, 0, 0, "IN3");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200042, 0x200043, 0, 0, "IN0");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200044, 0x200045, 0, 0, "IN1");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200046, 0x200047, 0, 0, "IN2");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200048, 0x200049, 0, 0, "IN3");
DRIVER_INIT_CALL(megadriv);
}
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index 045ee419dc2..d888d330fde 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -1193,10 +1193,10 @@ static DRIVER_INIT( atlantol )
memory_nop_write(space, 0x1000, 0x1000, 0, 0);
/* unmapped areas read as ROM */
- memory_install_read_bank_handler(space, 0x0000, 0x11ff, 0, 0, "bank10");
- memory_install_read_bank_handler(space, 0x1380, 0x17ff, 0, 0, "bank11");
- memory_install_read_bank_handler(space, 0x2000, 0x27ff, 0, 0, "bank12");
- memory_install_read_bank_handler(space, 0x4000, 0x5fff, 0, 0, "bank13");
+ memory_install_read_bank(space, 0x0000, 0x11ff, 0, 0, "bank10");
+ memory_install_read_bank(space, 0x1380, 0x17ff, 0, 0, "bank11");
+ memory_install_read_bank(space, 0x2000, 0x27ff, 0, 0, "bank12");
+ memory_install_read_bank(space, 0x4000, 0x5fff, 0, 0, "bank13");
memory_set_bankptr(machine, "bank10", &rom[0x0000]);
memory_set_bankptr(machine, "bank11", &rom[0x1380]);
memory_set_bankptr(machine, "bank12", &rom[0x2000]);
diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c
index 3a254374f5a..b13100dc900 100644
--- a/src/mame/drivers/upscope.c
+++ b/src/mame/drivers/upscope.c
@@ -89,7 +89,7 @@ static WRITE8_DEVICE_HANDLER( upscope_cia_0_porta_w )
/* swap the write handlers between ROM and bank 1 based on the bit */
if ((data & 1) == 0)
/* overlay disabled, map RAM on 0x000000 */
- memory_install_write_bank_handler(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1");
+ memory_install_write_bank(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1");
else
/* overlay enabled, map Amiga system ROM on 0x000000 */
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index bb26c2c9d9a..75c4915c4ba 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -209,7 +209,7 @@ static void vendetta_video_banking( running_machine *machine, int select )
{
if ( select & 1 )
{
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), video_banking_base + 0x2000, video_banking_base + 0x2fff, 0, 0, "bank4" );
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), video_banking_base + 0x2000, video_banking_base + 0x2fff, 0, 0, "bank4" );
memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), video_banking_base + 0x2000, video_banking_base + 0x2fff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w );
memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), video_banking_base + 0x0000, video_banking_base + 0x0fff, 0, 0, K053247_r, K053247_w );
memory_set_bankptr(machine, "bank4", machine->generic.paletteram.v);
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 59f0c3add37..9b78a9aea45 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -146,7 +146,7 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw )
if (data)
{
- memory_install_read_bank_handler(mainspace, 0x8000, 0xffff, 0, 0, "bank1");
+ memory_install_read_bank(mainspace, 0x8000, 0xffff, 0, 0, "bank1");
switch (data)
{
case 2: bankaddress = 0x10000; break;
@@ -163,9 +163,9 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw )
else
{
memory_install_read8_handler(mainspace, 0x8000, 0x8fff, 0, 0, wardner_sprite_r);
- memory_install_read_bank_handler(mainspace, 0xa000, 0xadff, 0, 0, "bank4");
- memory_install_read_bank_handler(mainspace, 0xae00, 0xafff, 0, 0, "bank2");
- memory_install_read_bank_handler(mainspace, 0xc000, 0xc7ff, 0, 0, "bank3");
+ memory_install_read_bank(mainspace, 0xa000, 0xadff, 0, 0, "bank4");
+ memory_install_read_bank(mainspace, 0xae00, 0xafff, 0, 0, "bank2");
+ memory_install_read_bank(mainspace, 0xc000, 0xc7ff, 0, 0, "bank3");
memory_set_bankptr(space->machine, "bank1", &RAM[0x0000]);
memory_set_bankptr(space->machine, "bank2", rambase_ae00);
memory_set_bankptr(space->machine, "bank3", rambase_c000);
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index 481509a6dd1..6c1dd998324 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -527,10 +527,10 @@ void defender_install_io_space(const address_space *space)
const device_config *pia_1 = devtag_get_device(space->machine, "pia_1");
/* this routine dynamically installs the memory mapped above from c000-cfff */
- memory_install_write_bank_handler (space, 0xc000, 0xc00f, 0, 0x03e0, "bank4");
+ memory_install_write_bank (space, 0xc000, 0xc00f, 0, 0x03e0, "bank4");
memory_install_write8_handler (space, 0xc010, 0xc01f, 0, 0x03e0, defender_video_control_w);
memory_install_write8_handler (space, 0xc3ff, 0xc3ff, 0, 0, williams_watchdog_reset_w);
- memory_install_read_bank_handler(space, 0xc400, 0xc4ff, 0, 0x0300, "bank3");
+ memory_install_read_bank(space, 0xc400, 0xc4ff, 0, 0x0300, "bank3");
memory_install_write8_handler(space, 0xc400, 0xc4ff, 0, 0x0300, williams_cmos_w);
memory_install_read8_handler (space, 0xc800, 0xcbff, 0, 0x03e0, williams_video_counter_r);
memory_install_readwrite8_device_handler(space, pia_1, 0xcc00, 0xcc03, 0, 0x03e0, pia6821_r, pia6821_w);
@@ -2802,10 +2802,10 @@ static DRIVER_INIT( spdball )
memory_install_readwrite8_device_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), pia_3, 0xc808, 0xc80b, 0, 0, pia6821_r, pia6821_w);
/* install extra input handlers */
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc800, 0xc800, 0, 0, "AN0");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc801, 0xc801, 0, 0, "AN1");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc802, 0xc802, 0, 0, "AN2");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc803, 0xc803, 0, 0, "AN3");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc800, 0xc800, 0, 0, "AN0");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc801, 0xc801, 0, 0, "AN1");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc802, 0xc802, 0, 0, "AN2");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc803, 0xc803, 0, 0, "AN3");
}
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index 5012b19d932..b9f18ec2985 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -1512,9 +1512,9 @@ static DRIVER_INIT( razmataz )
nprinces_decode(machine, "maincpu");
/* additional input ports are wired */
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc004, 0xc004, 0, 0x18f3, "SW04");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc008, 0xc008, 0, 0x18f3, "SW08");
- memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc00c, 0xc00c, 0, 0x18f3, "SW0C");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc004, 0xc004, 0, 0x18f3, "SW04");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc008, 0xc008, 0, 0x18f3, "SW08");
+ memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc00c, 0xc00c, 0, 0x18f3, "SW0C");
/* unknown behavior expected here */
memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc80a, 0xc80a, 0, 0, razmataz_counter_r);
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index fe092212479..99e58fcc110 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -669,12 +669,12 @@ static WRITE32_HANDLER( zn_qsound_w )
static DRIVER_INIT( coh1000c )
{
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" ); /* fixed game rom */
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" ); /* banked game rom */
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" ); /* fixed game rom */
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" ); /* banked game rom */
memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, bank_coh1000c_w ); /* bankswitch */
memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb40010, 0x1fb40013, 0, 0, capcom_kickharness_r );
memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb40020, 0x1fb40023, 0, 0, capcom_kickharness_r );
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fbfffff, 0, 0, "bank3" ); /* country rom */
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fbfffff, 0, 0, "bank3" ); /* country rom */
memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb60000, 0x1fb60003, 0, 0, zn_qsound_w );
zn_driver_init(machine);
@@ -888,12 +888,12 @@ static WRITE32_HANDLER( bank_coh3002c_w )
static DRIVER_INIT( coh3002c )
{
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" ); /* fixed game rom */
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" ); /* banked game rom */
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" ); /* fixed game rom */
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" ); /* banked game rom */
memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb40010, 0x1fb40013, 0, 0, capcom_kickharness_r );
memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb40020, 0x1fb40023, 0, 0, capcom_kickharness_r );
memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, bank_coh3002c_w ); /* bankswitch */
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fbfffff, 0, 0, "bank3" ); /* country rom */
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fbfffff, 0, 0, "bank3" ); /* country rom */
memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb60000, 0x1fb60003, 0, 0, zn_qsound_w );
zn_driver_init(machine);
@@ -1179,10 +1179,10 @@ static DRIVER_INIT( coh1000ta )
{
taitofx1_eeprom_size1 = 0x200; taitofx1_eeprom1 = auto_alloc_array(machine, UINT8, taitofx1_eeprom_size1 );
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked game rom */
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked game rom */
memory_install_write32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb40000, 0x1fb40003, 0, 0, bank_coh1000t_w ); /* bankswitch */
memory_install_readwrite32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fb80003, 0, 0, taitofx1a_ymsound_r, taitofx1a_ymsound_w );
- memory_install_readwrite_bank_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, "bank2" );
+ memory_install_readwrite_bank( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, "bank2" );
zn_driver_init(machine);
}
@@ -1274,13 +1274,13 @@ static DRIVER_INIT( coh1000tb )
taitofx1_eeprom_size1 = 0x400; taitofx1_eeprom1 = auto_alloc_array(machine, UINT8, taitofx1_eeprom_size1 );
taitofx1_eeprom_size2 = 0x200; taitofx1_eeprom2 = auto_alloc_array(machine, UINT8, taitofx1_eeprom_size2 );
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked game rom */
- memory_install_readwrite_bank_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, "bank2" );
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked game rom */
+ memory_install_readwrite_bank( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, "bank2" );
memory_install_write32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb40000, 0x1fb40003, 0, 0, bank_coh1000t_w ); /* bankswitch */
memory_install_write32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fb80003, 0, 0, taitofx1b_volume_w );
memory_install_write32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fba0000, 0x1fba0003, 0, 0, taitofx1b_sound_w );
memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbc0000, 0x1fbc0003, 0, 0, taitofx1b_sound_r );
- memory_install_readwrite_bank_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size2 - 1 ), 0, 0, "bank3" );
+ memory_install_readwrite_bank( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size2 - 1 ), 0, 0, "bank3" );
zn_driver_init(machine);
}
@@ -1477,7 +1477,7 @@ static DRIVER_INIT( coh1000w )
{
const device_config *ide = devtag_get_device(machine, "ide");
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f1fffff, 0, 0, "bank1" );
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f1fffff, 0, 0, "bank1" );
memory_nop_write ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f000003, 0, 0 );
memory_install_readwrite32_device_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), ide, 0x1f7e4000, 0x1f7e4fff, 0, 0, ide_controller32_r, ide_controller32_w );
memory_nop_readwrite ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f7e8000, 0x1f7e8003, 0, 0 );
@@ -1668,7 +1668,7 @@ static WRITE32_HANDLER( coh1002e_latch_w )
static DRIVER_INIT( coh1002e )
{
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" );
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" );
memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fa10300, 0x1fa10303, 0, 0, coh1002e_bank_w );
memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00007, 0, 0, coh1002e_latch_w );
@@ -1810,8 +1810,8 @@ static READ32_HANDLER( bam2_unk_r )
static DRIVER_INIT( bam2 )
{
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" );
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" );
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" );
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" );
memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00007, 0, 0, bam2_mcu_r );
memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fa20000, 0x1fa20003, 0, 0, bam2_unk_r );
memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fa10300, 0x1fa10303, 0, 0, bam2_sec_w );
@@ -2130,7 +2130,7 @@ static READ32_HANDLER( nbajamex_80_r )
static DRIVER_INIT( coh1000a )
{
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f1fffff, 0, 0, "bank1" );
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f1fffff, 0, 0, "bank1" );
memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbfff00, 0x1fbfff03, 0, 0, acpsx_00_w );
memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbfff10, 0x1fbfff13, 0, 0, acpsx_10_w );
@@ -2138,7 +2138,7 @@ static DRIVER_INIT( coh1000a )
{
nbajamex_eeprom_size = 0x8000; nbajamex_eeprom = auto_alloc_array(machine, UINT8, nbajamex_eeprom_size );
- memory_install_readwrite_bank_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f200000, 0x1f200000 + ( nbajamex_eeprom_size - 1 ), 0, 0, "bank2" );
+ memory_install_readwrite_bank( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f200000, 0x1f200000 + ( nbajamex_eeprom_size - 1 ), 0, 0, "bank2" );
memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbfff08, 0x1fbfff0b, 0, 0, nbajamex_08_r );
memory_install_readwrite32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbfff80, 0x1fbfff83, 0, 0, nbajamex_80_r, nbajamex_80_w );
@@ -2309,7 +2309,7 @@ static WRITE32_HANDLER( coh1001l_bnk_w )
static DRIVER_INIT( coh1001l )
{
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked rom */
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked rom */
memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, coh1001l_bnk_w );
zn_driver_init(machine);
@@ -2352,8 +2352,8 @@ static WRITE32_HANDLER( coh1002v_bnk_w )
static DRIVER_INIT( coh1002v )
{
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f27ffff, 0, 0, "bank1" );
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fbfffff, 0, 0, "bank2" );
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f27ffff, 0, 0, "bank1" );
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fbfffff, 0, 0, "bank2" );
memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, coh1002v_bnk_w );
zn_driver_init(machine);
@@ -2555,7 +2555,7 @@ static WRITE32_HANDLER( cbaj_z80_w )
static DRIVER_INIT( coh1002m )
{
- memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" );
+ memory_install_read_bank ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" );
memory_install_readwrite32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, cbaj_z80_r, cbaj_z80_w );
memory_install_write32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00004, 0x1fb00007, 0, 0, coh1002m_bank_w );
diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c
index 5f70708e07a..547434a24f6 100644
--- a/src/mame/machine/atari.c
+++ b/src/mame/machine/atari.c
@@ -110,7 +110,7 @@ void a600xl_mmu(running_machine *machine, UINT8 new_mmu)
else
{
logerror("%s MMU SELFTEST ROM\n", machine->gamedrv->name);
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x57ff, 0, 0, "bank2");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x57ff, 0, 0, "bank2");
memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x57ff, 0, 0);
memory_set_bankptr(machine, "bank2", memory_region(machine, "maincpu") + 0x5000);
}
diff --git a/src/mame/machine/beezer.c b/src/mame/machine/beezer.c
index 547bb049e4e..30c306e93fb 100644
--- a/src/mame/machine/beezer.c
+++ b/src/mame/machine/beezer.c
@@ -117,7 +117,7 @@ WRITE8_HANDLER( beezer_bankswitch_w )
else
{
UINT8 *rom = memory_region(space->machine, "maincpu") + 0x10000;
- memory_install_readwrite_bank_handler(space, 0xc000, 0xcfff, 0, 0, "bank1");
+ memory_install_readwrite_bank(space, 0xc000, 0xcfff, 0, 0, "bank1");
memory_set_bankptr(space->machine, "bank1", rom + (data & 0x07) * 0x2000 + ((data & 0x08) ? 0x1000: 0));
}
}
diff --git a/src/mame/machine/midtunit.c b/src/mame/machine/midtunit.c
index 78ff269bd2b..b2e32a0b24c 100644
--- a/src/mame/machine/midtunit.c
+++ b/src/mame/machine/midtunit.c
@@ -465,7 +465,7 @@ DRIVER_INIT( mktunit )
memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1b00000, 0x1b6ffff, 0, 0, mk_prot_r, mk_prot_w);
/* sound chip protection (hidden RAM) */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfb9c, 0xfbc6, 0, 0, "bank9");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfb9c, 0xfbc6, 0, 0, "bank9");
memory_set_bankptr(machine, "bank9", auto_alloc_array(machine, UINT8, 0x80));
}
@@ -498,9 +498,9 @@ static void init_nbajam_common(running_machine *machine, int te_protection)
/* sound chip protection (hidden RAM) */
if (!te_protection)
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbaa, 0xfbd4, 0, 0, "bank9");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbaa, 0xfbd4, 0, 0, "bank9");
else
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbec, 0xfc16, 0, 0, "bank9");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbec, 0xfc16, 0, 0, "bank9");
memory_set_bankptr(machine, "bank9", auto_alloc_array(machine, UINT8, 0x80));
}
@@ -526,8 +526,8 @@ DRIVER_INIT( jdreddp )
memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1b00000, 0x1bfffff, 0, 0, jdredd_prot_r, jdredd_prot_w);
/* sound chip protection (hidden RAM) */
- memory_install_read_bank_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbcf, 0xfbf9, 0, 0, "bank7");
- memory_install_write_bank_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbcf, 0xfbf9, 0, 0, "bank9");
+ memory_install_read_bank(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbcf, 0xfbf9, 0, 0, "bank7");
+ memory_install_write_bank(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbcf, 0xfbf9, 0, 0, "bank9");
memory_set_bankptr(machine, "bank9", auto_alloc_array(machine, UINT8, 0x80));
#if ENABLE_ALL_JDREDD_LEVELS
diff --git a/src/mame/machine/midyunit.c b/src/mame/machine/midyunit.c
index c88d3cd9187..5e4f3d62eea 100644
--- a/src/mame/machine/midyunit.c
+++ b/src/mame/machine/midyunit.c
@@ -298,19 +298,19 @@ static void init_generic(running_machine *machine, int bpp, int sound, int prot_
case SOUND_CVSD:
williams_cvsd_init(machine);
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cvsdcpu", ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, "bank9");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "cvsdcpu", ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, "bank9");
memory_set_bankptr(machine, "bank9", auto_alloc_array(machine, UINT8, 0x80));
break;
case SOUND_ADPCM:
williams_adpcm_init(machine);
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, "bank9");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, "bank9");
memory_set_bankptr(machine, "bank9", auto_alloc_array(machine, UINT8, 0x80));
break;
case SOUND_NARC:
williams_narc_init(machine);
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "narc1cpu", ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, "bank9");
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "narc1cpu", ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, "bank9");
memory_set_bankptr(machine, "bank9", auto_alloc_array(machine, UINT8, 0x80));
break;
diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c
index 559871a4fb7..d70a981d153 100644
--- a/src/mame/machine/namcos1.c
+++ b/src/mame/machine/namcos1.c
@@ -681,7 +681,7 @@ static void set_bank(running_machine *machine, int banknum, const bankhandler *h
if (!handler->bank_handler_r)
{
if (namcos1_active_bank[banknum].bank_handler_r)
- memory_install_read_bank_handler(space, bankstart, bankstart + 0x1fff, 0, 0, banktags[banknum]);
+ memory_install_read_bank(space, bankstart, bankstart + 0x1fff, 0, 0, banktags[banknum]);
}
else
{
@@ -695,7 +695,7 @@ static void set_bank(running_machine *machine, int banknum, const bankhandler *h
if (!handler->bank_handler_w)
{
if (namcos1_active_bank[banknum].bank_handler_w)
- memory_install_write_bank_handler(space, bankstart, bankstart + 0x1fff, 0, 0, banktags[banknum]);
+ memory_install_write_bank(space, bankstart, bankstart + 0x1fff, 0, 0, banktags[banknum]);
}
else
{
diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c
index 1316bce18dd..0375c7f8d1a 100644
--- a/src/mame/machine/playch10.c
+++ b/src/mame/machine/playch10.c
@@ -708,7 +708,7 @@ DRIVER_INIT( pcdboard )
DRIVER_INIT( pcdboard_2 )
{
/* extra ram at $6000-$7fff */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000));
/* common init */
@@ -811,7 +811,7 @@ DRIVER_INIT( pceboard )
ppu_latch = mapper9_latch;
/* nvram at $6000-$6fff */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x6fff, 0, 0, "bank1" );
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x6fff, 0, 0, "bank1" );
memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x1000));
/* common init */
@@ -846,7 +846,7 @@ DRIVER_INIT( pcfboard )
DRIVER_INIT( pcfboard_2 )
{
/* extra ram at $6000-$6fff */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x6fff, 0, 0, "bank1" );
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x6fff, 0, 0, "bank1" );
memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x1000));
vram = NULL;
@@ -1026,7 +1026,7 @@ DRIVER_INIT( pcgboard )
memory_install_write8_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, gboard_rom_switch_w );
/* extra ram at $6000-$7fff */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000));
gboard_banks[0] = 0x1e;
@@ -1144,7 +1144,7 @@ DRIVER_INIT( pchboard )
memory_install_write8_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, hboard_rom_switch_w );
/* extra ram at $6000-$7fff */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000));
gboard_banks[0] = 0x1e;
@@ -1172,7 +1172,7 @@ DRIVER_INIT( pckboard )
mmc1_rom_mask = 0x0f;
/* extra ram at $6000-$7fff */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000));
/* Roms are banked at $8000 to $bfff */
diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c
index 2dfead12578..f984370d3e0 100644
--- a/src/mame/machine/scramble.c
+++ b/src/mame/machine/scramble.c
@@ -242,7 +242,7 @@ DRIVER_INIT( ckongs )
DRIVER_INIT( mariner )
{
/* extra ROM */
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5800, 0x67ff, 0, 0, "bank1");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5800, 0x67ff, 0, 0, "bank1");
memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5800, 0x67ff, 0, 0);
memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x5800);
@@ -328,7 +328,7 @@ DRIVER_INIT( cavelon )
UINT8 *ROM = memory_region(machine, "maincpu");
/* banked ROM */
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1");
memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x00000], 0x10000);
cavelon_banksw(machine);
diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c
index 0d967c87bde..cc2a90ece08 100644
--- a/src/mame/machine/segaic16.c
+++ b/src/mame/machine/segaic16.c
@@ -357,11 +357,11 @@ static void update_memory_mapping(running_machine *machine, struct memory_mapper
if (read != NULL)
memory_install_read16_handler(cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM), region_start, region_end, 0, region_mirror, read);
else if (readbank != NULL)
- memory_install_read_bank_handler(cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM), region_start, region_end, 0, region_mirror, readbank);
+ memory_install_read_bank(cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM), region_start, region_end, 0, region_mirror, readbank);
if (write != NULL)
memory_install_write16_handler(cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM), region_start, region_end, 0, region_mirror, write);
else if (writebank != NULL)
- memory_install_write_bank_handler(cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM), region_start, region_end, 0, region_mirror, writebank);
+ memory_install_write_bank(cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM), region_start, region_end, 0, region_mirror, writebank);
/* set the bank pointer */
if (readbank != NULL)
diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c
index fedbb9c64b8..f218343fc3f 100644
--- a/src/mame/machine/tnzs.c
+++ b/src/mame/machine/tnzs.c
@@ -555,9 +555,9 @@ DRIVER_INIT( insectx )
state->mcu_type = MCU_NONE_INSECTX;
/* this game has no mcu, replace the handler with plain input port handlers */
- memory_install_read_port_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0xc000, 0xc000, 0, 0, "IN0" );
- memory_install_read_port_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0xc001, 0xc001, 0, 0, "IN1" );
- memory_install_read_port_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0xc002, 0xc002, 0, 0, "IN2" );
+ memory_install_read_port(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0xc000, 0xc000, 0, 0, "IN0" );
+ memory_install_read_port(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0xc001, 0xc001, 0, 0, "IN1" );
+ memory_install_read_port(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0xc002, 0xc002, 0, 0, "IN2" );
}
DRIVER_INIT( kageki )
diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c
index 701778265ef..942f99fd55a 100644
--- a/src/mame/machine/vsnes.c
+++ b/src/mame/machine/vsnes.c
@@ -300,19 +300,19 @@ MACHINE_START( vsnes )
/* DRIVER_INIT is called first - means we can handle this different for VRAM games! */
if (NULL != vrom[0])
{
- memory_install_read_bank_handler(ppu1_space, 0x0000, 0x03ff, 0, 0, "bank2");
- memory_install_read_bank_handler(ppu1_space, 0x0400, 0x07ff, 0, 0, "bank3");
- memory_install_read_bank_handler(ppu1_space, 0x0800, 0x0bff, 0, 0, "bank4");
- memory_install_read_bank_handler(ppu1_space, 0x0c00, 0x0fff, 0, 0, "bank5");
- memory_install_read_bank_handler(ppu1_space, 0x1000, 0x13ff, 0, 0, "bank6");
- memory_install_read_bank_handler(ppu1_space, 0x1400, 0x17ff, 0, 0, "bank7");
- memory_install_read_bank_handler(ppu1_space, 0x1800, 0x1bff, 0, 0, "bank8");
- memory_install_read_bank_handler(ppu1_space, 0x1c00, 0x1fff, 0, 0, "bank9");
+ memory_install_read_bank(ppu1_space, 0x0000, 0x03ff, 0, 0, "bank2");
+ memory_install_read_bank(ppu1_space, 0x0400, 0x07ff, 0, 0, "bank3");
+ memory_install_read_bank(ppu1_space, 0x0800, 0x0bff, 0, 0, "bank4");
+ memory_install_read_bank(ppu1_space, 0x0c00, 0x0fff, 0, 0, "bank5");
+ memory_install_read_bank(ppu1_space, 0x1000, 0x13ff, 0, 0, "bank6");
+ memory_install_read_bank(ppu1_space, 0x1400, 0x17ff, 0, 0, "bank7");
+ memory_install_read_bank(ppu1_space, 0x1800, 0x1bff, 0, 0, "bank8");
+ memory_install_read_bank(ppu1_space, 0x1c00, 0x1fff, 0, 0, "bank9");
v_set_videorom_bank(machine, 0, 8, 0, 8);
}
else
{
- memory_install_readwrite_bank_handler(ppu1_space, 0x0000, 0x1fff, 0, 0, "bank2");
+ memory_install_readwrite_bank(ppu1_space, 0x0000, 0x1fff, 0, 0, "bank2");
memory_set_bankptr(machine, "bank2", vram);
}
}
@@ -344,9 +344,9 @@ MACHINE_START( vsdual )
memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, vsnes_nt0_r, vsnes_nt0_w);
memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu2"), ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, vsnes_nt1_r, vsnes_nt1_w);
// read only!
- memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank2");
+ memory_install_read_bank(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank2");
// read only!
- memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu2"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank3");
+ memory_install_read_bank(cpu_get_address_space(cputag_get_cpu(machine, "ppu2"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank3");
memory_set_bankptr(machine, "bank2", vrom[0]);
memory_set_bankptr(machine, "bank3", vrom[1]);
}
@@ -495,7 +495,7 @@ DRIVER_INIT( suprmrio )
DRIVER_INIT_CALL(vsnormal);
/* extra ram at $6000 is enabled with bit 1 of $4016 */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000));
/* now override the vidaccess callback */
@@ -1148,7 +1148,7 @@ DRIVER_INIT( MMC3 )
memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, mapper4_w );
/* extra ram at $6000-$7fff */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000));
/* common init */
@@ -1372,7 +1372,7 @@ DRIVER_INIT( bnglngby )
memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0231, 0x0231, 0, 0, set_bnglngby_irq_r, set_bnglngby_irq_w );
/* extra ram */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000));
ret = 0;
@@ -1460,8 +1460,8 @@ DRIVER_INIT( vstennis )
memory_install_write8_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0x4016, 0x4016, 0, 0, vstennis_vrom_banking );
/* shared ram at $6000 */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
memory_set_bankptr(machine, "bank1", &prg[0x6000]);
}
@@ -1527,7 +1527,7 @@ DRIVER_INIT( btlecity )
DRIVER_INIT( vstetris )
{
/* extra ram at $6000 is enabled with bit 1 of $4016 */
- memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
+ memory_install_readwrite_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" );
memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000));
init_vsnes(machine);
diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c
index e0373c87d71..43d6618a0b7 100644
--- a/src/mame/machine/williams.c
+++ b/src/mame/machine/williams.c
@@ -509,8 +509,8 @@ WRITE8_HANDLER( williams2_bank_select_w )
{
/* page 0 is video ram */
case 0:
- memory_install_read_bank_handler(space, 0x0000, 0x8fff, 0, 0, "bank1");
- memory_install_write_bank_handler(space, 0x8000, 0x87ff, 0, 0, "bank4");
+ memory_install_read_bank(space, 0x0000, 0x8fff, 0, 0, "bank1");
+ memory_install_write_bank(space, 0x8000, 0x87ff, 0, 0, "bank4");
memory_set_bank(space->machine, "bank1", 0);
memory_set_bankptr(space->machine, "bank4", &williams_videoram[0x8000]);
break;
@@ -518,15 +518,15 @@ WRITE8_HANDLER( williams2_bank_select_w )
/* pages 1 and 2 are ROM */
case 1:
case 2:
- memory_install_read_bank_handler(space, 0x0000, 0x8fff, 0, 0, "bank1");
- memory_install_write_bank_handler(space, 0x8000, 0x87ff, 0, 0, "bank4");
+ memory_install_read_bank(space, 0x0000, 0x8fff, 0, 0, "bank1");
+ memory_install_write_bank(space, 0x8000, 0x87ff, 0, 0, "bank4");
memory_set_bank(space->machine, "bank1", 1 + ((vram_bank & 6) >> 1));
memory_set_bankptr(space->machine, "bank4", &williams_videoram[0x8000]);
break;
/* page 3 accesses palette RAM; the remaining areas are as if page 1 ROM was selected */
case 3:
- memory_install_read_bank_handler(space, 0x8000, 0x87ff, 0, 0, "bank4");
+ memory_install_read_bank(space, 0x8000, 0x87ff, 0, 0, "bank4");
memory_install_write8_handler(space, 0x8000, 0x87ff, 0, 0, williams2_paletteram_w);
memory_set_bank(space->machine, "bank1", 1 + ((vram_bank & 4) >> 1));
memory_set_bankptr(space->machine, "bank4", space->machine->generic.paletteram.v);
@@ -779,7 +779,7 @@ WRITE8_HANDLER( defender_bank_select_w )
case 7:
case 8:
case 9:
- memory_install_read_bank_handler(space, 0xc000, 0xcfff, 0, 0, "bank1");
+ memory_install_read_bank(space, 0xc000, 0xcfff, 0, 0, "bank1");
memory_unmap_write(space, 0xc000, 0xcfff, 0, 0);
memory_set_bank(space->machine, "bank1", vram_bank - 1);
break;
diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c
index 0a18f0b5460..3e319e3c8f0 100644
--- a/src/mame/video/combatsc.c
+++ b/src/mame/video/combatsc.c
@@ -419,7 +419,7 @@ WRITE8_HANDLER( combascb_bankselect_w )
}
else
{
- memory_install_read_bank_handler(space, 0x4000, 0x7fff, 0, 0, "bank1"); /* banked ROM */
+ memory_install_read_bank(space, 0x4000, 0x7fff, 0, 0, "bank1"); /* banked ROM */
memory_unmap_write(space, 0x4000, 0x7fff, 0, 0); /* banked ROM */
}
}
diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c
index eb92519b91c..7be5feb1fd5 100644
--- a/src/mame/video/simpsons.c
+++ b/src/mame/video/simpsons.c
@@ -105,7 +105,7 @@ void simpsons_video_banking(running_machine *machine, int bank)
{
if (bank & 1)
{
- memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x0fff, 0, 0, "bank5");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x0fff, 0, 0, "bank5");
memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x0fff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w);
memory_set_bankptr(machine, "bank5", machine->generic.paletteram.v);
}