summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/cclimber.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-06-08 01:29:39 +1000
committer Vas Crabb <vas@vastheman.com>2018-06-08 01:29:39 +1000
commit93eaa6a4943ade6513257a740fcde97ca9468559 (patch)
tree1340f2160a7064a839b7ca649b2257489cdd3d6d /src/mame/drivers/cclimber.cpp
parentfafafe7050e4d04230656215b840ac53aad081e7 (diff)
as if millions of this pointers suddenly cried out in terror, and were suddenly silenced
* streamline templates in addrmap.h * get rid of overloads on read/write member names - this will become even more important in the near future
Diffstat (limited to 'src/mame/drivers/cclimber.cpp')
-rw-r--r--src/mame/drivers/cclimber.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp
index 67b1d98c97d..088c6d3acac 100644
--- a/src/mame/drivers/cclimber.cpp
+++ b/src/mame/drivers/cclimber.cpp
@@ -334,7 +334,7 @@ void cclimber_state::cclimber_map(address_map &map)
map(0x9800, 0x981f).ram().share("column_scroll");
map(0x9880, 0x989f).ram().share("spriteram");
map(0x98dc, 0x98df).ram().share("bigspritectrl");
- map(0x9c00, 0x9fff).ram().w(this, FUNC(cclimber_state::cclimber_colorram_w)).share("colorram");
+ map(0x9c00, 0x9fff).ram().w(FUNC(cclimber_state::cclimber_colorram_w)).share("colorram");
map(0xa000, 0xa007).w(m_mainlatch, FUNC(ls259_device::write_d0));
map(0xa000, 0xa000).portr("P1");
map(0xa800, 0xa800).portr("P2").w("cclimber_audio", FUNC(cclimber_audio_device::sample_rate_w));
@@ -362,7 +362,7 @@ void cclimber_state::cannonb_map(address_map &map)
map(0x9800, 0x981f).ram().share("column_scroll");
map(0x9880, 0x989f).ram().share("spriteram");
map(0x98dc, 0x98df).ram().share("bigspritectrl");
- map(0x9c00, 0x9fff).ram().w(this, FUNC(cclimber_state::cclimber_colorram_w)).share("colorram");
+ map(0x9c00, 0x9fff).ram().w(FUNC(cclimber_state::cclimber_colorram_w)).share("colorram");
map(0xa000, 0xa007).w(m_mainlatch, FUNC(ls259_device::write_d0));
map(0xa000, 0xa000).portr("P1");
map(0xa800, 0xa800).portr("P2").w("cclimber_audio", FUNC(cclimber_audio_device::sample_rate_w));
@@ -379,10 +379,10 @@ void cclimber_state::swimmer_map(address_map &map)
map(0x9800, 0x981f).writeonly().share("column_scroll");
map(0x9880, 0x989f).writeonly().share("spriteram");
map(0x98fc, 0x98ff).writeonly().share("bigspritectrl");
- map(0x9c00, 0x9fff).ram().w(this, FUNC(cclimber_state::cclimber_colorram_w)).share("colorram");
+ map(0x9c00, 0x9fff).ram().w(FUNC(cclimber_state::cclimber_colorram_w)).share("colorram");
map(0xa000, 0xa007).w(m_mainlatch, FUNC(ls259_device::write_d0));
map(0xa000, 0xa000).portr("P2");
- map(0xa800, 0xa800).portr("P1").w(this, FUNC(cclimber_state::swimmer_sh_soundlatch_w));
+ map(0xa800, 0xa800).portr("P1").w(FUNC(cclimber_state::swimmer_sh_soundlatch_w));
map(0xb000, 0xb000).portr("DSW1");
map(0xb800, 0xb800).portr("DSW2").writeonly().share("bgcolor");
map(0xb880, 0xb880).portr("SYSTEM");
@@ -409,7 +409,7 @@ void cclimber_state::yamato_map(address_map &map)
map(0x9800, 0x981f).ram().share("column_scroll");
map(0x9880, 0x989f).ram().share("spriteram");
map(0x98dc, 0x98df).ram().share("bigspritectrl");
- map(0x9c00, 0x9fff).ram().w(this, FUNC(cclimber_state::cclimber_colorram_w)).share("colorram");
+ map(0x9c00, 0x9fff).ram().w(FUNC(cclimber_state::cclimber_colorram_w)).share("colorram");
map(0xa000, 0xa007).w(m_mainlatch, FUNC(ls259_device::write_d0));
map(0xa000, 0xa000).portr("P1");
map(0xa800, 0xa800).portr("P2");
@@ -458,7 +458,7 @@ void cclimber_state::bagmanf_map(address_map &map)
map(0x9800, 0x9800).portr("SYSTEM");
map(0x98dc, 0x98df).ram().share("bigspritectrl"); // wrong
map(0x9c00, 0x9fff).ram(); /* not used, but initialized */
- map(0xa000, 0xa000).r(this, FUNC(cclimber_state::bagmanf_a000_r));
+ map(0xa000, 0xa000).r(FUNC(cclimber_state::bagmanf_a000_r));
map(0xa000, 0xa007).w(m_mainlatch, FUNC(ls259_device::write_d0));
map(0xa800, 0xa800).nopr().w("cclimber_audio", FUNC(cclimber_audio_device::sample_rate_w));
map(0xb000, 0xb000).portr("DSW").w("cclimber_audio", FUNC(cclimber_audio_device::sample_volume_w));
@@ -481,8 +481,8 @@ void cclimber_state::cclimber_portmap(address_map &map)
void cclimber_state::yamato_portmap(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x00).w(this, FUNC(cclimber_state::yamato_p0_w)); /* ??? */
- map(0x01, 0x01).w(this, FUNC(cclimber_state::yamato_p1_w)); /* ??? */
+ map(0x00, 0x00).w(FUNC(cclimber_state::yamato_p0_w)); /* ??? */
+ map(0x01, 0x01).w(FUNC(cclimber_state::yamato_p1_w)); /* ??? */
}
@@ -513,8 +513,8 @@ void cclimber_state::yamato_audio_portmap(address_map &map)
map.global_mask(0xff);
map(0x00, 0x01).w("ay1", FUNC(ay8910_device::address_data_w));
map(0x02, 0x03).w("ay2", FUNC(ay8910_device::address_data_w));
- map(0x04, 0x04).r(this, FUNC(cclimber_state::yamato_p0_r)); /* ??? */
- map(0x08, 0x08).r(this, FUNC(cclimber_state::yamato_p1_r)); /* ??? */
+ map(0x04, 0x04).r(FUNC(cclimber_state::yamato_p0_r)); /* ??? */
+ map(0x08, 0x08).r(FUNC(cclimber_state::yamato_p1_r)); /* ??? */
}
@@ -1141,7 +1141,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cclimber_state::cclimber)
root(config);
MCFG_DEVICE_MODIFY("mainlatch") // 7J on CCG-1
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("cclimber_audio", cclimber_audio_device, sample_trigger_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("cclimber_audio", cclimber_audio_device, sample_trigger))
/* sound hardware */
SPEAKER(config, "speaker").front_center();