summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/taito_z.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/taito_z.cpp')
-rw-r--r--src/mame/drivers/taito_z.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp
index b891eb3296e..99bf567b3f0 100644
--- a/src/mame/drivers/taito_z.cpp
+++ b/src/mame/drivers/taito_z.cpp
@@ -1458,7 +1458,7 @@ WRITE8_MEMBER(taitoz_state::taitoz_pancontrol)
***********************************************************/
-static ADDRESS_MAP_START( contcirc_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::contcirc_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM
AM_RANGE(0x084000, 0x087fff) AM_RAM AM_SHARE("share1")
@@ -1470,7 +1470,7 @@ static ADDRESS_MAP_START( contcirc_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0x400000, 0x4006ff) AM_RAM AM_SHARE("spriteram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( contcirc_cpub_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::contcirc_cpub_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM
AM_RANGE(0x084000, 0x087fff) AM_RAM AM_SHARE("share1")
@@ -1480,7 +1480,7 @@ static ADDRESS_MAP_START( contcirc_cpub_map, AS_PROGRAM, 16, taitoz_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( chasehq_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::chasehq_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x107fff) AM_RAM
AM_RANGE(0x108000, 0x10bfff) AM_RAM AM_SHARE("share1")
@@ -1496,7 +1496,7 @@ static ADDRESS_MAP_START( chasehq_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0xe00000, 0xe003ff) AM_READWRITE(chasehq_motor_r, chasehq_motor_w) /* motor cpu */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( chq_cpub_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::chq_cpub_map)
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x108000, 0x10bfff) AM_RAM AM_SHARE("share1")
@@ -1504,7 +1504,7 @@ static ADDRESS_MAP_START( chq_cpub_map, AS_PROGRAM, 16, taitoz_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( enforce_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::enforce_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM AM_SHARE("share1")
@@ -1516,7 +1516,7 @@ static ADDRESS_MAP_START( enforce_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0x620000, 0x62000f) AM_DEVREADWRITE("tc0100scn", tc0100scn_device, ctrl_word_r, ctrl_word_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( enforce_cpub_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::enforce_cpub_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM AM_SHARE("share1")
@@ -1525,7 +1525,7 @@ static ADDRESS_MAP_START( enforce_cpub_map, AS_PROGRAM, 16, taitoz_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bshark_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::bshark_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x110000, 0x113fff) AM_RAM AM_SHARE("share1")
@@ -1538,7 +1538,7 @@ static ADDRESS_MAP_START( bshark_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0xd20000, 0xd2000f) AM_DEVREADWRITE("tc0100scn", tc0100scn_device, ctrl_word_r, ctrl_word_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bsharkjjs_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::bsharkjjs_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x110000, 0x113fff) AM_RAM AM_SHARE("share1")
@@ -1551,7 +1551,7 @@ static ADDRESS_MAP_START( bsharkjjs_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0xd20000, 0xd2000f) AM_DEVREADWRITE("tc0100scn", tc0100scn_device, ctrl_word_r, ctrl_word_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bshark_cpub_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::bshark_cpub_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x108000, 0x10bfff) AM_RAM
AM_RANGE(0x110000, 0x113fff) AM_RAM AM_SHARE("share1")
@@ -1564,7 +1564,7 @@ static ADDRESS_MAP_START( bshark_cpub_map, AS_PROGRAM, 16, taitoz_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sci_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::sci_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x107fff) AM_RAM
AM_RANGE(0x108000, 0x10bfff) AM_RAM AM_SHARE("share1")
@@ -1580,7 +1580,7 @@ static ADDRESS_MAP_START( sci_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0xc08000, 0xc08001) AM_READWRITE(sci_spriteframe_r, sci_spriteframe_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sci_cpub_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::sci_cpub_map)
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM
AM_RANGE(0x208000, 0x20bfff) AM_RAM AM_SHARE("share1")
@@ -1588,7 +1588,7 @@ static ADDRESS_MAP_START( sci_cpub_map, AS_PROGRAM, 16, taitoz_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nightstr_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::nightstr_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x110000, 0x113fff) AM_RAM AM_SHARE("share1")
@@ -1603,7 +1603,7 @@ static ADDRESS_MAP_START( nightstr_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0xe40000, 0xe40007) AM_READWRITE(nightstr_stick_r, bshark_stick_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nightstr_cpub_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::nightstr_cpub_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM AM_SHARE("share1")
@@ -1611,7 +1611,7 @@ static ADDRESS_MAP_START( nightstr_cpub_map, AS_PROGRAM, 16, taitoz_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aquajack_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::aquajack_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM AM_SHARE("share1")
@@ -1623,7 +1623,7 @@ static ADDRESS_MAP_START( aquajack_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0xc40000, 0xc403ff) AM_RAM AM_SHARE("spriteram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aquajack_cpub_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::aquajack_cpub_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM AM_SHARE("share1")
@@ -1635,7 +1635,7 @@ static ADDRESS_MAP_START( aquajack_cpub_map, AS_PROGRAM, 16, taitoz_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spacegun_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::spacegun_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x30c000, 0x30ffff) AM_RAM
AM_RANGE(0x310000, 0x31ffff) AM_RAM AM_SHARE("share1")
@@ -1645,7 +1645,7 @@ static ADDRESS_MAP_START( spacegun_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0xb00000, 0xb00007) AM_DEVREADWRITE("tc0110pcr", tc0110pcr_device, word_r, step1_rbswap_word_w) /* palette */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spacegun_cpub_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::spacegun_cpub_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x20c000, 0x20ffff) AM_RAM
AM_RANGE(0x210000, 0x21ffff) AM_RAM AM_SHARE("share1")
@@ -1659,7 +1659,7 @@ static ADDRESS_MAP_START( spacegun_cpub_map, AS_PROGRAM, 16, taitoz_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dblaxle_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::dblaxle_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM
AM_RANGE(0x210000, 0x21ffff) AM_RAM AM_SHARE("share1")
@@ -1675,7 +1675,7 @@ static ADDRESS_MAP_START( dblaxle_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0xc08000, 0xc08001) AM_READWRITE(sci_spriteframe_r, sci_spriteframe_w) /* set in int6, seems to stay zero */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dblaxle_cpub_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::dblaxle_cpub_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x110000, 0x11ffff) AM_RAM AM_SHARE("share1")
@@ -1684,7 +1684,7 @@ static ADDRESS_MAP_START( dblaxle_cpub_map, AS_PROGRAM, 16, taitoz_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( racingb_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::racingb_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x110000, 0x11ffff) AM_RAM AM_SHARE("share1")
@@ -1699,7 +1699,7 @@ static ADDRESS_MAP_START( racingb_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0xb08000, 0xb08001) AM_READWRITE(sci_spriteframe_r, sci_spriteframe_w) /* alternates 0/0x100 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( racingb_cpub_map, AS_PROGRAM, 16, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::racingb_cpub_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x400000, 0x403fff) AM_RAM
AM_RANGE(0x410000, 0x41ffff) AM_RAM AM_SHARE("share1")
@@ -1710,7 +1710,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( z80_sound_map, AS_PROGRAM, 8, taitoz_state )
+ADDRESS_MAP_START(taitoz_state::z80_sound_map)
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("z80bank")
AM_RANGE(0xc000, 0xdfff) AM_RAM