diff options
Diffstat (limited to 'src/mame/drivers/mmagic.cpp')
-rw-r--r-- | src/mame/drivers/mmagic.cpp | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/mame/drivers/mmagic.cpp b/src/mame/drivers/mmagic.cpp index 293065e7598..1d111de6ba1 100644 --- a/src/mame/drivers/mmagic.cpp +++ b/src/mame/drivers/mmagic.cpp @@ -117,24 +117,26 @@ private: // ADDRESS MAPS //************************************************************************** -ADDRESS_MAP_START(mmagic_state::mmagic_mem) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x17ff) AM_ROM - AM_RANGE(0x2000, 0x21ff) AM_RAM - AM_RANGE(0x3000, 0x31ff) AM_RAM AM_SHARE("vram") - AM_RANGE(0x8002, 0x8002) AM_WRITE(ball_x_w) - AM_RANGE(0x8003, 0x8003) AM_WRITE(ball_y_w) - AM_RANGE(0x8004, 0x8004) AM_READ(vblank_r) -ADDRESS_MAP_END - -ADDRESS_MAP_START(mmagic_state::mmagic_io) - ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x80, 0x80) AM_WRITE(color_w) - AM_RANGE(0x81, 0x81) AM_WRITE(audio_w) - AM_RANGE(0x85, 0x85) AM_READ_PORT("paddle") - AM_RANGE(0x86, 0x86) AM_READ_PORT("buttons") - AM_RANGE(0x87, 0x87) AM_READ_PORT("dipswitch") -ADDRESS_MAP_END +void mmagic_state::mmagic_mem(address_map &map) +{ + map.unmap_value_high(); + map(0x0000, 0x17ff).rom(); + map(0x2000, 0x21ff).ram(); + map(0x3000, 0x31ff).ram().share("vram"); + map(0x8002, 0x8002).w(this, FUNC(mmagic_state::ball_x_w)); + map(0x8003, 0x8003).w(this, FUNC(mmagic_state::ball_y_w)); + map(0x8004, 0x8004).r(this, FUNC(mmagic_state::vblank_r)); +} + +void mmagic_state::mmagic_io(address_map &map) +{ + map.global_mask(0xff); + map(0x80, 0x80).w(this, FUNC(mmagic_state::color_w)); + map(0x81, 0x81).w(this, FUNC(mmagic_state::audio_w)); + map(0x85, 0x85).portr("paddle"); + map(0x86, 0x86).portr("buttons"); + map(0x87, 0x87).portr("dipswitch"); +} //************************************************************************** |