summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/atari_s2.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/atari_s2.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/atari_s2.cpp')
-rw-r--r--src/mame/drivers/atari_s2.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp
index 8ea5f31af1f..1226c39504c 100644
--- a/src/mame/drivers/atari_s2.cpp
+++ b/src/mame/drivers/atari_s2.cpp
@@ -93,14 +93,14 @@ void atari_s2_state::atari_s2_map(address_map &map)
map(0x1005, 0x1005).mirror(0x07F8).portr("SWITCH.5");
map(0x1006, 0x1006).mirror(0x07F8).portr("SWITCH.6");
map(0x1007, 0x1007).mirror(0x07F8).portr("SWITCH.7");
- map(0x1800, 0x1800).mirror(0x071F).w(this, FUNC(atari_s2_state::sound0_w));
- map(0x1820, 0x1820).mirror(0x071F).w(this, FUNC(atari_s2_state::sound1_w));
- map(0x1840, 0x1847).mirror(0x0718).w(this, FUNC(atari_s2_state::display_w));
- map(0x1860, 0x1867).mirror(0x0718).w(this, FUNC(atari_s2_state::lamp_w));
- map(0x1880, 0x1880).mirror(0x071F).w(this, FUNC(atari_s2_state::sol0_w));
- map(0x18a0, 0x18a7).mirror(0x0718).w(this, FUNC(atari_s2_state::sol1_w));
+ map(0x1800, 0x1800).mirror(0x071F).w(FUNC(atari_s2_state::sound0_w));
+ map(0x1820, 0x1820).mirror(0x071F).w(FUNC(atari_s2_state::sound1_w));
+ map(0x1840, 0x1847).mirror(0x0718).w(FUNC(atari_s2_state::display_w));
+ map(0x1860, 0x1867).mirror(0x0718).w(FUNC(atari_s2_state::lamp_w));
+ map(0x1880, 0x1880).mirror(0x071F).w(FUNC(atari_s2_state::sol0_w));
+ map(0x18a0, 0x18a7).mirror(0x0718).w(FUNC(atari_s2_state::sol1_w));
map(0x18c0, 0x18c0).mirror(0x071F).w("watchdog", FUNC(watchdog_timer_device::reset_w));
- map(0x18e0, 0x18e0).mirror(0x071F).w(this, FUNC(atari_s2_state::intack_w));
+ map(0x18e0, 0x18e0).mirror(0x071F).w(FUNC(atari_s2_state::intack_w));
map(0x2000, 0x2000).mirror(0x07FC).portr("DSW0");
map(0x2001, 0x2001).mirror(0x07FC).portr("DSW1");
map(0x2002, 0x2002).mirror(0x07FC).portr("DSW2");
@@ -121,14 +121,14 @@ void atari_s2_state::atari_s3_map(address_map &map)
map(0x1005, 0x1005).mirror(0x07F8).portr("SWITCH.5");
map(0x1006, 0x1006).mirror(0x07F8).portr("SWITCH.6");
map(0x1007, 0x1007).mirror(0x07F8).portr("SWITCH.7");
- map(0x1800, 0x1800).mirror(0x071F).w(this, FUNC(atari_s2_state::sound0_w));
- map(0x1820, 0x1820).mirror(0x071F).w(this, FUNC(atari_s2_state::sound1_w));
- map(0x1840, 0x1847).mirror(0x0718).w(this, FUNC(atari_s2_state::display_w));
- map(0x1860, 0x1867).mirror(0x0718).w(this, FUNC(atari_s2_state::lamp_w));
- map(0x1880, 0x1880).mirror(0x071F).w(this, FUNC(atari_s2_state::sol0_w));
- map(0x18a0, 0x18a7).mirror(0x0718).w(this, FUNC(atari_s2_state::sol1_w));
+ map(0x1800, 0x1800).mirror(0x071F).w(FUNC(atari_s2_state::sound0_w));
+ map(0x1820, 0x1820).mirror(0x071F).w(FUNC(atari_s2_state::sound1_w));
+ map(0x1840, 0x1847).mirror(0x0718).w(FUNC(atari_s2_state::display_w));
+ map(0x1860, 0x1867).mirror(0x0718).w(FUNC(atari_s2_state::lamp_w));
+ map(0x1880, 0x1880).mirror(0x071F).w(FUNC(atari_s2_state::sol0_w));
+ map(0x18a0, 0x18a7).mirror(0x0718).w(FUNC(atari_s2_state::sol1_w));
map(0x18c0, 0x18c0).mirror(0x071F).w("watchdog", FUNC(watchdog_timer_device::reset_w));
- map(0x18e0, 0x18e0).mirror(0x071F).w(this, FUNC(atari_s2_state::intack_w));
+ map(0x18e0, 0x18e0).mirror(0x071F).w(FUNC(atari_s2_state::intack_w));
map(0x2000, 0x2000).mirror(0x07F4).portr("DSW0");
map(0x2001, 0x2001).mirror(0x07F4).portr("DSW1");
map(0x2002, 0x2002).mirror(0x07F4).portr("DSW2");