summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/atari_s1.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/atari_s1.cpp')
-rw-r--r--src/mame/drivers/atari_s1.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp
index 7b4e6849dbc..cf75c68f65a 100644
--- a/src/mame/drivers/atari_s1.cpp
+++ b/src/mame/drivers/atari_s1.cpp
@@ -122,15 +122,15 @@ void atari_s1_state::atari_s1_map(address_map &map)
{
map.global_mask(0x7fff);
map(0x0000, 0x00ff).ram().share("ram");
- map(0x1080, 0x1083).rw(this, FUNC(atari_s1_state::m1080_r), FUNC(atari_s1_state::m1080_w));
- map(0x1084, 0x1087).rw(this, FUNC(atari_s1_state::m1084_r), FUNC(atari_s1_state::m1084_w));
- map(0x1088, 0x108b).rw(this, FUNC(atari_s1_state::m1088_r), FUNC(atari_s1_state::m1088_w));
- map(0x108c, 0x108f).rw(this, FUNC(atari_s1_state::m108c_r), FUNC(atari_s1_state::m108c_w));
- map(0x2000, 0x204f).mirror(0x0F80).r(this, FUNC(atari_s1_state::switch_r)).nopw(); // aavenger ROL 200B causes a spurious write
- map(0x3000, 0x3fff).w(this, FUNC(atari_s1_state::audioen_w)); // audio enable
+ map(0x1080, 0x1083).rw(FUNC(atari_s1_state::m1080_r), FUNC(atari_s1_state::m1080_w));
+ map(0x1084, 0x1087).rw(FUNC(atari_s1_state::m1084_r), FUNC(atari_s1_state::m1084_w));
+ map(0x1088, 0x108b).rw(FUNC(atari_s1_state::m1088_r), FUNC(atari_s1_state::m1088_w));
+ map(0x108c, 0x108f).rw(FUNC(atari_s1_state::m108c_r), FUNC(atari_s1_state::m108c_w));
+ map(0x2000, 0x204f).mirror(0x0F80).r(FUNC(atari_s1_state::switch_r)).nopw(); // aavenger ROL 200B causes a spurious write
+ map(0x3000, 0x3fff).w(FUNC(atari_s1_state::audioen_w)); // audio enable
map(0x4000, 0x4fff).w("watchdog", FUNC(watchdog_timer_device::reset_w));
- map(0x5080, 0x508f).w(this, FUNC(atari_s1_state::meter_w)); // time2000 only
- map(0x6000, 0x6fff).w(this, FUNC(atari_s1_state::audiores_w)); // audio reset
+ map(0x5080, 0x508f).w(FUNC(atari_s1_state::meter_w)); // time2000 only
+ map(0x6000, 0x6fff).w(FUNC(atari_s1_state::audiores_w)); // audio reset
map(0x7000, 0x7fff).rom();
}
@@ -138,14 +138,14 @@ void atari_s1_state::atarians_map(address_map &map)
{ // more ram
map.global_mask(0x7fff);
map(0x0000, 0x01ff).ram().share("ram");
- map(0x1080, 0x1083).rw(this, FUNC(atari_s1_state::m1080_r), FUNC(atari_s1_state::m1080_w));
- map(0x1084, 0x1087).rw(this, FUNC(atari_s1_state::m1084_r), FUNC(atari_s1_state::m1084_w));
- map(0x1088, 0x108b).rw(this, FUNC(atari_s1_state::m1088_r), FUNC(atari_s1_state::m1088_w));
- map(0x108c, 0x108f).rw(this, FUNC(atari_s1_state::m108c_r), FUNC(atari_s1_state::m108c_w));
- map(0x2000, 0x204f).mirror(0x0F80).r(this, FUNC(atari_s1_state::switch_r));
- map(0x3000, 0x3fff).w(this, FUNC(atari_s1_state::audioen_w)); // audio enable
+ map(0x1080, 0x1083).rw(FUNC(atari_s1_state::m1080_r), FUNC(atari_s1_state::m1080_w));
+ map(0x1084, 0x1087).rw(FUNC(atari_s1_state::m1084_r), FUNC(atari_s1_state::m1084_w));
+ map(0x1088, 0x108b).rw(FUNC(atari_s1_state::m1088_r), FUNC(atari_s1_state::m1088_w));
+ map(0x108c, 0x108f).rw(FUNC(atari_s1_state::m108c_r), FUNC(atari_s1_state::m108c_w));
+ map(0x2000, 0x204f).mirror(0x0F80).r(FUNC(atari_s1_state::switch_r));
+ map(0x3000, 0x3fff).w(FUNC(atari_s1_state::audioen_w)); // audio enable
map(0x4000, 0x4fff).w("watchdog", FUNC(watchdog_timer_device::reset_w));
- map(0x6000, 0x6fff).w(this, FUNC(atari_s1_state::audiores_w)); // audio reset
+ map(0x6000, 0x6fff).w(FUNC(atari_s1_state::audiores_w)); // audio reset
map(0x7000, 0x7fff).rom();
}
@@ -153,11 +153,11 @@ void atari_s1_state::midearth_map(address_map &map)
{
map.global_mask(0x7fff);
map(0x0000, 0x01ff).ram().share("ram");
- map(0x1000, 0x11ff).w(this, FUNC(atari_s1_state::midearth_w));
- map(0x2000, 0x204f).mirror(0x0F80).r(this, FUNC(atari_s1_state::switch_r));
- map(0x3000, 0x3fff).w(this, FUNC(atari_s1_state::audioen_w)); // audio enable
+ map(0x1000, 0x11ff).w(FUNC(atari_s1_state::midearth_w));
+ map(0x2000, 0x204f).mirror(0x0F80).r(FUNC(atari_s1_state::switch_r));
+ map(0x3000, 0x3fff).w(FUNC(atari_s1_state::audioen_w)); // audio enable
map(0x4000, 0x4fff).w("watchdog", FUNC(watchdog_timer_device::reset_w));
- map(0x6000, 0x6fff).w(this, FUNC(atari_s1_state::audiores_w)); // audio reset
+ map(0x6000, 0x6fff).w(FUNC(atari_s1_state::audiores_w)); // audio reset
map(0x7000, 0x7fff).rom().nopw(); // writes to FFFF due to poor coding at 7FF5
}