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/lc80.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/lc80.cpp')
-rw-r--r-- | src/mame/drivers/lc80.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/mame/drivers/lc80.cpp b/src/mame/drivers/lc80.cpp index 83c612162b9..43d213c44b0 100644 --- a/src/mame/drivers/lc80.cpp +++ b/src/mame/drivers/lc80.cpp @@ -48,14 +48,15 @@ /* Memory Maps */ -ADDRESS_MAP_START(lc80_state::lc80_mem) - ADDRESS_MAP_GLOBAL_MASK(0x3fff) - AM_RANGE(0x0000, 0x07ff) AM_ROMBANK("bank1") - AM_RANGE(0x0800, 0x0fff) AM_ROMBANK("bank2") - AM_RANGE(0x1000, 0x17ff) AM_ROMBANK("bank3") - AM_RANGE(0x2000, 0x23ff) AM_RAM - AM_RANGE(0x2400, 0x2fff) AM_RAMBANK("bank4") -ADDRESS_MAP_END +void lc80_state::lc80_mem(address_map &map) +{ + map.global_mask(0x3fff); + map(0x0000, 0x07ff).bankr("bank1"); + map(0x0800, 0x0fff).bankr("bank2"); + map(0x1000, 0x17ff).bankr("bank3"); + map(0x2000, 0x23ff).ram(); + map(0x2400, 0x2fff).bankrw("bank4"); +} #if 0 ADDRESS_MAP_START(lc80_state::sc80_mem) @@ -64,12 +65,13 @@ ADDRESS_MAP_START(lc80_state::sc80_mem) ADDRESS_MAP_END #endif -ADDRESS_MAP_START(lc80_state::lc80_io) - ADDRESS_MAP_GLOBAL_MASK(0x1f) - AM_RANGE(0x14, 0x17) AM_DEVREADWRITE(Z80PIO1_TAG, z80pio_device, read, write) - AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE(Z80PIO2_TAG, z80pio_device, read, write) - AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE(Z80CTC_TAG, z80ctc_device, read, write) -ADDRESS_MAP_END +void lc80_state::lc80_io(address_map &map) +{ + map.global_mask(0x1f); + map(0x14, 0x17).rw(Z80PIO1_TAG, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); + map(0x18, 0x1b).rw(m_pio2, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); + map(0x0c, 0x0f).rw(Z80CTC_TAG, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); +} /* Input Ports */ |