diff options
author | 2018-03-13 07:36:43 +0100 | |
---|---|---|
committer | 2018-03-14 14:07:14 +0100 | |
commit | 115bb9936c5cd3faf955d7eb1e251a94e4744b7b (patch) | |
tree | f0230f547f6c750f9974c61479eef28cbe4ad571 /src/mame/drivers/airraid.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/airraid.cpp')
-rw-r--r-- | src/mame/drivers/airraid.cpp | 94 |
1 files changed, 49 insertions, 45 deletions
diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp index fce34580848..0c4f1107928 100644 --- a/src/mame/drivers/airraid.cpp +++ b/src/mame/drivers/airraid.cpp @@ -244,58 +244,62 @@ WRITE8_MEMBER(airraid_state::bank_w) -ADDRESS_MAP_START(airraid_state::airraid_map) - AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_WRITENOP // rld result write-back - AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0") - AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN1") - AM_RANGE(0xc002, 0xc002) AM_READ_PORT("IN2") - AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW2") - AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSW1") - AM_RANGE(0xc500, 0xc500) AM_WRITE(cshooter_c500_w) +void airraid_state::airraid_map(address_map &map) +{ + map(0x0000, 0x7fff).rom(); + map(0x8000, 0xbfff).bankr("bank1").nopw(); // rld result write-back + map(0xc000, 0xc000).portr("IN0"); + map(0xc001, 0xc001).portr("IN1"); + map(0xc002, 0xc002).portr("IN2"); + map(0xc003, 0xc003).portr("DSW2"); + map(0xc004, 0xc004).portr("DSW1"); + map(0xc500, 0xc500).w(this, FUNC(airraid_state::cshooter_c500_w)); // AM_RANGE(0xc600, 0xc600) AM_WRITE(cshooter_c600_w) // see notes - AM_RANGE(0xc700, 0xc700) AM_WRITE(cshooter_c700_w) + map(0xc700, 0xc700).w(this, FUNC(airraid_state::cshooter_c700_w)); // AM_RANGE(0xc801, 0xc801) AM_WRITE(cshooter_c801_w) // see notes - AM_RANGE(0xd000, 0xd7ff) AM_RAM_DEVWRITE("airraid_vid", airraid_video_device, txram_w) AM_SHARE("txram") - AM_RANGE(0xd800, 0xd8ff) AM_RAM_DEVWRITE("palette", palette_device, write8) AM_SHARE("palette") - AM_RANGE(0xda00, 0xdaff) AM_RAM_DEVWRITE("palette", palette_device, write8_ext) AM_SHARE("palette_ext") - AM_RANGE(0xdc00, 0xdc0f) AM_RAM_DEVWRITE("airraid_vid", airraid_video_device, vregs_w) AM_SHARE("vregs") + map(0xd000, 0xd7ff).ram().w(m_airraid_video, FUNC(airraid_video_device::txram_w)).share("txram"); + map(0xd800, 0xd8ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); + map(0xda00, 0xdaff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); + map(0xdc00, 0xdc0f).ram().w(m_airraid_video, FUNC(airraid_video_device::vregs_w)).share("vregs"); // AM_RANGE(0xdc10, 0xdc10) AM_RAM - AM_RANGE(0xdc11, 0xdc11) AM_WRITE(bank_w) + map(0xdc11, 0xdc11).w(this, FUNC(airraid_state::bank_w)); // AM_RANGE(0xdc19, 0xdc19) AM_RAM // AM_RANGE(0xdc1e, 0xdc1e) AM_RAM // AM_RANGE(0xdc1f, 0xdc1f) AM_RAM - AM_RANGE(0xde00, 0xde0f) AM_DEVREADWRITE("seibu_sound", seibu_sound_device, main_r, main_w) - AM_RANGE(0xe000, 0xfdff) AM_RAM AM_SHARE("mainram") - AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE("sprite_ram") -ADDRESS_MAP_END - -ADDRESS_MAP_START(airraid_state::decrypted_opcodes_map) - AM_RANGE(0x0000, 0x7fff) AM_ROM AM_SHARE("decrypted_opcodes") -ADDRESS_MAP_END - -ADDRESS_MAP_START(airraid_state::airraid_sound_map) - AM_RANGE(0x0000, 0x1fff) 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) - AM_RANGE(0x4001, 0x4001) AM_DEVWRITE("seibu_sound", seibu_sound_device, irq_clear_w) - AM_RANGE(0x4002, 0x4002) AM_DEVWRITE("seibu_sound", seibu_sound_device, rst10_ack_w) - AM_RANGE(0x4003, 0x4003) AM_DEVWRITE("seibu_sound", seibu_sound_device, rst18_ack_w) - AM_RANGE(0x4007, 0x4007) AM_DEVWRITE("seibu_sound", seibu_sound_device, bank_w) - AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("seibu_sound", seibu_sound_device, ym_r, ym_w) - AM_RANGE(0x4010, 0x4011) AM_DEVREAD("seibu_sound", seibu_sound_device, soundlatch_r) - AM_RANGE(0x4012, 0x4012) AM_DEVREAD("seibu_sound", seibu_sound_device, main_data_pending_r) - AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN") - AM_RANGE(0x4018, 0x4019) AM_DEVWRITE("seibu_sound", seibu_sound_device, main_data_w) - AM_RANGE(0x401b, 0x401b) AM_DEVWRITE("seibu_sound", seibu_sound_device, coin_w) - AM_RANGE(0x8000, 0xffff) AM_ROM -ADDRESS_MAP_END - -ADDRESS_MAP_START(airraid_state::airraid_sound_decrypted_opcodes_map) - AM_RANGE(0x0000, 0x1fff) AM_DEVREAD("sei80bu", sei80bu_device, opcode_r) - AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("audiocpu", 0x8000) -ADDRESS_MAP_END + map(0xde00, 0xde0f).rw(m_seibu_sound, FUNC(seibu_sound_device::main_r), FUNC(seibu_sound_device::main_w)); + map(0xe000, 0xfdff).ram().share("mainram"); + map(0xfe00, 0xffff).ram().share("sprite_ram"); +} + +void airraid_state::decrypted_opcodes_map(address_map &map) +{ + map(0x0000, 0x7fff).rom().share("decrypted_opcodes"); +} + +void airraid_state::airraid_sound_map(address_map &map) +{ + map(0x0000, 0x1fff).r("sei80bu", FUNC(sei80bu_device::data_r)); + map(0x2000, 0x27ff).ram(); + map(0x4000, 0x4000).w(m_seibu_sound, FUNC(seibu_sound_device::pending_w)); + map(0x4001, 0x4001).w(m_seibu_sound, FUNC(seibu_sound_device::irq_clear_w)); + map(0x4002, 0x4002).w(m_seibu_sound, FUNC(seibu_sound_device::rst10_ack_w)); + map(0x4003, 0x4003).w(m_seibu_sound, FUNC(seibu_sound_device::rst18_ack_w)); + map(0x4007, 0x4007).w(m_seibu_sound, FUNC(seibu_sound_device::bank_w)); + map(0x4008, 0x4009).rw(m_seibu_sound, FUNC(seibu_sound_device::ym_r), FUNC(seibu_sound_device::ym_w)); + map(0x4010, 0x4011).r(m_seibu_sound, FUNC(seibu_sound_device::soundlatch_r)); + map(0x4012, 0x4012).r(m_seibu_sound, FUNC(seibu_sound_device::main_data_pending_r)); + map(0x4013, 0x4013).portr("COIN"); + map(0x4018, 0x4019).w(m_seibu_sound, FUNC(seibu_sound_device::main_data_w)); + map(0x401b, 0x401b).w(m_seibu_sound, FUNC(seibu_sound_device::coin_w)); + map(0x8000, 0xffff).rom(); +} + +void airraid_state::airraid_sound_decrypted_opcodes_map(address_map &map) +{ + map(0x0000, 0x1fff).r("sei80bu", FUNC(sei80bu_device::opcode_r)); + map(0x8000, 0xffff).rom().region("audiocpu", 0x8000); +} static INPUT_PORTS_START( airraid ) |