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/astinvad.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/astinvad.cpp')
-rw-r--r-- | src/mame/drivers/astinvad.cpp | 62 |
1 files changed, 33 insertions, 29 deletions
diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp index 3d81d757201..e02932b471b 100644 --- a/src/mame/drivers/astinvad.cpp +++ b/src/mame/drivers/astinvad.cpp @@ -475,35 +475,39 @@ WRITE8_MEMBER(astinvad_state::spaceint_sound2_w) * *************************************/ -ADDRESS_MAP_START(astinvad_state::kamikaze_map) - ADDRESS_MAP_GLOBAL_MASK(0x3fff) - AM_RANGE(0x0000, 0x1bff) AM_ROM - AM_RANGE(0x1c00, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("videoram") -ADDRESS_MAP_END - - -ADDRESS_MAP_START(astinvad_state::spaceint_map) - AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x23ff) AM_RAM - AM_RANGE(0x4000, 0x5fff) AM_RAM_WRITE(spaceint_videoram_w) AM_SHARE("videoram") -ADDRESS_MAP_END - - -ADDRESS_MAP_START(astinvad_state::kamikaze_portmap) - ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0xff) AM_READWRITE(kamikaze_ppi_r, kamikaze_ppi_w) -ADDRESS_MAP_END - - -ADDRESS_MAP_START(astinvad_state::spaceint_portmap) - ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") - AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") - AM_RANGE(0x02, 0x02) AM_WRITE(spaceint_sound1_w) - AM_RANGE(0x03, 0x03) AM_WRITE(color_latch_w) - AM_RANGE(0x04, 0x04) AM_WRITE(spaceint_sound2_w) -ADDRESS_MAP_END +void astinvad_state::kamikaze_map(address_map &map) +{ + map.global_mask(0x3fff); + map(0x0000, 0x1bff).rom(); + map(0x1c00, 0x1fff).ram(); + map(0x2000, 0x3fff).ram().share("videoram"); +} + + +void astinvad_state::spaceint_map(address_map &map) +{ + map(0x0000, 0x1fff).rom(); + map(0x2000, 0x23ff).ram(); + map(0x4000, 0x5fff).ram().w(this, FUNC(astinvad_state::spaceint_videoram_w)).share("videoram"); +} + + +void astinvad_state::kamikaze_portmap(address_map &map) +{ + map.global_mask(0xff); + map(0x00, 0xff).rw(this, FUNC(astinvad_state::kamikaze_ppi_r), FUNC(astinvad_state::kamikaze_ppi_w)); +} + + +void astinvad_state::spaceint_portmap(address_map &map) +{ + map.global_mask(0xff); + map(0x00, 0x00).portr("IN0"); + map(0x01, 0x01).portr("IN1"); + map(0x02, 0x02).w(this, FUNC(astinvad_state::spaceint_sound1_w)); + map(0x03, 0x03).w(this, FUNC(astinvad_state::color_latch_w)); + map(0x04, 0x04).w(this, FUNC(astinvad_state::spaceint_sound2_w)); +} |