summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/ec65.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/ec65.cpp')
-rw-r--r--src/mame/drivers/ec65.cpp44
1 files changed, 23 insertions, 21 deletions
diff --git a/src/mame/drivers/ec65.cpp b/src/mame/drivers/ec65.cpp
index 5ba1963ad22..d847633a447 100644
--- a/src/mame/drivers/ec65.cpp
+++ b/src/mame/drivers/ec65.cpp
@@ -67,27 +67,29 @@ public:
void ec65k_mem(address_map &map);
};
-ADDRESS_MAP_START(ec65_state::ec65_mem)
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x0000, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE(PIA6821_TAG, pia6821_device, read, write)
- AM_RANGE(0xe010, 0xe011) AM_DEVREADWRITE(ACIA6850_TAG, acia6850_device, read, write)
- AM_RANGE(0xe100, 0xe10f) AM_DEVREADWRITE(VIA6522_0_TAG, via6522_device, read, write)
- AM_RANGE(0xe110, 0xe11f) AM_DEVREADWRITE(VIA6522_1_TAG, via6522_device, read, write)
- AM_RANGE(0xe130, 0xe133) AM_DEVREADWRITE(ACIA6551_TAG, mos6551_device, read, write)
- AM_RANGE(0xe140, 0xe140) AM_DEVWRITE(MC6845_TAG, mc6845_device, address_w)
- AM_RANGE(0xe141, 0xe141) AM_DEVREADWRITE(MC6845_TAG, mc6845_device, register_r , register_w)
- AM_RANGE(0xe400, 0xe7ff) AM_RAM // 1KB on-board RAM
- AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("videoram")
- AM_RANGE(0xf000, 0xffff) AM_ROM
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(ec65k_state::ec65k_mem)
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x0000, 0xe7ff) AM_RAM
- AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("videoram")
- AM_RANGE(0xf000, 0xffff) AM_ROM
-ADDRESS_MAP_END
+void ec65_state::ec65_mem(address_map &map)
+{
+ map.unmap_value_high();
+ map(0x0000, 0xdfff).ram();
+ map(0xe000, 0xe003).rw(PIA6821_TAG, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+ map(0xe010, 0xe011).rw(ACIA6850_TAG, FUNC(acia6850_device::read), FUNC(acia6850_device::write));
+ map(0xe100, 0xe10f).rw(m_via_0, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xe110, 0xe11f).rw(m_via_1, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xe130, 0xe133).rw(ACIA6551_TAG, FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+ map(0xe140, 0xe140).w(MC6845_TAG, FUNC(mc6845_device::address_w));
+ map(0xe141, 0xe141).rw(MC6845_TAG, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
+ map(0xe400, 0xe7ff).ram(); // 1KB on-board RAM
+ map(0xe800, 0xefff).ram().share("videoram");
+ map(0xf000, 0xffff).rom();
+}
+
+void ec65k_state::ec65k_mem(address_map &map)
+{
+ map.unmap_value_high();
+ map(0x0000, 0xe7ff).ram();
+ map(0xe800, 0xefff).ram().share("videoram");
+ map(0xf000, 0xffff).rom();
+}
/* Input ports */
static INPUT_PORTS_START( ec65 )