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/meadows.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/meadows.cpp')
-rw-r--r-- | src/mame/drivers/meadows.cpp | 99 |
1 files changed, 52 insertions, 47 deletions
diff --git a/src/mame/drivers/meadows.cpp b/src/mame/drivers/meadows.cpp index acf8f0ad914..2c9591502fa 100644 --- a/src/mame/drivers/meadows.cpp +++ b/src/mame/drivers/meadows.cpp @@ -323,48 +323,52 @@ INTERRUPT_GEN_MEMBER(meadows_state::audio_interrupt) * *************************************/ -ADDRESS_MAP_START(meadows_state::meadows_main_map) - AM_RANGE(0x0000, 0x0bff) AM_ROM - AM_RANGE(0x0c00, 0x0c00) AM_READ_PORT("INPUTS") - AM_RANGE(0x0c01, 0x0c01) AM_READ_PORT("STICK") - AM_RANGE(0x0c02, 0x0c02) AM_READ(hsync_chain_r) - AM_RANGE(0x0c03, 0x0c03) AM_READ_PORT("DSW") - AM_RANGE(0x0c00, 0x0c03) AM_WRITE(meadows_audio_w) - AM_RANGE(0x0d00, 0x0d0f) AM_WRITE(meadows_spriteram_w) AM_SHARE("spriteram") - AM_RANGE(0x0e00, 0x0eff) AM_RAM - AM_RANGE(0x1000, 0x1bff) AM_ROM - AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(meadows_videoram_w) AM_SHARE("videoram") -ADDRESS_MAP_END - -ADDRESS_MAP_START(meadows_state::bowl3d_main_map) - AM_RANGE(0x0000, 0x0bff) AM_ROM - AM_RANGE(0x0c00, 0x0c00) AM_READ_PORT("INPUTS1") - AM_RANGE(0x0c01, 0x0c01) AM_READ_PORT("INPUTS2") - AM_RANGE(0x0c02, 0x0c02) AM_READ(hsync_chain_r) - AM_RANGE(0x0c03, 0x0c03) AM_READ_PORT("DSW") - AM_RANGE(0x0c00, 0x0c03) AM_WRITE(meadows_audio_w) - AM_RANGE(0x0d00, 0x0d0f) AM_WRITE(meadows_spriteram_w) AM_SHARE("spriteram") - AM_RANGE(0x0e00, 0x0eff) AM_RAM - AM_RANGE(0x1000, 0x1bff) AM_ROM - AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(meadows_videoram_w) AM_SHARE("videoram") -ADDRESS_MAP_END - -ADDRESS_MAP_START(meadows_state::minferno_main_map) - AM_RANGE(0x0000, 0x0bff) AM_ROM - AM_RANGE(0x1c00, 0x1eff) AM_RAM_WRITE(meadows_videoram_w) AM_SHARE("videoram") - AM_RANGE(0x1f00, 0x1f00) AM_READ_PORT("JOY1") - AM_RANGE(0x1f01, 0x1f01) AM_READ_PORT("JOY2") - AM_RANGE(0x1f02, 0x1f02) AM_READ_PORT("BUTTONS") - AM_RANGE(0x1f03, 0x1f03) AM_READ_PORT("DSW1") - AM_RANGE(0x1f00, 0x1f03) AM_WRITE(meadows_audio_w) - AM_RANGE(0x1f04, 0x1f04) AM_READ(vsync_chain_hi_r) - AM_RANGE(0x1f05, 0x1f05) AM_READ(vsync_chain_lo_r) -ADDRESS_MAP_END - - -ADDRESS_MAP_START(meadows_state::minferno_data_map) - AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ_PORT("DSW2") -ADDRESS_MAP_END +void meadows_state::meadows_main_map(address_map &map) +{ + map(0x0000, 0x0bff).rom(); + map(0x0c00, 0x0c00).portr("INPUTS"); + map(0x0c01, 0x0c01).portr("STICK"); + map(0x0c02, 0x0c02).r(this, FUNC(meadows_state::hsync_chain_r)); + map(0x0c03, 0x0c03).portr("DSW"); + map(0x0c00, 0x0c03).w(this, FUNC(meadows_state::meadows_audio_w)); + map(0x0d00, 0x0d0f).w(this, FUNC(meadows_state::meadows_spriteram_w)).share("spriteram"); + map(0x0e00, 0x0eff).ram(); + map(0x1000, 0x1bff).rom(); + map(0x1c00, 0x1fff).ram().w(this, FUNC(meadows_state::meadows_videoram_w)).share("videoram"); +} + +void meadows_state::bowl3d_main_map(address_map &map) +{ + map(0x0000, 0x0bff).rom(); + map(0x0c00, 0x0c00).portr("INPUTS1"); + map(0x0c01, 0x0c01).portr("INPUTS2"); + map(0x0c02, 0x0c02).r(this, FUNC(meadows_state::hsync_chain_r)); + map(0x0c03, 0x0c03).portr("DSW"); + map(0x0c00, 0x0c03).w(this, FUNC(meadows_state::meadows_audio_w)); + map(0x0d00, 0x0d0f).w(this, FUNC(meadows_state::meadows_spriteram_w)).share("spriteram"); + map(0x0e00, 0x0eff).ram(); + map(0x1000, 0x1bff).rom(); + map(0x1c00, 0x1fff).ram().w(this, FUNC(meadows_state::meadows_videoram_w)).share("videoram"); +} + +void meadows_state::minferno_main_map(address_map &map) +{ + map(0x0000, 0x0bff).rom(); + map(0x1c00, 0x1eff).ram().w(this, FUNC(meadows_state::meadows_videoram_w)).share("videoram"); + map(0x1f00, 0x1f00).portr("JOY1"); + map(0x1f01, 0x1f01).portr("JOY2"); + map(0x1f02, 0x1f02).portr("BUTTONS"); + map(0x1f03, 0x1f03).portr("DSW1"); + map(0x1f00, 0x1f03).w(this, FUNC(meadows_state::meadows_audio_w)); + map(0x1f04, 0x1f04).r(this, FUNC(meadows_state::vsync_chain_hi_r)); + map(0x1f05, 0x1f05).r(this, FUNC(meadows_state::vsync_chain_lo_r)); +} + + +void meadows_state::minferno_data_map(address_map &map) +{ + map(S2650_DATA_PORT, S2650_DATA_PORT).portr("DSW2"); +} @@ -374,11 +378,12 @@ ADDRESS_MAP_END * *************************************/ -ADDRESS_MAP_START(meadows_state::audio_map) - AM_RANGE(0x0000, 0x0bff) AM_ROM - AM_RANGE(0x0c00, 0x0c03) AM_READWRITE(audio_hardware_r, audio_hardware_w) - AM_RANGE(0x0e00, 0x0eff) AM_RAM -ADDRESS_MAP_END +void meadows_state::audio_map(address_map &map) +{ + map(0x0000, 0x0bff).rom(); + map(0x0c00, 0x0c03).rw(this, FUNC(meadows_state::audio_hardware_r), FUNC(meadows_state::audio_hardware_w)); + map(0x0e00, 0x0eff).ram(); +} |