summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/mwarr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/mwarr.cpp')
-rw-r--r--src/mame/drivers/mwarr.cpp56
1 files changed, 29 insertions, 27 deletions
diff --git a/src/mame/drivers/mwarr.cpp b/src/mame/drivers/mwarr.cpp
index 2fe9a3aca5e..b67bac5ea37 100644
--- a/src/mame/drivers/mwarr.cpp
+++ b/src/mame/drivers/mwarr.cpp
@@ -212,35 +212,37 @@ WRITE16_MEMBER(mwarr_state::mwarr_brightness_w)
*
*************************************/
-ADDRESS_MAP_START(mwarr_state::mwarr_map)
- AM_RANGE(0x000000, 0x0fffff) AM_ROM
- AM_RANGE(0x100000, 0x1007ff) AM_RAM_WRITE(bg_videoram_w) AM_SHARE("bg_videoram")
- AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE(mlow_videoram_w) AM_SHARE("mlow_videoram")
- AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(mhigh_videoram_w) AM_SHARE("mhigh_videoram")
- AM_RANGE(0x101800, 0x1027ff) AM_RAM_WRITE(tx_videoram_w) AM_SHARE("tx_videoram")
- AM_RANGE(0x103000, 0x1033ff) AM_RAM AM_SHARE("bg_scrollram")
- AM_RANGE(0x103400, 0x1037ff) AM_RAM AM_SHARE("mlow_scrollram")
- AM_RANGE(0x103800, 0x103bff) AM_RAM AM_SHARE("mhigh_scrollram")
- AM_RANGE(0x103c00, 0x103fff) AM_RAM AM_SHARE("vidattrram")
- AM_RANGE(0x104000, 0x104fff) AM_RAM_DEVWRITE("palette", palette_device, write16) AM_SHARE("palette")
- AM_RANGE(0x108000, 0x108fff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x110000, 0x11ffff) AM_RAM AM_SHARE("mwarr_ram")
- AM_RANGE(0x110000, 0x110001) AM_READ_PORT("P1_P2")
- AM_RANGE(0x110002, 0x110003) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x110004, 0x110005) AM_READ_PORT("DSW")
- AM_RANGE(0x110010, 0x110011) AM_WRITE(oki1_bank_w)
- AM_RANGE(0x110014, 0x110015) AM_WRITE(mwarr_brightness_w)
- AM_RANGE(0x110016, 0x110017) AM_WRITE(sprites_commands_w)
- AM_RANGE(0x180000, 0x180001) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0x190000, 0x190001) AM_DEVREADWRITE8("oki2", okim6295_device, read, write, 0x00ff)
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(mwarr_state::oki2_map)
+void mwarr_state::mwarr_map(address_map &map)
+{
+ map(0x000000, 0x0fffff).rom();
+ map(0x100000, 0x1007ff).ram().w(this, FUNC(mwarr_state::bg_videoram_w)).share("bg_videoram");
+ map(0x100800, 0x100fff).ram().w(this, FUNC(mwarr_state::mlow_videoram_w)).share("mlow_videoram");
+ map(0x101000, 0x1017ff).ram().w(this, FUNC(mwarr_state::mhigh_videoram_w)).share("mhigh_videoram");
+ map(0x101800, 0x1027ff).ram().w(this, FUNC(mwarr_state::tx_videoram_w)).share("tx_videoram");
+ map(0x103000, 0x1033ff).ram().share("bg_scrollram");
+ map(0x103400, 0x1037ff).ram().share("mlow_scrollram");
+ map(0x103800, 0x103bff).ram().share("mhigh_scrollram");
+ map(0x103c00, 0x103fff).ram().share("vidattrram");
+ map(0x104000, 0x104fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
+ map(0x108000, 0x108fff).ram().share("spriteram");
+ map(0x110000, 0x11ffff).ram().share("mwarr_ram");
+ map(0x110000, 0x110001).portr("P1_P2");
+ map(0x110002, 0x110003).portr("SYSTEM");
+ map(0x110004, 0x110005).portr("DSW");
+ map(0x110010, 0x110011).w(this, FUNC(mwarr_state::oki1_bank_w));
+ map(0x110014, 0x110015).w(this, FUNC(mwarr_state::mwarr_brightness_w));
+ map(0x110016, 0x110017).w(this, FUNC(mwarr_state::sprites_commands_w));
+ map(0x180001, 0x180001).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write));
+ map(0x190001, 0x190001).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write));
+}
+
+void mwarr_state::oki2_map(address_map &map)
+{
/* $00000-$20000 stays the same in all sound banks, */
/* the second half of the bank is what gets switched */
- AM_RANGE(0x00000, 0x1ffff) AM_ROM AM_REGION("oki2", 0)
- AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank")
-ADDRESS_MAP_END
+ map(0x00000, 0x1ffff).rom().region("oki2", 0);
+ map(0x20000, 0x3ffff).bankr("okibank");
+}
/*************************************