summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/namcos11.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/namcos11.cpp')
-rw-r--r--src/mame/drivers/namcos11.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp
index 6ccb2f9f808..db322aa8fd8 100644
--- a/src/mame/drivers/namcos11.cpp
+++ b/src/mame/drivers/namcos11.cpp
@@ -347,6 +347,12 @@ public:
void souledge(machine_config &config);
void tekken(machine_config &config);
void tekken2(machine_config &config);
+ void c76_io_map(address_map &map);
+ void c76_map(address_map &map);
+ void namcos11_map(address_map &map);
+ void ptblank2ua_map(address_map &map);
+ void rom8_64_map(address_map &map);
+ void rom8_map(address_map &map);
protected:
virtual void driver_start() override;
@@ -458,7 +464,7 @@ WRITE16_MEMBER( namcos11_state::c76_shared_w )
COMBINE_DATA( &m_sharedram.target()[ offset ] );
}
-static ADDRESS_MAP_START( namcos11_map, AS_PROGRAM, 32, namcos11_state )
+ADDRESS_MAP_START(namcos11_state::namcos11_map)
AM_RANGE(0x1fa04000, 0x1fa0ffff) AM_READWRITE16(c76_shared_r, c76_shared_w, 0xffffffff) /* shared ram with C76 */
AM_RANGE(0x1fa20000, 0x1fa2001f) AM_DEVREADWRITE16("keycus", ns11_keycus_device, read, write, 0xffffffff)
AM_RANGE(0x1fa30000, 0x1fa30fff) AM_DEVREADWRITE8("at28c16", at28c16_device, read, write, 0x00ff00ff) /* eeprom */
@@ -466,7 +472,7 @@ static ADDRESS_MAP_START( namcos11_map, AS_PROGRAM, 32, namcos11_state )
AM_RANGE(0x1fbf6000, 0x1fbf6003) AM_WRITENOP /* ?? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rom8_map, AS_PROGRAM, 32, namcos11_state )
+ADDRESS_MAP_START(namcos11_state::rom8_map)
AM_IMPORT_FROM(namcos11_map)
AM_RANGE(0x1f000000, 0x1f0fffff) AM_ROMBANK("bank1")
@@ -480,7 +486,7 @@ static ADDRESS_MAP_START( rom8_map, AS_PROGRAM, 32, namcos11_state )
AM_RANGE(0x1fa10020, 0x1fa1002f) AM_WRITE16(rom8_w, 0xffffffff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rom8_64_map, AS_PROGRAM, 32, namcos11_state )
+ADDRESS_MAP_START(namcos11_state::rom8_64_map)
AM_IMPORT_FROM(namcos11_map)
AM_RANGE(0x1f000000, 0x1f0fffff) AM_ROMBANK("bank1")
@@ -495,14 +501,14 @@ static ADDRESS_MAP_START( rom8_64_map, AS_PROGRAM, 32, namcos11_state )
AM_RANGE(0x1fa10020, 0x1fa1002f) AM_READNOP AM_WRITE16(rom8_64_w, 0xffffffff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ptblank2ua_map, AS_PROGRAM, 32, namcos11_state )
+ADDRESS_MAP_START(namcos11_state::ptblank2ua_map)
AM_IMPORT_FROM(rom8_64_map)
AM_RANGE(0x1f780000, 0x1f78000f) AM_READ16(lightgun_r, 0xffffffff)
AM_RANGE(0x1f788000, 0x1f788003) AM_WRITE16(lightgun_w, 0xffffffff)
ADDRESS_MAP_END
-ADDRESS_MAP_START( c76_map, AS_PROGRAM, 16, namcos11_state )
+ADDRESS_MAP_START(namcos11_state::c76_map)
AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE("c352", c352_device, read, write)
AM_RANGE(0x001000, 0x001001) AM_READ_PORT("PLAYER4")
AM_RANGE(0x001002, 0x001003) AM_READ_PORT("SWITCH")
@@ -516,7 +522,7 @@ ADDRESS_MAP_START( c76_map, AS_PROGRAM, 16, namcos11_state )
AM_RANGE(0x301000, 0x301001) AM_WRITENOP
ADDRESS_MAP_END
-ADDRESS_MAP_START( c76_io_map, AS_IO, 8, namcos11_state )
+ADDRESS_MAP_START(namcos11_state::c76_io_map)
AM_RANGE(M37710_ADC0_H, M37710_ADC7_H) AM_READNOP
AM_RANGE(M37710_ADC0_L, M37710_ADC0_L) AM_READ_PORT("ADC0")
AM_RANGE(M37710_ADC1_L, M37710_ADC1_L) AM_READ_PORT("ADC1")