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/drtomy.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/drtomy.cpp')
-rw-r--r-- | src/mame/drivers/drtomy.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/mame/drivers/drtomy.cpp b/src/mame/drivers/drtomy.cpp index c5b5c4cb3f1..8cbc3972b40 100644 --- a/src/mame/drivers/drtomy.cpp +++ b/src/mame/drivers/drtomy.cpp @@ -174,20 +174,21 @@ WRITE16_MEMBER(drtomy_state::drtomy_okibank_w) /* unknown bit 2 -> (data & 4) */ } -ADDRESS_MAP_START(drtomy_state::drtomy_map) - AM_RANGE(0x000000, 0x03ffff) AM_ROM /* ROM */ - AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(drtomy_vram_fg_w) AM_SHARE("videorafg") /* Video RAM FG */ - AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(drtomy_vram_bg_w) AM_SHARE("videorabg") /* Video RAM BG */ - AM_RANGE(0x200000, 0x2007ff) AM_RAM_DEVWRITE("palette", palette_device, write16) AM_SHARE("palette") - AM_RANGE(0x440000, 0x440fff) AM_RAM AM_SHARE("spriteram") /* Sprite RAM */ - AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW1") - AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW2") - AM_RANGE(0x700004, 0x700005) AM_READ_PORT("P1") - AM_RANGE(0x700006, 0x700007) AM_READ_PORT("P2") - AM_RANGE(0x70000c, 0x70000d) AM_WRITE(drtomy_okibank_w) /* OKI banking */ - AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) /* OKI 6295*/ - AM_RANGE(0xffc000, 0xffffff) AM_RAM /* Work RAM */ -ADDRESS_MAP_END +void drtomy_state::drtomy_map(address_map &map) +{ + map(0x000000, 0x03ffff).rom(); /* ROM */ + map(0x100000, 0x100fff).ram().w(this, FUNC(drtomy_state::drtomy_vram_fg_w)).share("videorafg"); /* Video RAM FG */ + map(0x101000, 0x101fff).ram().w(this, FUNC(drtomy_state::drtomy_vram_bg_w)).share("videorabg"); /* Video RAM BG */ + map(0x200000, 0x2007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); + map(0x440000, 0x440fff).ram().share("spriteram"); /* Sprite RAM */ + map(0x700000, 0x700001).portr("DSW1"); + map(0x700002, 0x700003).portr("DSW2"); + map(0x700004, 0x700005).portr("P1"); + map(0x700006, 0x700007).portr("P2"); + map(0x70000c, 0x70000d).w(this, FUNC(drtomy_state::drtomy_okibank_w)); /* OKI banking */ + map(0x70000f, 0x70000f).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* OKI 6295*/ + map(0xffc000, 0xffffff).ram(); /* Work RAM */ +} static const gfx_layout tilelayout8= { |