summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/ikki.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/ikki.cpp')
-rw-r--r--src/mame/drivers/ikki.cpp48
1 files changed, 25 insertions, 23 deletions
diff --git a/src/mame/drivers/ikki.cpp b/src/mame/drivers/ikki.cpp
index 533ff5f891b..d82236395b0 100644
--- a/src/mame/drivers/ikki.cpp
+++ b/src/mame/drivers/ikki.cpp
@@ -47,29 +47,31 @@ WRITE8_MEMBER(ikki_state::ikki_coin_counters)
*
*************************************/
-ADDRESS_MAP_START(ikki_state::ikki_cpu1)
- AM_RANGE(0x0000, 0x9fff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM
- AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("videoram")
- AM_RANGE(0xe000, 0xe000) AM_READ(ikki_e000_r)
- AM_RANGE(0xe001, 0xe001) AM_READ_PORT("DSW1")
- AM_RANGE(0xe002, 0xe002) AM_READ_PORT("DSW2")
- AM_RANGE(0xe003, 0xe003) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xe004, 0xe004) AM_READ_PORT("P1")
- AM_RANGE(0xe005, 0xe005) AM_READ_PORT("P2")
- AM_RANGE(0xe008, 0xe008) AM_WRITE(ikki_scrn_ctrl_w)
- AM_RANGE(0xe009, 0xe009) AM_WRITE(ikki_coin_counters)
- AM_RANGE(0xe00a, 0xe00b) AM_WRITEONLY AM_SHARE("scroll")
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(ikki_state::ikki_cpu2)
- AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xd801, 0xd801) AM_DEVWRITE("sn1", sn76496_device, write)
- AM_RANGE(0xd802, 0xd802) AM_DEVWRITE("sn2", sn76496_device, write)
-ADDRESS_MAP_END
+void ikki_state::ikki_cpu1(address_map &map)
+{
+ map(0x0000, 0x9fff).rom();
+ map(0xc000, 0xc7ff).ram();
+ map(0xc800, 0xcfff).ram().share("share1");
+ map(0xd000, 0xd7ff).ram().share("videoram");
+ map(0xe000, 0xe000).r(this, FUNC(ikki_state::ikki_e000_r));
+ map(0xe001, 0xe001).portr("DSW1");
+ map(0xe002, 0xe002).portr("DSW2");
+ map(0xe003, 0xe003).portr("SYSTEM");
+ map(0xe004, 0xe004).portr("P1");
+ map(0xe005, 0xe005).portr("P2");
+ map(0xe008, 0xe008).w(this, FUNC(ikki_state::ikki_scrn_ctrl_w));
+ map(0xe009, 0xe009).w(this, FUNC(ikki_state::ikki_coin_counters));
+ map(0xe00a, 0xe00b).writeonly().share("scroll");
+}
+
+void ikki_state::ikki_cpu2(address_map &map)
+{
+ map(0x0000, 0x1fff).rom();
+ map(0xc000, 0xc7ff).ram().share("spriteram");
+ map(0xc800, 0xcfff).ram().share("share1");
+ map(0xd801, 0xd801).w("sn1", FUNC(sn76496_device::write));
+ map(0xd802, 0xd802).w("sn2", FUNC(sn76496_device::write));
+}
/*************************************