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/abc80.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/abc80.cpp')
-rw-r--r-- | src/mame/drivers/abc80.cpp | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp index 711915c5c0b..5b87fecffc9 100644 --- a/src/mame/drivers/abc80.cpp +++ b/src/mame/drivers/abc80.cpp @@ -177,29 +177,31 @@ WRITE8_MEMBER( abc80_state::csg_w ) // ADDRESS_MAP( abc80_mem ) //------------------------------------------------- -ADDRESS_MAP_START(abc80_state::abc80_mem) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0xffff) AM_READWRITE(read, write) -ADDRESS_MAP_END +void abc80_state::abc80_mem(address_map &map) +{ + map.unmap_value_high(); + map(0x0000, 0xffff).rw(this, FUNC(abc80_state::read), FUNC(abc80_state::write)); +} //------------------------------------------------- // ADDRESS_MAP( abc80_io ) //------------------------------------------------- -ADDRESS_MAP_START(abc80_state::abc80_io) - ADDRESS_MAP_UNMAP_HIGH - ADDRESS_MAP_GLOBAL_MASK(0x17) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, inp_r, out_w) - AM_RANGE(0x01, 0x01) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, stat_r, cs_w) - AM_RANGE(0x02, 0x02) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c1_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c2_w) - AM_RANGE(0x04, 0x04) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c3_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c4_w) - AM_RANGE(0x06, 0x06) AM_WRITE(csg_w) - AM_RANGE(0x07, 0x07) AM_DEVREAD(ABCBUS_TAG, abcbus_slot_device, rst_r) - AM_RANGE(0x10, 0x13) AM_MIRROR(0x04) AM_DEVREADWRITE(Z80PIO_TAG, z80pio_device, read_alt, write_alt) -ADDRESS_MAP_END +void abc80_state::abc80_io(address_map &map) +{ + map.unmap_value_high(); + map.global_mask(0x17); + map(0x00, 0x00).rw(m_bus, FUNC(abcbus_slot_device::inp_r), FUNC(abcbus_slot_device::out_w)); + map(0x01, 0x01).rw(m_bus, FUNC(abcbus_slot_device::stat_r), FUNC(abcbus_slot_device::cs_w)); + map(0x02, 0x02).w(m_bus, FUNC(abcbus_slot_device::c1_w)); + map(0x03, 0x03).w(m_bus, FUNC(abcbus_slot_device::c2_w)); + map(0x04, 0x04).w(m_bus, FUNC(abcbus_slot_device::c3_w)); + map(0x05, 0x05).w(m_bus, FUNC(abcbus_slot_device::c4_w)); + map(0x06, 0x06).w(this, FUNC(abc80_state::csg_w)); + map(0x07, 0x07).r(m_bus, FUNC(abcbus_slot_device::rst_r)); + map(0x10, 0x13).mirror(0x04).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); +} |