summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/shangkid.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/shangkid.cpp')
-rw-r--r--src/mame/drivers/shangkid.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp
index d6a9d83a4e7..192fbff73eb 100644
--- a/src/mame/drivers/shangkid.cpp
+++ b/src/mame/drivers/shangkid.cpp
@@ -276,7 +276,7 @@ GFXDECODE_END
/***************************************************************************************/
-static ADDRESS_MAP_START( chinhero_main_map, AS_PROGRAM, 8, shangkid_state )
+ADDRESS_MAP_START(shangkid_state::chinhero_main_map)
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITE(nmiq_1_w)
AM_RANGE(0xa800, 0xa800) AM_WRITE(nmiq_2_w)
@@ -291,7 +291,7 @@ static ADDRESS_MAP_START( chinhero_main_map, AS_PROGRAM, 8, shangkid_state )
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE("spriteram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shangkid_main_map, AS_PROGRAM, 8, shangkid_state )
+ADDRESS_MAP_START(shangkid_state::shangkid_main_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xa000) AM_WRITE(nmiq_1_w)
@@ -309,7 +309,7 @@ ADDRESS_MAP_END
/***************************************************************************************/
-static ADDRESS_MAP_START( chinhero_bbx_map, AS_PROGRAM, 8, shangkid_state )
+ADDRESS_MAP_START(shangkid_state::chinhero_bbx_map)
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITE(nmiq_1_w)
AM_RANGE(0xa800, 0xa800) AM_WRITE(nmiq_2_w)
@@ -323,7 +323,7 @@ static ADDRESS_MAP_START( chinhero_bbx_map, AS_PROGRAM, 8, shangkid_state )
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE("spriteram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shangkid_bbx_map, AS_PROGRAM, 8, shangkid_state )
+ADDRESS_MAP_START(shangkid_state::shangkid_bbx_map)
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITE(nmiq_1_w)
AM_RANGE(0xa800, 0xa800) AM_WRITE(nmiq_2_w)
@@ -337,29 +337,29 @@ static ADDRESS_MAP_START( shangkid_bbx_map, AS_PROGRAM, 8, shangkid_state )
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE("spriteram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( chinhero_bbx_portmap, AS_IO, 8, shangkid_state )
+ADDRESS_MAP_START(shangkid_state::chinhero_bbx_portmap)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_device, address_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shangkid_bbx_portmap, AS_IO, 8, shangkid_state )
+ADDRESS_MAP_START(shangkid_state::shangkid_bbx_portmap)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_device, address_data_w)
ADDRESS_MAP_END
/***************************************************************************************/
-static ADDRESS_MAP_START( chinhero_sound_map, AS_PROGRAM, 8, shangkid_state )
+ADDRESS_MAP_START(shangkid_state::chinhero_sound_map)
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_MIRROR(0x0800)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shangkid_sound_map, AS_PROGRAM, 8, shangkid_state )
+ADDRESS_MAP_START(shangkid_state::shangkid_sound_map)
AM_RANGE(0x0000, 0xdfff) AM_ROMBANK("bank2") /* sample player writes to ROM area */
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_MIRROR(0x0800)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, AS_IO, 8, shangkid_state )
+ADDRESS_MAP_START(shangkid_state::sound_portmap)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) AM_DEVWRITE("dac", dac_byte_interface, write)
ADDRESS_MAP_END
@@ -452,7 +452,7 @@ MACHINE_CONFIG_END
-static ADDRESS_MAP_START( dynamski_map, AS_PROGRAM, 8, shangkid_state )
+ADDRESS_MAP_START(shangkid_state::dynamski_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("videoram") /* tilemap */
AM_RANGE(0xc800, 0xcbff) AM_RAM
@@ -466,7 +466,7 @@ static ADDRESS_MAP_START( dynamski_map, AS_PROGRAM, 8, shangkid_state )
AM_RANGE(0xf000, 0xf7ff) AM_RAM /* work ram */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dynamski_portmap, AS_IO, 8, shangkid_state )
+ADDRESS_MAP_START(shangkid_state::dynamski_portmap)
ADDRESS_MAP_GLOBAL_MASK(0xff)
/* ports are reversed */
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_device, data_address_w)