summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/mwsub.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/mwsub.cpp')
-rw-r--r--src/mame/drivers/mwsub.cpp34
1 files changed, 18 insertions, 16 deletions
diff --git a/src/mame/drivers/mwsub.cpp b/src/mame/drivers/mwsub.cpp
index c031a68ff05..f8b0dd0e88a 100644
--- a/src/mame/drivers/mwsub.cpp
+++ b/src/mame/drivers/mwsub.cpp
@@ -146,22 +146,24 @@ WRITE8_MEMBER(submar_state::submar_irq_clear_w)
}
-ADDRESS_MAP_START(submar_state::submar_map)
- ADDRESS_MAP_GLOBAL_MASK(0x7fff)
- AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x2000, 0x207f) AM_RAM
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(submar_state::submar_portmap)
- ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READWRITE(submar_sensor0_r, submar_motor_w)
- AM_RANGE(0x01, 0x01) AM_READWRITE(submar_sensor1_r, submar_lamp_w)
- AM_RANGE(0x02, 0x02) AM_WRITE(submar_solenoid_w)
- AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW") AM_WRITE(submar_sound_w)
- AM_RANGE(0x04, 0x05) AM_WRITE(submar_led_w)
- AM_RANGE(0x06, 0x06) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w)
- AM_RANGE(0x07, 0x07) AM_WRITE(submar_irq_clear_w)
-ADDRESS_MAP_END
+void submar_state::submar_map(address_map &map)
+{
+ map.global_mask(0x7fff);
+ map(0x0000, 0x1fff).rom();
+ map(0x2000, 0x207f).ram();
+}
+
+void submar_state::submar_portmap(address_map &map)
+{
+ map.global_mask(0xff);
+ map(0x00, 0x00).rw(this, FUNC(submar_state::submar_sensor0_r), FUNC(submar_state::submar_motor_w));
+ map(0x01, 0x01).rw(this, FUNC(submar_state::submar_sensor1_r), FUNC(submar_state::submar_lamp_w));
+ map(0x02, 0x02).w(this, FUNC(submar_state::submar_solenoid_w));
+ map(0x03, 0x03).portr("DSW").w(this, FUNC(submar_state::submar_sound_w));
+ map(0x04, 0x05).w(this, FUNC(submar_state::submar_led_w));
+ map(0x06, 0x06).w("watchdog", FUNC(watchdog_timer_device::reset_w));
+ map(0x07, 0x07).w(this, FUNC(submar_state::submar_irq_clear_w));
+}