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/cb2001.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/cb2001.cpp')
-rw-r--r-- | src/mame/drivers/cb2001.cpp | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/src/mame/drivers/cb2001.cpp b/src/mame/drivers/cb2001.cpp index b78051a9ad1..54fe316ce5c 100644 --- a/src/mame/drivers/cb2001.cpp +++ b/src/mame/drivers/cb2001.cpp @@ -569,23 +569,25 @@ WRITE16_MEMBER(cb2001_state::cb2001_bg_w) } -ADDRESS_MAP_START(cb2001_state::cb2001_map) - AM_RANGE(0x00000, 0x1ffff) AM_RAM - AM_RANGE(0x20000, 0x20fff) AM_RAM AM_SHARE("vrafg") - AM_RANGE(0x21000, 0x21fff) AM_RAM_WRITE(cb2001_bg_w) AM_SHARE("vrabg") - AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0) -ADDRESS_MAP_END - -ADDRESS_MAP_START(cb2001_state::cb2001_io) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE8("ppi8255_0", i8255_device, read, write, 0xffff) /* Input Ports */ - AM_RANGE(0x10, 0x13) AM_DEVREADWRITE8("ppi8255_1", i8255_device, read, write, 0xffff) /* DIP switches */ - AM_RANGE(0x20, 0x21) AM_DEVREAD8("aysnd", ay8910_device, data_r, 0xff00) - AM_RANGE(0x22, 0x23) AM_DEVWRITE8("aysnd", ay8910_device, data_address_w, 0xffff) - - AM_RANGE(0x30, 0x31) AM_READ8(irq_ack_r, 0x00ff) - AM_RANGE(0x30, 0x31) AM_WRITE(cb2001_vidctrl_w) - AM_RANGE(0x32, 0x33) AM_WRITE(cb2001_vidctrl2_w) -ADDRESS_MAP_END +void cb2001_state::cb2001_map(address_map &map) +{ + map(0x00000, 0x1ffff).ram(); + map(0x20000, 0x20fff).ram().share("vrafg"); + map(0x21000, 0x21fff).ram().w(this, FUNC(cb2001_state::cb2001_bg_w)).share("vrabg"); + map(0xc0000, 0xfffff).rom().region("boot_prg", 0); +} + +void cb2001_state::cb2001_io(address_map &map) +{ + map(0x00, 0x03).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input Ports */ + map(0x10, 0x13).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* DIP switches */ + map(0x21, 0x21).r("aysnd", FUNC(ay8910_device::data_r)); + map(0x22, 0x23).w("aysnd", FUNC(ay8910_device::data_address_w)); + + map(0x30, 0x30).r(this, FUNC(cb2001_state::irq_ack_r)); + map(0x30, 0x31).w(this, FUNC(cb2001_state::cb2001_vidctrl_w)); + map(0x32, 0x33).w(this, FUNC(cb2001_state::cb2001_vidctrl2_w)); +} static INPUT_PORTS_START( cb2001 ) PORT_START("IN0") |