summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/djboy.cpp
diff options
context:
space:
mode:
authorGravatarGravatar Olivier Galibert <galibert@pobox.com>2018-02-01 10:04:01 +0100
committerGravatarGravatar Olivier Galibert <galibert@pobox.com>2018-02-12 10:04:52 +0100
commitc5219643162cb7d2a8688425a09008d28c8e2437 (patch)
treef2775ca3b1770ab0d3fb568f0bdd6d9212c68bf6 /src/mame/drivers/djboy.cpp
parent09b6ce46873b38de9030a3c0378ff327f17af881 (diff)
API change: Memory maps are now methods of the owner class [O. Galibert]
Also, a lot more freedom happened, that's going to be more visible soon.
Diffstat (limited to 'src/mame/drivers/djboy.cpp')
-rw-r--r--src/mame/drivers/djboy.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp
index c766ff69f0c..510623f484b 100644
--- a/src/mame/drivers/djboy.cpp
+++ b/src/mame/drivers/djboy.cpp
@@ -244,7 +244,7 @@ WRITE8_MEMBER(djboy_state::cpu2_bankswitch_w)
/******************************************************************************/
-static ADDRESS_MAP_START( cpu0_am, AS_PROGRAM, 8, djboy_state )
+ADDRESS_MAP_START(djboy_state::cpu0_am)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xafff) AM_ROMBANK("bank4")
AM_RANGE(0xb000, 0xbfff) AM_DEVREADWRITE("pandora", kaneko_pandora_device, spriteram_r, spriteram_w)
@@ -254,14 +254,14 @@ static ADDRESS_MAP_START( cpu0_am, AS_PROGRAM, 8, djboy_state )
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu0_port_am, AS_IO, 8, djboy_state )
+ADDRESS_MAP_START(djboy_state::cpu0_port_am)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(cpu0_bankswitch_w)
ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( cpu1_am, AS_PROGRAM, 8, djboy_state )
+ADDRESS_MAP_START(djboy_state::cpu1_am)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(djboy_videoram_w) AM_SHARE("videoram")
@@ -270,7 +270,7 @@ static ADDRESS_MAP_START( cpu1_am, AS_PROGRAM, 8, djboy_state )
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu1_port_am, AS_IO, 8, djboy_state )
+ADDRESS_MAP_START(djboy_state::cpu1_port_am)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(cpu1_bankswitch_w)
AM_RANGE(0x02, 0x02) AM_WRITE(trigger_nmi_on_sound_cpu2)
@@ -284,13 +284,13 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( cpu2_am, AS_PROGRAM, 8, djboy_state )
+ADDRESS_MAP_START(djboy_state::cpu2_am)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3")
AM_RANGE(0xc000, 0xdfff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu2_port_am, AS_IO, 8, djboy_state )
+ADDRESS_MAP_START(djboy_state::cpu2_port_am)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(cpu2_bankswitch_w)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
@@ -379,7 +379,7 @@ WRITE8_MEMBER(djboy_state::beast_p3_w)
}
/* Program/data maps are defined in the 8051 core */
-static ADDRESS_MAP_START( djboy_mcu_io_map, AS_IO, 8, djboy_state )
+ADDRESS_MAP_START(djboy_state::djboy_mcu_io_map)
AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P0) AM_READWRITE(beast_p0_r, beast_p0_w)
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READWRITE(beast_p1_r, beast_p1_w)
AM_RANGE(MCS51_PORT_P2, MCS51_PORT_P2) AM_READWRITE(beast_p2_r, beast_p2_w)