diff options
author | 2018-03-13 07:36:43 +0100 | |
---|---|---|
committer | 2018-03-14 14:07:14 +0100 | |
commit | 115bb9936c5cd3faf955d7eb1e251a94e4744b7b (patch) | |
tree | f0230f547f6c750f9974c61479eef28cbe4ad571 /src/mame/drivers/mirage.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/mirage.cpp')
-rw-r--r-- | src/mame/drivers/mirage.cpp | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/src/mame/drivers/mirage.cpp b/src/mame/drivers/mirage.cpp index 16eb3a27668..6a0c07e48fd 100644 --- a/src/mame/drivers/mirage.cpp +++ b/src/mame/drivers/mirage.cpp @@ -158,29 +158,30 @@ WRITE16_MEMBER(miragemj_state::okim0_rombank_w) m_oki_bgm->set_rom_bank(data & 0x7); } -ADDRESS_MAP_START(miragemj_state::mirage_map) - AM_RANGE(0x000000, 0x07ffff) AM_ROM +void miragemj_state::mirage_map(address_map &map) +{ + map(0x000000, 0x07ffff).rom(); /* tilemaps */ - AM_RANGE(0x100000, 0x101fff) AM_DEVREADWRITE("tilegen1", deco16ic_device, pf1_data_r, pf1_data_w) // 0x100000 - 0x101fff tested - AM_RANGE(0x102000, 0x103fff) AM_DEVREADWRITE("tilegen1", deco16ic_device, pf2_data_r, pf2_data_w) // 0x102000 - 0x102fff tested + map(0x100000, 0x101fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); // 0x100000 - 0x101fff tested + map(0x102000, 0x103fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); // 0x102000 - 0x102fff tested /* linescroll */ - AM_RANGE(0x110000, 0x110bff) AM_RAM AM_SHARE("pf1_rowscroll") - AM_RANGE(0x112000, 0x112bff) AM_RAM AM_SHARE("pf2_rowscroll") - AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_SHARE("spriteram") - AM_RANGE(0x130000, 0x1307ff) AM_RAM_DEVWRITE("palette", palette_device, write16) AM_SHARE("palette") - AM_RANGE(0x140000, 0x14000f) AM_DEVREADWRITE8("oki_sfx", okim6295_device, read, write, 0x00ff) - AM_RANGE(0x150000, 0x15000f) AM_DEVREADWRITE8("oki_bgm", okim6295_device, read, write, 0x00ff) - AM_RANGE(0x160000, 0x160001) AM_WRITENOP - AM_RANGE(0x168000, 0x16800f) AM_DEVWRITE("tilegen1", deco16ic_device, pf_control_w) - AM_RANGE(0x16a000, 0x16a001) AM_WRITENOP - AM_RANGE(0x16c000, 0x16c001) AM_WRITE(okim1_rombank_w) - AM_RANGE(0x16c002, 0x16c003) AM_WRITE(okim0_rombank_w) - AM_RANGE(0x16c004, 0x16c005) AM_WRITE(mjmux_w) - AM_RANGE(0x16c006, 0x16c007) AM_READ(mjmux_r) - AM_RANGE(0x16e000, 0x16e001) AM_WRITENOP - AM_RANGE(0x16e002, 0x16e003) AM_READ_PORT("SYSTEM_IN") - AM_RANGE(0x170000, 0x173fff) AM_RAM -ADDRESS_MAP_END + map(0x110000, 0x110bff).ram().share("pf1_rowscroll"); + map(0x112000, 0x112bff).ram().share("pf2_rowscroll"); + map(0x120000, 0x1207ff).ram().share("spriteram"); + map(0x130000, 0x1307ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); + map(0x140000, 0x14000f).rw(m_oki_sfx, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff); + map(0x150000, 0x15000f).rw(m_oki_bgm, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff); + map(0x160000, 0x160001).nopw(); + map(0x168000, 0x16800f).w(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_w)); + map(0x16a000, 0x16a001).nopw(); + map(0x16c000, 0x16c001).w(this, FUNC(miragemj_state::okim1_rombank_w)); + map(0x16c002, 0x16c003).w(this, FUNC(miragemj_state::okim0_rombank_w)); + map(0x16c004, 0x16c005).w(this, FUNC(miragemj_state::mjmux_w)); + map(0x16c006, 0x16c007).r(this, FUNC(miragemj_state::mjmux_r)); + map(0x16e000, 0x16e001).nopw(); + map(0x16e002, 0x16e003).portr("SYSTEM_IN"); + map(0x170000, 0x173fff).ram(); +} static INPUT_PORTS_START( mirage ) |