diff options
Diffstat (limited to 'src/mame/drivers/ssozumo.cpp')
-rw-r--r-- | src/mame/drivers/ssozumo.cpp | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/src/mame/drivers/ssozumo.cpp b/src/mame/drivers/ssozumo.cpp index 2c8a2f32d42..45b4593c789 100644 --- a/src/mame/drivers/ssozumo.cpp +++ b/src/mame/drivers/ssozumo.cpp @@ -28,23 +28,24 @@ void ssozumo_state::machine_start() } -ADDRESS_MAP_START(ssozumo_state::ssozumo_map) - AM_RANGE(0x0000, 0x077f) AM_RAM - AM_RANGE(0x0780, 0x07ff) AM_RAM AM_SHARE("spriteram") - AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(videoram2_w) AM_SHARE("videoram2") - AM_RANGE(0x2400, 0x27ff) AM_RAM_WRITE(colorram2_w) AM_SHARE("colorram2") - AM_RANGE(0x3000, 0x31ff) AM_RAM_WRITE(videoram_w) AM_SHARE("videoram") - AM_RANGE(0x3200, 0x33ff) AM_RAM_WRITE(colorram_w) AM_SHARE("colorram") - AM_RANGE(0x3400, 0x35ff) AM_RAM - AM_RANGE(0x3600, 0x37ff) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_READ_PORT("P1") AM_WRITE(flipscreen_w) - AM_RANGE(0x4010, 0x4010) AM_READ_PORT("P2") AM_DEVWRITE("soundlatch", generic_latch_8_device, write) - AM_RANGE(0x4020, 0x4020) AM_READ_PORT("DSW2") AM_WRITE(scroll_w) - AM_RANGE(0x4030, 0x4030) AM_READ_PORT("DSW1") +void ssozumo_state::ssozumo_map(address_map &map) +{ + map(0x0000, 0x077f).ram(); + map(0x0780, 0x07ff).ram().share("spriteram"); + map(0x2000, 0x23ff).ram().w(this, FUNC(ssozumo_state::videoram2_w)).share("videoram2"); + map(0x2400, 0x27ff).ram().w(this, FUNC(ssozumo_state::colorram2_w)).share("colorram2"); + map(0x3000, 0x31ff).ram().w(this, FUNC(ssozumo_state::videoram_w)).share("videoram"); + map(0x3200, 0x33ff).ram().w(this, FUNC(ssozumo_state::colorram_w)).share("colorram"); + map(0x3400, 0x35ff).ram(); + map(0x3600, 0x37ff).ram(); + map(0x4000, 0x4000).portr("P1").w(this, FUNC(ssozumo_state::flipscreen_w)); + map(0x4010, 0x4010).portr("P2").w("soundlatch", FUNC(generic_latch_8_device::write)); + map(0x4020, 0x4020).portr("DSW2").w(this, FUNC(ssozumo_state::scroll_w)); + map(0x4030, 0x4030).portr("DSW1"); // AM_RANGE(0x4030, 0x4030) AM_WRITEONLY - AM_RANGE(0x4050, 0x407f) AM_RAM_WRITE(paletteram_w) AM_SHARE("paletteram") - AM_RANGE(0x6000, 0xffff) AM_ROM -ADDRESS_MAP_END + map(0x4050, 0x407f).ram().w(this, FUNC(ssozumo_state::paletteram_w)).share("paletteram"); + map(0x6000, 0xffff).rom(); +} WRITE8_MEMBER(ssozumo_state::sound_nmi_mask_w) @@ -53,15 +54,16 @@ WRITE8_MEMBER(ssozumo_state::sound_nmi_mask_w) } /* Same as Tag Team */ -ADDRESS_MAP_START(ssozumo_state::ssozumo_sound_map) - AM_RANGE(0x0000, 0x01ff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ay1", ay8910_device, data_address_w) - AM_RANGE(0x2002, 0x2003) AM_DEVWRITE("ay2", ay8910_device, data_address_w) - AM_RANGE(0x2004, 0x2004) AM_DEVWRITE("dac", dac_byte_interface, write) - AM_RANGE(0x2005, 0x2005) AM_WRITE(sound_nmi_mask_w) - AM_RANGE(0x2007, 0x2007) AM_DEVREAD("soundlatch", generic_latch_8_device, read) - AM_RANGE(0x4000, 0xffff) AM_ROM -ADDRESS_MAP_END +void ssozumo_state::ssozumo_sound_map(address_map &map) +{ + map(0x0000, 0x01ff).ram(); + map(0x2000, 0x2001).w("ay1", FUNC(ay8910_device::data_address_w)); + map(0x2002, 0x2003).w("ay2", FUNC(ay8910_device::data_address_w)); + map(0x2004, 0x2004).w("dac", FUNC(dac_byte_interface::write)); + map(0x2005, 0x2005).w(this, FUNC(ssozumo_state::sound_nmi_mask_w)); + map(0x2007, 0x2007).r("soundlatch", FUNC(generic_latch_8_device::read)); + map(0x4000, 0xffff).rom(); +} INPUT_CHANGED_MEMBER(ssozumo_state::coin_inserted) { |