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/cball.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/cball.cpp')
-rw-r--r-- | src/mame/drivers/cball.cpp | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp index 291bcb8c973..b9f3cab512d 100644 --- a/src/mame/drivers/cball.cpp +++ b/src/mame/drivers/cball.cpp @@ -162,31 +162,32 @@ WRITE8_MEMBER(cball_state::wram_w) -ADDRESS_MAP_START(cball_state::cpu_map) - ADDRESS_MAP_GLOBAL_MASK(0x7fff) - - AM_RANGE(0x0000, 0x03ff) AM_READ(wram_r) AM_MASK(0x7f) - AM_RANGE(0x0400, 0x07ff) AM_READONLY - AM_RANGE(0x1001, 0x1001) AM_READ_PORT("1001") - AM_RANGE(0x1003, 0x1003) AM_READ_PORT("1003") - AM_RANGE(0x1020, 0x1020) AM_READ_PORT("1020") - AM_RANGE(0x1040, 0x1040) AM_READ_PORT("1040") - AM_RANGE(0x1060, 0x1060) AM_READ_PORT("1060") - AM_RANGE(0x2000, 0x2001) AM_NOP - AM_RANGE(0x2800, 0x2800) AM_READ_PORT("2800") - - AM_RANGE(0x0000, 0x03ff) AM_WRITE(wram_w) AM_MASK(0x7f) - AM_RANGE(0x0400, 0x07ff) AM_WRITE(vram_w) AM_SHARE("video_ram") - AM_RANGE(0x1800, 0x1800) AM_NOP /* watchdog? */ - AM_RANGE(0x1810, 0x1811) AM_NOP - AM_RANGE(0x1820, 0x1821) AM_NOP - AM_RANGE(0x1830, 0x1831) AM_NOP - AM_RANGE(0x1840, 0x1841) AM_NOP - AM_RANGE(0x1850, 0x1851) AM_NOP - AM_RANGE(0x1870, 0x1871) AM_NOP - - AM_RANGE(0x7000, 0x7fff) AM_ROM -ADDRESS_MAP_END +void cball_state::cpu_map(address_map &map) +{ + map.global_mask(0x7fff); + + map(0x0000, 0x03ff).r(this, FUNC(cball_state::wram_r)).mask(0x7f); + map(0x0400, 0x07ff).readonly(); + map(0x1001, 0x1001).portr("1001"); + map(0x1003, 0x1003).portr("1003"); + map(0x1020, 0x1020).portr("1020"); + map(0x1040, 0x1040).portr("1040"); + map(0x1060, 0x1060).portr("1060"); + map(0x2000, 0x2001).noprw(); + map(0x2800, 0x2800).portr("2800"); + + map(0x0000, 0x03ff).w(this, FUNC(cball_state::wram_w)).mask(0x7f); + map(0x0400, 0x07ff).w(this, FUNC(cball_state::vram_w)).share("video_ram"); + map(0x1800, 0x1800).noprw(); /* watchdog? */ + map(0x1810, 0x1811).noprw(); + map(0x1820, 0x1821).noprw(); + map(0x1830, 0x1831).noprw(); + map(0x1840, 0x1841).noprw(); + map(0x1850, 0x1851).noprw(); + map(0x1870, 0x1871).noprw(); + + map(0x7000, 0x7fff).rom(); +} static INPUT_PORTS_START( cball ) |