summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/namcos2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/namcos2.cpp')
-rw-r--r--src/mame/drivers/namcos2.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp
index 404c3c8e999..f9b7beae5d7 100644
--- a/src/mame/drivers/namcos2.cpp
+++ b/src/mame/drivers/namcos2.cpp
@@ -594,7 +594,7 @@ READ8_MEMBER(namcos2_state::ack_mcu_vbl_r)
0xc00000 ONWARDS are unverified memory locations on the video board
*/
-static ADDRESS_MAP_START( namcos2_68k_default_cpu_board_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::namcos2_68k_default_cpu_board_am)
AM_RANGE(0x200000, 0x3fffff) AM_ROM AM_REGION("data_rom", 0)
AM_RANGE(0x400000, 0x41ffff) AM_READWRITE(c123_tilemap_videoram_r,c123_tilemap_videoram_w)
AM_RANGE(0x420000, 0x42003f) AM_READWRITE(c123_tilemap_control_r,c123_tilemap_control_w)
@@ -606,7 +606,7 @@ ADDRESS_MAP_END
/*************************************************************/
-static ADDRESS_MAP_START( common_default_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::common_default_am)
AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am )
AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xc40000, 0xc40001) AM_READWRITE(gfx_ctrl_r, gfx_ctrl_w)
@@ -615,7 +615,7 @@ static ADDRESS_MAP_START( common_default_am, AS_PROGRAM, 16, namcos2_state )
AM_RANGE(0xd00000, 0xd0000f) AM_READWRITE(namcos2_68k_key_r,namcos2_68k_key_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_default_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::master_default_am)
AM_IMPORT_FROM( common_default_am )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM)
@@ -623,7 +623,7 @@ static ADDRESS_MAP_START( master_default_am, AS_PROGRAM, 16, namcos2_state )
AM_RANGE(0x1c0000, 0x1fffff) AM_DEVICE("master_intc", namco_c148_device, map)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_default_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::slave_default_am)
AM_IMPORT_FROM( common_default_am )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM)
@@ -633,7 +633,7 @@ ADDRESS_MAP_END
/*************************************************************/
-static ADDRESS_MAP_START( common_finallap_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::common_finallap_am)
AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am )
AM_RANGE(0x300000, 0x33ffff) AM_READ(namcos2_finallap_prot_r)
AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_SHARE("spriteram")
@@ -642,7 +642,7 @@ static ADDRESS_MAP_START( common_finallap_am, AS_PROGRAM, 16, namcos2_state )
AM_RANGE(0x8c0000, 0x8c0001) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_finallap_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::master_finallap_am)
AM_IMPORT_FROM( common_finallap_am )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM)
@@ -650,7 +650,7 @@ static ADDRESS_MAP_START( master_finallap_am, AS_PROGRAM, 16, namcos2_state )
AM_RANGE(0x1c0000, 0x1fffff) AM_DEVICE("master_intc", namco_c148_device, map)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_finallap_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::slave_finallap_am)
AM_IMPORT_FROM( common_finallap_am )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM)
@@ -659,14 +659,14 @@ ADDRESS_MAP_END
/*************************************************************/
-static ADDRESS_MAP_START( common_sgunner_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::common_sgunner_am)
AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am )
AM_RANGE(0x800000, 0x8141ff) AM_READWRITE(c355_obj_ram_r,c355_obj_ram_w)
AM_RANGE(0x818000, 0x818001) AM_WRITENOP
AM_RANGE(0xa00000, 0xa0000f) AM_READWRITE(namcos2_68k_key_r,namcos2_68k_key_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_sgunner_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::master_sgunner_am)
AM_IMPORT_FROM( common_sgunner_am )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM)
@@ -674,7 +674,7 @@ static ADDRESS_MAP_START( master_sgunner_am, AS_PROGRAM, 16, namcos2_state )
AM_RANGE(0x1c0000, 0x1fffff) AM_DEVICE("master_intc", namco_c148_device, map)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_sgunner_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::slave_sgunner_am)
AM_IMPORT_FROM( common_sgunner_am )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM)
@@ -683,7 +683,7 @@ ADDRESS_MAP_END
/*************************************************************/
-static ADDRESS_MAP_START( common_metlhawk_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::common_metlhawk_am)
AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am )
AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xc40000, 0xc4ffff) AM_READWRITE(c169_roz_videoram_r,c169_roz_videoram_w) AM_SHARE("rozvideoram")
@@ -691,7 +691,7 @@ static ADDRESS_MAP_START( common_metlhawk_am, AS_PROGRAM, 16, namcos2_state )
AM_RANGE(0xe00000, 0xe00001) AM_READWRITE(gfx_ctrl_r, gfx_ctrl_w) /* ??? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_metlhawk_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::master_metlhawk_am)
AM_IMPORT_FROM( common_metlhawk_am )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM)
@@ -699,7 +699,7 @@ static ADDRESS_MAP_START( master_metlhawk_am, AS_PROGRAM, 16, namcos2_state )
AM_RANGE(0x1c0000, 0x1fffff) AM_DEVICE("master_intc", namco_c148_device, map)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_metlhawk_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::slave_metlhawk_am)
AM_IMPORT_FROM( common_metlhawk_am )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM)
@@ -708,7 +708,7 @@ ADDRESS_MAP_END
/*************************************************************/
-static ADDRESS_MAP_START( common_luckywld_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::common_luckywld_am)
AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am )
AM_RANGE(0x800000, 0x8141ff) AM_READWRITE(c355_obj_ram_r,c355_obj_ram_w)
AM_RANGE(0x818000, 0x818001) AM_NOP /* enable? */
@@ -721,7 +721,7 @@ static ADDRESS_MAP_START( common_luckywld_am, AS_PROGRAM, 16, namcos2_state )
AM_RANGE(0xf00000, 0xf00007) AM_READWRITE(namcos2_68k_key_r,namcos2_68k_key_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_luckywld_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::master_luckywld_am)
AM_IMPORT_FROM( common_luckywld_am )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM)
@@ -729,7 +729,7 @@ static ADDRESS_MAP_START( master_luckywld_am, AS_PROGRAM, 16, namcos2_state )
AM_RANGE(0x1c0000, 0x1fffff) AM_DEVICE("master_intc", namco_c148_device, map)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_luckywld_am, AS_PROGRAM, 16, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::slave_luckywld_am)
AM_IMPORT_FROM( common_luckywld_am )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM)
@@ -740,7 +740,7 @@ ADDRESS_MAP_END
/* 6809 SOUND CPU Memory declarations */
/*************************************************************/
-static ADDRESS_MAP_START( sound_default_am, AS_PROGRAM, 8, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::sound_default_am)
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank6") /* banked */
AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2151_device,read,write)
AM_RANGE(0x5000, 0x6fff) AM_DEVREADWRITE("c140", c140_device, c140_r,c140_w)
@@ -759,7 +759,7 @@ ADDRESS_MAP_END
/* 68705 IO CPU Memory declarations */
/*************************************************************/
-static ADDRESS_MAP_START( mcu_default_am, AS_PROGRAM, 8, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::mcu_default_am)
/* input ports and dips are mapped here */
AM_RANGE(0x0000, 0x003f) AM_RAM /* Fill in register to stop logging */
AM_RANGE(0x0000, 0x0000) AM_READNOP /* Keep logging quiet */
@@ -795,7 +795,7 @@ WRITE8_MEMBER(namcos2_state::c68_p3_w)
m_player_mux = (data & 0x80) ? 1 : 0;
}
-static ADDRESS_MAP_START( c68_default_am, AS_PROGRAM, 8, namcos2_state )
+ADDRESS_MAP_START(namcos2_state::c68_default_am)
/* input ports and dips are mapped here */
AM_RANGE(0x2000, 0x2000) AM_READ_PORT("DSW")
AM_RANGE(0x3000, 0x3000) AM_READ_PORT("MCUDI0")