summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/yiear.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/yiear.cpp')
-rw-r--r--src/mame/drivers/yiear.cpp54
1 files changed, 28 insertions, 26 deletions
diff --git a/src/mame/drivers/yiear.cpp b/src/mame/drivers/yiear.cpp
index 277b361c03e..558e3870544 100644
--- a/src/mame/drivers/yiear.cpp
+++ b/src/mame/drivers/yiear.cpp
@@ -138,32 +138,34 @@ INTERRUPT_GEN_MEMBER(yiear_state::yiear_nmi_interrupt)
}
-ADDRESS_MAP_START(yiear_state::main_map)
- AM_RANGE(0x0000, 0x0000) AM_READ(yiear_speech_r)
- AM_RANGE(0x4000, 0x4000) AM_WRITE(yiear_control_w)
- AM_RANGE(0x4800, 0x4800) AM_WRITE(konami_SN76496_latch_w)
- AM_RANGE(0x4900, 0x4900) AM_WRITE(konami_SN76496_w)
- AM_RANGE(0x4a00, 0x4a00) AM_WRITE(yiear_VLM5030_control_w)
- AM_RANGE(0x4b00, 0x4b00) AM_DEVWRITE("vlm", vlm5030_device, data_w)
- AM_RANGE(0x4c00, 0x4c00) AM_READ_PORT("DSW2")
- AM_RANGE(0x4d00, 0x4d00) AM_READ_PORT("DSW3")
- AM_RANGE(0x4e00, 0x4e00) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x4e01, 0x4e01) AM_READ_PORT("P1")
- AM_RANGE(0x4e02, 0x4e02) AM_READ_PORT("P2")
- AM_RANGE(0x4e03, 0x4e03) AM_READ_PORT("DSW1")
- AM_RANGE(0x4f00, 0x4f00) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w)
- AM_RANGE(0x5000, 0x5fff) AM_RAM
- AM_RANGE(0x5000, 0x502f) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x5400, 0x542f) AM_RAM AM_SHARE("spriteram2")
- AM_RANGE(0x5800, 0x5fff) AM_WRITE(yiear_videoram_w) AM_SHARE("videoram")
- AM_RANGE(0x8000, 0xffff) AM_ROM
-ADDRESS_MAP_END
-
-
-ADDRESS_MAP_START(yiear_state::vlm_map)
- ADDRESS_MAP_GLOBAL_MASK(0x1fff)
- AM_RANGE(0x0000, 0x1fff) AM_ROM
-ADDRESS_MAP_END
+void yiear_state::main_map(address_map &map)
+{
+ map(0x0000, 0x0000).r(this, FUNC(yiear_state::yiear_speech_r));
+ map(0x4000, 0x4000).w(this, FUNC(yiear_state::yiear_control_w));
+ map(0x4800, 0x4800).w(this, FUNC(yiear_state::konami_SN76496_latch_w));
+ map(0x4900, 0x4900).w(this, FUNC(yiear_state::konami_SN76496_w));
+ map(0x4a00, 0x4a00).w(this, FUNC(yiear_state::yiear_VLM5030_control_w));
+ map(0x4b00, 0x4b00).w(m_vlm, FUNC(vlm5030_device::data_w));
+ map(0x4c00, 0x4c00).portr("DSW2");
+ map(0x4d00, 0x4d00).portr("DSW3");
+ map(0x4e00, 0x4e00).portr("SYSTEM");
+ map(0x4e01, 0x4e01).portr("P1");
+ map(0x4e02, 0x4e02).portr("P2");
+ map(0x4e03, 0x4e03).portr("DSW1");
+ map(0x4f00, 0x4f00).w("watchdog", FUNC(watchdog_timer_device::reset_w));
+ map(0x5000, 0x5fff).ram();
+ map(0x5000, 0x502f).ram().share("spriteram");
+ map(0x5400, 0x542f).ram().share("spriteram2");
+ map(0x5800, 0x5fff).w(this, FUNC(yiear_state::yiear_videoram_w)).share("videoram");
+ map(0x8000, 0xffff).rom();
+}
+
+
+void yiear_state::vlm_map(address_map &map)
+{
+ map.global_mask(0x1fff);
+ map(0x0000, 0x1fff).rom();
+}
static INPUT_PORTS_START( yiear )