diff options
Diffstat (limited to 'src/mame/drivers/nanos.cpp')
-rw-r--r-- | src/mame/drivers/nanos.cpp | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp index 0ecd4600eec..2ec3e84e971 100644 --- a/src/mame/drivers/nanos.cpp +++ b/src/mame/drivers/nanos.cpp @@ -93,10 +93,11 @@ private: -ADDRESS_MAP_START(nanos_state::nanos_mem) - AM_RANGE( 0x0000, 0x0fff ) AM_READ_BANK("bank1") AM_WRITE_BANK("bank3") - AM_RANGE( 0x1000, 0xffff ) AM_RAMBANK("bank2") -ADDRESS_MAP_END +void nanos_state::nanos_mem(address_map &map) +{ + map(0x0000, 0x0fff).bankr("bank1").bankw("bank3"); + map(0x1000, 0xffff).bankrw("bank2"); +} WRITE8_MEMBER(nanos_state::nanos_tc_w) { @@ -139,31 +140,32 @@ static const z80_daisy_config nanos_daisy_chain[] = { nullptr } }; -ADDRESS_MAP_START(nanos_state::nanos_io) - ADDRESS_MAP_UNMAP_HIGH - ADDRESS_MAP_GLOBAL_MASK(0xff) +void nanos_state::nanos_io(address_map &map) +{ + map.unmap_value_high(); + map.global_mask(0xff); /* CPU card */ - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("z80pio", z80pio_device, read, write) + map(0x00, 0x03).rw(m_pio, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); /* I/O card */ - AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("z80pio_0", z80pio_device, read, write) - AM_RANGE(0x84, 0x87) AM_DEVREADWRITE("z80sio_0", z80sio_device, ba_cd_r, ba_cd_w) - AM_RANGE(0x88, 0x8B) AM_DEVREADWRITE("z80pio_1", z80pio_device, read, write) - AM_RANGE(0x8C, 0x8F) AM_DEVREADWRITE("z80ctc_0", z80ctc_device, read, write) + map(0x80, 0x83).rw(m_pio_0, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); + map(0x84, 0x87).rw(m_sio_0, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); + map(0x88, 0x8B).rw(m_pio_1, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); + map(0x8C, 0x8F).rw(m_ctc_0, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); /* FDC card */ - AM_RANGE(0x92, 0x92) AM_WRITE(nanos_tc_w) - AM_RANGE(0x94, 0x95) AM_DEVICE("upd765", upd765a_device, map) + map(0x92, 0x92).w(this, FUNC(nanos_state::nanos_tc_w)); + map(0x94, 0x95).m(m_fdc, FUNC(upd765a_device::map)); /* V24+IFSS card */ - AM_RANGE(0xA0, 0xA3) AM_DEVREADWRITE("z80sio_0", z80sio_device, ba_cd_r, ba_cd_w) - AM_RANGE(0xA4, 0xA7) AM_DEVREADWRITE("z80ctc_1", z80ctc_device, read, write) + map(0xA0, 0xA3).rw(m_sio_0, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); + map(0xA4, 0xA7).rw(m_ctc_1, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); /* 256-k RAM card I - 64k OS-Memory + 192k-RAM-Floppy */ //AM_RANGE(0xC0, 0xC7) /* 256-k RAM card II - 64k OS-Memory + 192k-RAM-Floppy */ //AM_RANGE(0xC8, 0xCF) -ADDRESS_MAP_END +} /* Input ports */ static INPUT_PORTS_START( nanos ) |