diff options
Diffstat (limited to 'src/mame/drivers/tagteam.cpp')
-rw-r--r-- | src/mame/drivers/tagteam.cpp | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/src/mame/drivers/tagteam.cpp b/src/mame/drivers/tagteam.cpp index 2811347c761..f357602d65f 100644 --- a/src/mame/drivers/tagteam.cpp +++ b/src/mame/drivers/tagteam.cpp @@ -47,19 +47,20 @@ WRITE8_MEMBER(tagteam_state::irq_clear_w) m_maincpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); } -ADDRESS_MAP_START(tagteam_state::main_map) - AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x2000, 0x2000) AM_READ_PORT("P2") AM_WRITE(flipscreen_w) - AM_RANGE(0x2001, 0x2001) AM_READ_PORT("P1") AM_WRITE(control_w) - AM_RANGE(0x2002, 0x2002) AM_READ_PORT("DSW1") AM_DEVWRITE("soundlatch", generic_latch_8_device, write) - AM_RANGE(0x2003, 0x2003) AM_READ_PORT("DSW2") AM_WRITE(irq_clear_w) - AM_RANGE(0x4000, 0x43ff) AM_READWRITE(mirrorvideoram_r, mirrorvideoram_w) - AM_RANGE(0x4400, 0x47ff) AM_READWRITE(mirrorcolorram_r, mirrorcolorram_w) - AM_RANGE(0x4800, 0x4fff) AM_READONLY - AM_RANGE(0x4800, 0x4bff) AM_WRITE(videoram_w) AM_SHARE("videoram") - AM_RANGE(0x4c00, 0x4fff) AM_WRITE(colorram_w) AM_SHARE("colorram") - AM_RANGE(0x8000, 0xffff) AM_ROM -ADDRESS_MAP_END +void tagteam_state::main_map(address_map &map) +{ + map(0x0000, 0x07ff).ram(); + map(0x2000, 0x2000).portr("P2").w(this, FUNC(tagteam_state::flipscreen_w)); + map(0x2001, 0x2001).portr("P1").w(this, FUNC(tagteam_state::control_w)); + map(0x2002, 0x2002).portr("DSW1").w(m_soundlatch, FUNC(generic_latch_8_device::write)); + map(0x2003, 0x2003).portr("DSW2").w(this, FUNC(tagteam_state::irq_clear_w)); + map(0x4000, 0x43ff).rw(this, FUNC(tagteam_state::mirrorvideoram_r), FUNC(tagteam_state::mirrorvideoram_w)); + map(0x4400, 0x47ff).rw(this, FUNC(tagteam_state::mirrorcolorram_r), FUNC(tagteam_state::mirrorcolorram_w)); + map(0x4800, 0x4fff).readonly(); + map(0x4800, 0x4bff).w(this, FUNC(tagteam_state::videoram_w)).share("videoram"); + map(0x4c00, 0x4fff).w(this, FUNC(tagteam_state::colorram_w)).share("colorram"); + map(0x8000, 0xffff).rom(); +} WRITE8_MEMBER(tagteam_state::sound_nmi_mask_w) { @@ -67,15 +68,16 @@ WRITE8_MEMBER(tagteam_state::sound_nmi_mask_w) } /* Same as Syusse Oozumou */ -ADDRESS_MAP_START(tagteam_state::sound_map) - AM_RANGE(0x0000, 0x03ff) 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 tagteam_state::sound_map(address_map &map) +{ + map(0x0000, 0x03ff).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(tagteam_state::sound_nmi_mask_w)); + map(0x2007, 0x2007).r(m_soundlatch, FUNC(generic_latch_8_device::read)); + map(0x4000, 0xffff).rom(); +} INPUT_CHANGED_MEMBER(tagteam_state::coin_inserted) |