summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/cgenie
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2018-04-21 13:26:02 +0200
committer Olivier Galibert <galibert@pobox.com>2018-04-21 13:27:17 +0200
commitb44fe96e40b3ba347682979832d1d7b50627f668 (patch)
treed3f5b9dd6364c253fc7646ce6c1192354bed5894 /src/devices/bus/cgenie
parent9a35d98c6e223bfa3c2702af5b9388855eddfcd4 (diff)
maps: Finish devices/bus (nw)
That's it for ADDRESS_MAP_START. Please don't try to remove the macros yet, let's wait for a full release before that so that the forks can catch up.
Diffstat (limited to 'src/devices/bus/cgenie')
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp
index 8b231de57b9..8bad4c4bad6 100644
--- a/src/devices/bus/cgenie/expansion/floppy.cpp
+++ b/src/devices/bus/cgenie/expansion/floppy.cpp
@@ -30,13 +30,14 @@
DEFINE_DEVICE_TYPE(CGENIE_FDC, cgenie_fdc_device, "cgenie_fdc", "Colour Genie FDC")
-ADDRESS_MAP_START(cgenie_fdc_device::mmio)
- AM_RANGE(0xe0, 0xe3) AM_MIRROR(0x10) AM_READWRITE(irq_r, select_w)
- AM_RANGE(0xec, 0xec) AM_MIRROR(0x10) AM_DEVREAD("fd1793", fd1793_device, status_r) AM_WRITE(command_w)
- AM_RANGE(0xed, 0xed) AM_MIRROR(0x10) AM_DEVREADWRITE("fd1793", fd1793_device, track_r, track_w)
- AM_RANGE(0xee, 0xee) AM_MIRROR(0x10) AM_DEVREADWRITE("fd1793", fd1793_device, sector_r, sector_w)
- AM_RANGE(0xef, 0xef) AM_MIRROR(0x10) AM_DEVREADWRITE("fd1793", fd1793_device, data_r, data_w)
-ADDRESS_MAP_END
+void cgenie_fdc_device::mmio(address_map &map)
+{
+ map(0xe0, 0xe3).mirror(0x10).rw(this, FUNC(cgenie_fdc_device::irq_r), FUNC(cgenie_fdc_device::select_w));
+ map(0xec, 0xec).mirror(0x10).r("fd1793", FUNC(fd1793_device::status_r)).w(this, FUNC(cgenie_fdc_device::command_w));
+ map(0xed, 0xed).mirror(0x10).rw("fd1793", FUNC(fd1793_device::track_r), FUNC(fd1793_device::track_w));
+ map(0xee, 0xee).mirror(0x10).rw("fd1793", FUNC(fd1793_device::sector_r), FUNC(fd1793_device::sector_w));
+ map(0xef, 0xef).mirror(0x10).rw("fd1793", FUNC(fd1793_device::data_r), FUNC(fd1793_device::data_w));
+}
FLOPPY_FORMATS_MEMBER( cgenie_fdc_device::floppy_formats )
FLOPPY_CGENIE_FORMAT