diff options
Diffstat (limited to 'src/mame/drivers/raiden.cpp')
-rw-r--r-- | src/mame/drivers/raiden.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp index 875ab793ca9..4c827b4a0fe 100644 --- a/src/mame/drivers/raiden.cpp +++ b/src/mame/drivers/raiden.cpp @@ -83,7 +83,7 @@ /******************************************************************************/ -static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, raiden_state ) +ADDRESS_MAP_START(raiden_state::main_map) AM_RANGE(0x00000, 0x06fff) AM_RAM AM_RANGE(0x07000, 0x07fff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0x08000, 0x08fff) AM_RAM AM_SHARE("shared_ram") @@ -97,7 +97,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, raiden_state ) AM_RANGE(0xa0000, 0xfffff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 16, raiden_state ) +ADDRESS_MAP_START(raiden_state::sub_map) AM_RANGE(0x00000, 0x01fff) AM_RAM AM_RANGE(0x02000, 0x027ff) AM_RAM_WRITE(raiden_background_w) AM_SHARE("back_data") AM_RANGE(0x02800, 0x02fff) AM_RAM_WRITE(raiden_foreground_w) AM_SHARE("fore_data") @@ -112,7 +112,7 @@ ADDRESS_MAP_END /******************************************************************************/ -static ADDRESS_MAP_START( raidenu_main_map, AS_PROGRAM, 16, raiden_state ) +ADDRESS_MAP_START(raiden_state::raidenu_main_map) AM_RANGE(0x00000, 0x06fff) AM_RAM AM_RANGE(0x07000, 0x07fff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0x08000, 0x0803f) AM_WRITEONLY AM_SHARE("scroll_ram") @@ -126,7 +126,7 @@ static ADDRESS_MAP_START( raidenu_main_map, AS_PROGRAM, 16, raiden_state ) AM_RANGE(0xa0000, 0xfffff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( raidenu_sub_map, AS_PROGRAM, 16, raiden_state ) +ADDRESS_MAP_START(raiden_state::raidenu_sub_map) AM_RANGE(0x00000, 0x05fff) AM_RAM AM_RANGE(0x06000, 0x067ff) AM_RAM_WRITE(raiden_background_w) AM_SHARE("back_data") AM_RANGE(0x06800, 0x06fff) AM_RAM_WRITE(raiden_foreground_w) AM_SHARE("fore_data") @@ -140,7 +140,7 @@ ADDRESS_MAP_END /******************************************************************************/ -static ADDRESS_MAP_START( raidenb_main_map, AS_PROGRAM, 16, raiden_state ) +ADDRESS_MAP_START(raiden_state::raidenb_main_map) AM_RANGE(0x00000, 0x06fff) AM_RAM AM_RANGE(0x07000, 0x07fff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0x0a000, 0x0afff) AM_RAM AM_SHARE("shared_ram") @@ -157,7 +157,7 @@ ADDRESS_MAP_END /*****************************************************************************/ -static ADDRESS_MAP_START( raiden_sound_map, AS_PROGRAM, 8, raiden_state ) +ADDRESS_MAP_START(raiden_state::raiden_sound_map) AM_RANGE(0x0000, 0xffff) AM_DEVREAD("sei80bu", sei80bu_device, data_r) AM_RANGE(0x2000, 0x27ff) AM_RAM AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("seibu_sound", seibu_sound_device, pending_w) @@ -174,11 +174,11 @@ static ADDRESS_MAP_START( raiden_sound_map, AS_PROGRAM, 8, raiden_state ) AM_RANGE(0x6000, 0x6000) AM_DEVREADWRITE("oki", okim6295_device, read, write) ADDRESS_MAP_END -static ADDRESS_MAP_START( raiden_sound_decrypted_opcodes_map, AS_OPCODES, 8, raiden_state ) +ADDRESS_MAP_START(raiden_state::raiden_sound_decrypted_opcodes_map) AM_RANGE(0x0000, 0xffff) AM_DEVREAD("sei80bu", sei80bu_device, opcode_r) ADDRESS_MAP_END -static ADDRESS_MAP_START( sei80bu_encrypted_full_map, AS_PROGRAM, 8, raiden_state ) +ADDRESS_MAP_START(raiden_state::sei80bu_encrypted_full_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_REGION("audiocpu", 0) AM_RANGE(0x8000, 0xffff) AM_ROMBANK("seibu_bank1") ADDRESS_MAP_END @@ -370,7 +370,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(raiden_state::raidene, raiden) MCFG_DEVICE_MODIFY("audiocpu") MCFG_CPU_PROGRAM_MAP(raiden_sound_map) - MCFG_CPU_DECRYPTED_OPCODES_MAP(raiden_sound_decrypted_opcodes_map) + MCFG_CPU_OPCODES_MAP(raiden_sound_decrypted_opcodes_map) MCFG_DEVICE_ADD("sei80bu", SEI80BU, 0) MCFG_DEVICE_PROGRAM_MAP(sei80bu_encrypted_full_map) |