summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/adamnet/kb.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/adamnet/kb.cpp')
-rw-r--r--src/devices/bus/adamnet/kb.cpp24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp
index 5cd7971b441..00e486e02cc 100644
--- a/src/devices/bus/adamnet/kb.cpp
+++ b/src/devices/bus/adamnet/kb.cpp
@@ -50,23 +50,25 @@ const tiny_rom_entry *adam_keyboard_device::device_rom_region() const
// ADDRESS_MAP( adam_kb_mem )
//-------------------------------------------------
-ADDRESS_MAP_START(adam_keyboard_device::adam_kb_mem)
- AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE(M6801_TAG, m6801_cpu_device, m6801_io_r, m6801_io_w)
- AM_RANGE(0x0080, 0x00ff) AM_RAM
- AM_RANGE(0xf800, 0xffff) AM_ROM AM_REGION(M6801_TAG, 0)
-ADDRESS_MAP_END
+void adam_keyboard_device::adam_kb_mem(address_map &map)
+{
+ map(0x0000, 0x001f).rw(M6801_TAG, FUNC(m6801_cpu_device::m6801_io_r), FUNC(m6801_cpu_device::m6801_io_w));
+ map(0x0080, 0x00ff).ram();
+ map(0xf800, 0xffff).rom().region(M6801_TAG, 0);
+}
//-------------------------------------------------
// ADDRESS_MAP( adam_kb_io )
//-------------------------------------------------
-ADDRESS_MAP_START(adam_keyboard_device::adam_kb_io)
- AM_RANGE(M6801_PORT1, M6801_PORT1) AM_READ(p1_r)
- AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READWRITE(p2_r, p2_w)
- AM_RANGE(M6801_PORT3, M6801_PORT3) AM_READWRITE(p3_r, p3_w)
- AM_RANGE(M6801_PORT4, M6801_PORT4) AM_READWRITE(p4_r, p4_w)
-ADDRESS_MAP_END
+void adam_keyboard_device::adam_kb_io(address_map &map)
+{
+ map(M6801_PORT1, M6801_PORT1).r(this, FUNC(adam_keyboard_device::p1_r));
+ map(M6801_PORT2, M6801_PORT2).rw(this, FUNC(adam_keyboard_device::p2_r), FUNC(adam_keyboard_device::p2_w));
+ map(M6801_PORT3, M6801_PORT3).rw(this, FUNC(adam_keyboard_device::p3_r), FUNC(adam_keyboard_device::p3_w));
+ map(M6801_PORT4, M6801_PORT4).rw(this, FUNC(adam_keyboard_device::p4_r), FUNC(adam_keyboard_device::p4_w));
+}
//-------------------------------------------------