diff options
Diffstat (limited to 'src/mame/drivers/lsasquad.cpp')
-rw-r--r-- | src/mame/drivers/lsasquad.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp index efd8f870659..3dabe8bc4bf 100644 --- a/src/mame/drivers/lsasquad.cpp +++ b/src/mame/drivers/lsasquad.cpp @@ -181,15 +181,15 @@ void lsasquad_state::lsasquad_map(address_map &map) map(0xe800, 0xe800).portr("DSWA"); map(0xe801, 0xe801).portr("DSWB"); map(0xe802, 0xe802).portr("DSWC"); - map(0xe803, 0xe803).r(this, FUNC(lsasquad_state::lsasquad_mcu_status_r)); /* COIN + 68705 status */ + map(0xe803, 0xe803).r(FUNC(lsasquad_state::lsasquad_mcu_status_r)); /* COIN + 68705 status */ map(0xe804, 0xe804).portr("P1"); map(0xe805, 0xe805).portr("P2"); map(0xe806, 0xe806).portr("START"); map(0xe807, 0xe807).portr("SERVICE"); - map(0xea00, 0xea00).w(this, FUNC(lsasquad_state::lsasquad_bankswitch_w)); + map(0xea00, 0xea00).w(FUNC(lsasquad_state::lsasquad_bankswitch_w)); map(0xec00, 0xec00).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); map(0xec00, 0xec00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xec01, 0xec01).r(this, FUNC(lsasquad_state::lsasquad_sound_status_r)); + map(0xec01, 0xec01).r(FUNC(lsasquad_state::lsasquad_sound_status_r)); map(0xee00, 0xee00).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); } @@ -201,9 +201,9 @@ void lsasquad_state::lsasquad_sound_map(address_map &map) map(0xc000, 0xc001).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0xd000, 0xd000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xd000, 0xd000).w(m_soundlatch2, FUNC(generic_latch_8_device::write)); - map(0xd400, 0xd400).w(this, FUNC(lsasquad_state::lsasquad_sh_nmi_disable_w)); - map(0xd800, 0xd800).w(this, FUNC(lsasquad_state::lsasquad_sh_nmi_enable_w)); - map(0xd800, 0xd800).r(this, FUNC(lsasquad_state::lsasquad_sound_status_r)); + map(0xd400, 0xd400).w(FUNC(lsasquad_state::lsasquad_sh_nmi_disable_w)); + map(0xd800, 0xd800).w(FUNC(lsasquad_state::lsasquad_sh_nmi_enable_w)); + map(0xd800, 0xd800).r(FUNC(lsasquad_state::lsasquad_sound_status_r)); map(0xe000, 0xefff).rom(); /* space for diagnostic ROM? */ } @@ -225,10 +225,10 @@ void lsasquad_state::storming_map(address_map &map) map(0xe805, 0xe805).portr("P2"); map(0xe806, 0xe806).portr("START"); map(0xe807, 0xe807).portr("SERVICE"); - map(0xea00, 0xea00).w(this, FUNC(lsasquad_state::lsasquad_bankswitch_w)); + map(0xea00, 0xea00).w(FUNC(lsasquad_state::lsasquad_bankswitch_w)); map(0xec00, 0xec00).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); map(0xec00, 0xec00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xec01, 0xec01).r(this, FUNC(lsasquad_state::lsasquad_sound_status_r)); + map(0xec01, 0xec01).r(FUNC(lsasquad_state::lsasquad_sound_status_r)); } @@ -384,12 +384,12 @@ void lsasquad_state::daikaiju_map(address_map &map) map(0xe400, 0xe7ff).ram().share("spriteram"); /* OBJECT RAM */ map(0xe800, 0xe800).portr("DSWA"); map(0xe801, 0xe801).portr("DSWB"); - map(0xe803, 0xe803).r(this, FUNC(lsasquad_state::daikaiju_mcu_status_r)); /* COIN + 68705 status */ + map(0xe803, 0xe803).r(FUNC(lsasquad_state::daikaiju_mcu_status_r)); /* COIN + 68705 status */ map(0xe804, 0xe804).portr("P1"); map(0xe805, 0xe805).portr("P2"); map(0xe806, 0xe806).portr("START"); map(0xe807, 0xe807).portr("SERVICE"); - map(0xea00, 0xea00).w(this, FUNC(lsasquad_state::lsasquad_bankswitch_w)); + map(0xea00, 0xea00).w(FUNC(lsasquad_state::lsasquad_bankswitch_w)); map(0xec00, 0xec00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xee00, 0xee00).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); } @@ -401,8 +401,8 @@ void lsasquad_state::daikaiju_sound_map(address_map &map) map(0xa000, 0xa001).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xc000, 0xc001).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0xd000, 0xd000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xd400, 0xd400).w(this, FUNC(lsasquad_state::lsasquad_sh_nmi_disable_w)); - map(0xd800, 0xd800).rw(this, FUNC(lsasquad_state::daikaiju_sound_status_r), FUNC(lsasquad_state::lsasquad_sh_nmi_enable_w)); + map(0xd400, 0xd400).w(FUNC(lsasquad_state::lsasquad_sh_nmi_disable_w)); + map(0xd800, 0xd800).rw(FUNC(lsasquad_state::daikaiju_sound_status_r), FUNC(lsasquad_state::lsasquad_sh_nmi_enable_w)); map(0xdc00, 0xdc00).nopw(); map(0xe000, 0xefff).rom(); /* space for diagnostic ROM? */ } |