summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/cubo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/cubo.cpp')
-rw-r--r--src/mame/drivers/cubo.cpp40
1 files changed, 21 insertions, 19 deletions
diff --git a/src/mame/drivers/cubo.cpp b/src/mame/drivers/cubo.cpp
index e8b7fbd196b..535bc2fe0a1 100644
--- a/src/mame/drivers/cubo.cpp
+++ b/src/mame/drivers/cubo.cpp
@@ -416,25 +416,27 @@ WRITE8_MEMBER( cubo_state::akiko_cia_0_port_a_write )
-ADDRESS_MAP_START(cubo_state::overlay_2mb_map32)
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x000000, 0x1fffff) AM_RAM AM_SHARE("chip_ram")
- AM_RANGE(0x200000, 0x27ffff) AM_ROM AM_REGION("kickstart", 0)
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(cubo_state::cubo_mem)
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x000000, 0x1fffff) AM_DEVICE("overlay", address_map_bank_device, amap32)
- AM_RANGE(0x800000, 0x800003) AM_READ_PORT("DIPSW1")
- AM_RANGE(0x800010, 0x800013) AM_READ_PORT("DIPSW2")
- AM_RANGE(0xa80000, 0xb7ffff) AM_NOP
- AM_RANGE(0xb80000, 0xb8003f) AM_DEVREADWRITE("akiko", akiko_device, read, write)
- AM_RANGE(0xbf0000, 0xbfffff) AM_READWRITE16(cia_r, gayle_cia_w, 0xffffffff)
- AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE16(custom_chip_r, custom_chip_w, 0xffffffff)
- AM_RANGE(0xe00000, 0xe7ffff) AM_ROM AM_REGION("kickstart", 0x80000)
- AM_RANGE(0xe80000, 0xf7ffff) AM_NOP
- AM_RANGE(0xf80000, 0xffffff) AM_ROM AM_REGION("kickstart", 0)
-ADDRESS_MAP_END
+void cubo_state::overlay_2mb_map32(address_map &map)
+{
+ map.unmap_value_high();
+ map(0x000000, 0x1fffff).ram().share("chip_ram");
+ map(0x200000, 0x27ffff).rom().region("kickstart", 0);
+}
+
+void cubo_state::cubo_mem(address_map &map)
+{
+ map.unmap_value_high();
+ map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap32));
+ map(0x800000, 0x800003).portr("DIPSW1");
+ map(0x800010, 0x800013).portr("DIPSW2");
+ map(0xa80000, 0xb7ffff).noprw();
+ map(0xb80000, 0xb8003f).rw("akiko", FUNC(akiko_device::read), FUNC(akiko_device::write));
+ map(0xbf0000, 0xbfffff).rw(this, FUNC(cubo_state::cia_r), FUNC(cubo_state::gayle_cia_w));
+ map(0xc00000, 0xdfffff).rw(this, FUNC(cubo_state::custom_chip_r), FUNC(cubo_state::custom_chip_w));
+ map(0xe00000, 0xe7ffff).rom().region("kickstart", 0x80000);
+ map(0xe80000, 0xf7ffff).noprw();
+ map(0xf80000, 0xffffff).rom().region("kickstart", 0);
+}
/*************************************