summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/s8.cpp
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2018-03-13 07:36:43 +0100
committer Olivier Galibert <galibert@pobox.com>2018-03-14 14:07:14 +0100
commit115bb9936c5cd3faf955d7eb1e251a94e4744b7b (patch)
treef0230f547f6c750f9974c61479eef28cbe4ad571 /src/mame/drivers/s8.cpp
parentf155992daab88ad024cec995428a67108218b51d (diff)
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/s8.cpp')
-rw-r--r--src/mame/drivers/s8.cpp34
1 files changed, 18 insertions, 16 deletions
diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp
index 4470d77577f..99b89e267f0 100644
--- a/src/mame/drivers/s8.cpp
+++ b/src/mame/drivers/s8.cpp
@@ -111,22 +111,24 @@ private:
required_device<pia6821_device> m_pia30;
};
-ADDRESS_MAP_START(s8_state::s8_main_map)
- ADDRESS_MAP_GLOBAL_MASK(0x7fff)
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x2100, 0x2103) AM_DEVREADWRITE("pia21", pia6821_device, read, write) // sound+solenoids
- AM_RANGE(0x2200, 0x2200) AM_WRITE(sol3_w) // solenoids
- AM_RANGE(0x2400, 0x2403) AM_DEVREADWRITE("pia24", pia6821_device, read, write) // lamps
- AM_RANGE(0x2800, 0x2803) AM_DEVREADWRITE("pia28", pia6821_device, read, write) // display
- AM_RANGE(0x3000, 0x3003) AM_DEVREADWRITE("pia30", pia6821_device, read, write) // inputs
- AM_RANGE(0x5000, 0x7fff) AM_ROM AM_REGION("roms", 0)
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(s8_state::s8_audio_map)
- AM_RANGE(0x0000, 0x00ff) AM_RAM
- AM_RANGE(0x4000, 0x4003) AM_DEVREADWRITE("pias", pia6821_device, read, write)
- AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION("audioroms", 0)
-ADDRESS_MAP_END
+void s8_state::s8_main_map(address_map &map)
+{
+ map.global_mask(0x7fff);
+ map(0x0000, 0x07ff).ram().share("nvram");
+ map(0x2100, 0x2103).rw(m_pia21, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids
+ map(0x2200, 0x2200).w(this, FUNC(s8_state::sol3_w)); // solenoids
+ map(0x2400, 0x2403).rw(m_pia24, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps
+ map(0x2800, 0x2803).rw(m_pia28, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // display
+ map(0x3000, 0x3003).rw(m_pia30, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // inputs
+ map(0x5000, 0x7fff).rom().region("roms", 0);
+}
+
+void s8_state::s8_audio_map(address_map &map)
+{
+ map(0x0000, 0x00ff).ram();
+ map(0x4000, 0x4003).rw(m_pias, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+ map(0xc000, 0xffff).rom().region("audioroms", 0);
+}
static INPUT_PORTS_START( s8 )
PORT_START("X0")