diff options
Diffstat (limited to 'src/mame/drivers/cntsteer.cpp')
-rw-r--r-- | src/mame/drivers/cntsteer.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp index 5e3b8a3cbe7..c4060615e8e 100644 --- a/src/mame/drivers/cntsteer.cpp +++ b/src/mame/drivers/cntsteer.cpp @@ -584,23 +584,23 @@ void cntsteer_state::gekitsui_cpu1_map(address_map &map) map(0x0000, 0x0fff).ram().share("share1"); map(0x1000, 0x11ff).ram().share("spriteram"); map(0x1200, 0x1fff).ram(); - map(0x2000, 0x23ff).ram().w(this, FUNC(cntsteer_state::cntsteer_foreground_vram_w)).share("videoram"); - map(0x2400, 0x27ff).ram().w(this, FUNC(cntsteer_state::cntsteer_foreground_attr_w)).share("colorram"); - map(0x3000, 0x3003).w(this, FUNC(cntsteer_state::zerotrgt_ctrl_w)); + map(0x2000, 0x23ff).ram().w(FUNC(cntsteer_state::cntsteer_foreground_vram_w)).share("videoram"); + map(0x2400, 0x27ff).ram().w(FUNC(cntsteer_state::cntsteer_foreground_attr_w)).share("colorram"); + map(0x3000, 0x3003).w(FUNC(cntsteer_state::zerotrgt_ctrl_w)); map(0x8000, 0xffff).rom(); } void cntsteer_state::gekitsui_cpu2_map(address_map &map) { map(0x0000, 0x0fff).ram().share("share1"); - map(0x1000, 0x1fff).ram().w(this, FUNC(cntsteer_state::cntsteer_background_w)).share("videoram2"); + map(0x1000, 0x1fff).ram().w(FUNC(cntsteer_state::cntsteer_background_w)).share("videoram2"); map(0x3000, 0x3000).portr("DSW0"); map(0x3001, 0x3001).portr("P2"); map(0x3002, 0x3002).portr("P1"); map(0x3003, 0x3003).portr("COINS"); - map(0x3000, 0x3004).w(this, FUNC(cntsteer_state::zerotrgt_vregs_w)); - map(0x3005, 0x3005).w(this, FUNC(cntsteer_state::gekitsui_sub_irq_ack)); - map(0x3007, 0x3007).w(this, FUNC(cntsteer_state::cntsteer_sound_w)); + map(0x3000, 0x3004).w(FUNC(cntsteer_state::zerotrgt_vregs_w)); + map(0x3005, 0x3005).w(FUNC(cntsteer_state::gekitsui_sub_irq_ack)); + map(0x3007, 0x3007).w(FUNC(cntsteer_state::cntsteer_sound_w)); map(0x4000, 0xffff).rom(); } @@ -608,26 +608,26 @@ void cntsteer_state::cntsteer_cpu1_map(address_map &map) { map(0x0000, 0x0fff).ram().share("share1"); map(0x1000, 0x11ff).ram().share("spriteram"); - map(0x2000, 0x23ff).ram().w(this, FUNC(cntsteer_state::cntsteer_foreground_vram_w)).share("videoram"); - map(0x2400, 0x27ff).ram().w(this, FUNC(cntsteer_state::cntsteer_foreground_attr_w)).share("colorram"); - map(0x3000, 0x3000).w(this, FUNC(cntsteer_state::cntsteer_sub_nmi_w)); - map(0x3001, 0x3001).w(this, FUNC(cntsteer_state::cntsteer_sub_irq_w)); + map(0x2000, 0x23ff).ram().w(FUNC(cntsteer_state::cntsteer_foreground_vram_w)).share("videoram"); + map(0x2400, 0x27ff).ram().w(FUNC(cntsteer_state::cntsteer_foreground_attr_w)).share("colorram"); + map(0x3000, 0x3000).w(FUNC(cntsteer_state::cntsteer_sub_nmi_w)); + map(0x3001, 0x3001).w(FUNC(cntsteer_state::cntsteer_sub_irq_w)); map(0x8000, 0xffff).rom(); } void cntsteer_state::cntsteer_cpu2_map(address_map &map) { map(0x0000, 0x0fff).ram().share("share1"); - map(0x1000, 0x1fff).ram().w(this, FUNC(cntsteer_state::cntsteer_background_w)).share("videoram2"); - map(0x2000, 0x2fff).rw(this, FUNC(cntsteer_state::cntsteer_background_mirror_r), FUNC(cntsteer_state::cntsteer_background_w)); + map(0x1000, 0x1fff).ram().w(FUNC(cntsteer_state::cntsteer_background_w)).share("videoram2"); + map(0x2000, 0x2fff).rw(FUNC(cntsteer_state::cntsteer_background_mirror_r), FUNC(cntsteer_state::cntsteer_background_w)); map(0x3000, 0x3000).portr("DSW0"); - map(0x3001, 0x3001).r(this, FUNC(cntsteer_state::cntsteer_adx_r)); + map(0x3001, 0x3001).r(FUNC(cntsteer_state::cntsteer_adx_r)); map(0x3002, 0x3002).portr("P1"); map(0x3003, 0x3003).portr("COINS"); - map(0x3000, 0x3004).w(this, FUNC(cntsteer_state::cntsteer_vregs_w)); - map(0x3005, 0x3005).w(this, FUNC(cntsteer_state::gekitsui_sub_irq_ack)); - map(0x3006, 0x3006).w(this, FUNC(cntsteer_state::cntsteer_main_irq_w)); - map(0x3007, 0x3007).w(this, FUNC(cntsteer_state::cntsteer_sound_w)); + map(0x3000, 0x3004).w(FUNC(cntsteer_state::cntsteer_vregs_w)); + map(0x3005, 0x3005).w(FUNC(cntsteer_state::gekitsui_sub_irq_ack)); + map(0x3006, 0x3006).w(FUNC(cntsteer_state::cntsteer_main_irq_w)); + map(0x3007, 0x3007).w(FUNC(cntsteer_state::cntsteer_sound_w)); map(0x3007, 0x3007).nopr(); //m6809 bug. map(0x4000, 0xffff).rom(); } @@ -667,7 +667,7 @@ void cntsteer_state::sound_map(address_map &map) map(0x6000, 0x6000).w("ay2", FUNC(ay8910_device::data_w)); map(0x8000, 0x8000).w("ay2", FUNC(ay8910_device::address_w)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xd000, 0xd000).w(this, FUNC(cntsteer_state::nmimask_w)); + map(0xd000, 0xd000).w(FUNC(cntsteer_state::nmimask_w)); map(0xe000, 0xffff).rom(); } @@ -961,7 +961,7 @@ MACHINE_CONFIG_START(cntsteer_state::cntsteer) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_DEVICE_ADD("ay1", AY8910, 1500000) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) MCFG_DEVICE_ADD("ay2", AY8910, 1500000) |