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/enigma2.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/enigma2.cpp')
-rw-r--r-- | src/mame/drivers/enigma2.cpp | 96 |
1 files changed, 50 insertions, 46 deletions
diff --git a/src/mame/drivers/enigma2.cpp b/src/mame/drivers/enigma2.cpp index c14cb0c6f74..d1ff8e3d18b 100644 --- a/src/mame/drivers/enigma2.cpp +++ b/src/mame/drivers/enigma2.cpp @@ -438,52 +438,56 @@ CUSTOM_INPUT_MEMBER(enigma2_state::p2_controls_r) return ioport("P1CONTROLS")->read(); } -ADDRESS_MAP_START(enigma2_state::engima2_main_cpu_map) - ADDRESS_MAP_GLOBAL_MASK(0x7fff) - AM_RANGE(0x0000, 0x1fff) AM_ROM AM_WRITENOP - AM_RANGE(0x2000, 0x3fff) AM_MIRROR(0x4000) AM_RAM AM_SHARE("videoram") - AM_RANGE(0x4000, 0x4fff) AM_ROM AM_WRITENOP - AM_RANGE(0x5000, 0x57ff) AM_READ(dip_switch_r) AM_WRITENOP - AM_RANGE(0x5800, 0x5800) AM_MIRROR(0x07f8) AM_NOP - AM_RANGE(0x5801, 0x5801) AM_MIRROR(0x07f8) AM_READ_PORT("IN0") AM_WRITENOP - AM_RANGE(0x5802, 0x5802) AM_MIRROR(0x07f8) AM_READ_PORT("IN1") AM_WRITENOP - AM_RANGE(0x5803, 0x5803) AM_MIRROR(0x07f8) AM_READNOP AM_WRITE(sound_data_w) - AM_RANGE(0x5804, 0x5804) AM_MIRROR(0x07f8) AM_NOP - AM_RANGE(0x5805, 0x5805) AM_MIRROR(0x07f8) AM_READNOP AM_WRITE(enigma2_flip_screen_w) - AM_RANGE(0x5806, 0x5807) AM_MIRROR(0x07f8) AM_NOP -ADDRESS_MAP_END - - -ADDRESS_MAP_START(enigma2_state::engima2a_main_cpu_map) - AM_RANGE(0x0000, 0x1fff) AM_ROM AM_WRITENOP - AM_RANGE(0x2000, 0x3fff) AM_MIRROR(0x4000) AM_RAM AM_SHARE("videoram") - AM_RANGE(0x4000, 0x4fff) AM_ROM AM_WRITENOP - AM_RANGE(0x5000, 0x57ff) AM_READ(dip_switch_r) AM_WRITENOP - AM_RANGE(0x5800, 0x5fff) AM_NOP -ADDRESS_MAP_END - - -ADDRESS_MAP_START(enigma2_state::engima2a_main_cpu_io_map) - ADDRESS_MAP_GLOBAL_MASK(0x7) - AM_RANGE(0x00, 0x00) AM_NOP - AM_RANGE(0x01, 0x01) AM_READ_PORT("IN0") AM_WRITENOP - AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1") AM_WRITENOP - AM_RANGE(0x03, 0x03) AM_READNOP AM_WRITE(sound_data_w) - AM_RANGE(0x04, 0x04) AM_NOP - AM_RANGE(0x05, 0x05) AM_READNOP AM_WRITE(enigma2_flip_screen_w) - AM_RANGE(0x06, 0x07) AM_NOP -ADDRESS_MAP_END - - -ADDRESS_MAP_START(enigma2_state::engima2_audio_cpu_map) - AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x1000) AM_ROM AM_WRITENOP - AM_RANGE(0x2000, 0x7fff) AM_NOP - AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x1c00) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_MIRROR(0x1ffc) AM_DEVWRITE("aysnd", ay8910_device, address_data_w) - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVREAD("aysnd", ay8910_device, data_r) - AM_RANGE(0xa003, 0xa003) AM_MIRROR(0x1ffc) AM_NOP - AM_RANGE(0xc000, 0xffff) AM_NOP -ADDRESS_MAP_END +void enigma2_state::engima2_main_cpu_map(address_map &map) +{ + map.global_mask(0x7fff); + map(0x0000, 0x1fff).rom().nopw(); + map(0x2000, 0x3fff).mirror(0x4000).ram().share("videoram"); + map(0x4000, 0x4fff).rom().nopw(); + map(0x5000, 0x57ff).r(this, FUNC(enigma2_state::dip_switch_r)).nopw(); + map(0x5800, 0x5800).mirror(0x07f8).noprw(); + map(0x5801, 0x5801).mirror(0x07f8).portr("IN0").nopw(); + map(0x5802, 0x5802).mirror(0x07f8).portr("IN1").nopw(); + map(0x5803, 0x5803).mirror(0x07f8).nopr().w(this, FUNC(enigma2_state::sound_data_w)); + map(0x5804, 0x5804).mirror(0x07f8).noprw(); + map(0x5805, 0x5805).mirror(0x07f8).nopr().w(this, FUNC(enigma2_state::enigma2_flip_screen_w)); + map(0x5806, 0x5807).mirror(0x07f8).noprw(); +} + + +void enigma2_state::engima2a_main_cpu_map(address_map &map) +{ + map(0x0000, 0x1fff).rom().nopw(); + map(0x2000, 0x3fff).mirror(0x4000).ram().share("videoram"); + map(0x4000, 0x4fff).rom().nopw(); + map(0x5000, 0x57ff).r(this, FUNC(enigma2_state::dip_switch_r)).nopw(); + map(0x5800, 0x5fff).noprw(); +} + + +void enigma2_state::engima2a_main_cpu_io_map(address_map &map) +{ + map.global_mask(0x7); + map(0x00, 0x00).noprw(); + map(0x01, 0x01).portr("IN0").nopw(); + map(0x02, 0x02).portr("IN1").nopw(); + map(0x03, 0x03).nopr().w(this, FUNC(enigma2_state::sound_data_w)); + map(0x04, 0x04).noprw(); + map(0x05, 0x05).nopr().w(this, FUNC(enigma2_state::enigma2_flip_screen_w)); + map(0x06, 0x07).noprw(); +} + + +void enigma2_state::engima2_audio_cpu_map(address_map &map) +{ + map(0x0000, 0x0fff).mirror(0x1000).rom().nopw(); + map(0x2000, 0x7fff).noprw(); + map(0x8000, 0x83ff).mirror(0x1c00).ram(); + map(0xa000, 0xa001).mirror(0x1ffc).w("aysnd", FUNC(ay8910_device::address_data_w)); + map(0xa002, 0xa002).mirror(0x1ffc).r("aysnd", FUNC(ay8910_device::data_r)); + map(0xa003, 0xa003).mirror(0x1ffc).noprw(); + map(0xc000, 0xffff).noprw(); +} |