summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/z80dev.cpp
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2018-03-13 07:36:43 +0100
committer Olivier Galibert <galibert@pobox.com>2018-03-14 14:07:14 +0100
commit115bb9936c5cd3faf955d7eb1e251a94e4744b7b (patch)
treef0230f547f6c750f9974c61479eef28cbe4ad571 /src/mame/drivers/z80dev.cpp
parentf155992daab88ad024cec995428a67108218b51d (diff)
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/z80dev.cpp')
-rw-r--r--src/mame/drivers/z80dev.cpp36
1 files changed, 19 insertions, 17 deletions
diff --git a/src/mame/drivers/z80dev.cpp b/src/mame/drivers/z80dev.cpp
index 0e15f06aa60..8698a50abe8 100644
--- a/src/mame/drivers/z80dev.cpp
+++ b/src/mame/drivers/z80dev.cpp
@@ -56,23 +56,25 @@ READ8_MEMBER( z80dev_state::test_r )
return machine().rand();
}
-ADDRESS_MAP_START(z80dev_state::mem_map)
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x0000, 0x07ff) AM_ROM
- AM_RANGE(0x1000, 0x10ff) AM_RAM
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(z80dev_state::io_map)
- ADDRESS_MAP_UNMAP_HIGH
- ADDRESS_MAP_GLOBAL_MASK (0xff)
- AM_RANGE(0x20, 0x20) AM_READ_PORT("LINE0")
- AM_RANGE(0x21, 0x21) AM_READ_PORT("LINE1")
- AM_RANGE(0x22, 0x22) AM_READ_PORT("LINE2")
- AM_RANGE(0x23, 0x23) AM_READ_PORT("LINE3")
- AM_RANGE(0x20, 0x25) AM_WRITE(display_w)
-
- AM_RANGE(0x13, 0x13) AM_READ(test_r)
-ADDRESS_MAP_END
+void z80dev_state::mem_map(address_map &map)
+{
+ map.unmap_value_high();
+ map(0x0000, 0x07ff).rom();
+ map(0x1000, 0x10ff).ram();
+}
+
+void z80dev_state::io_map(address_map &map)
+{
+ map.unmap_value_high();
+ map.global_mask(0xff);
+ map(0x20, 0x20).portr("LINE0");
+ map(0x21, 0x21).portr("LINE1");
+ map(0x22, 0x22).portr("LINE2");
+ map(0x23, 0x23).portr("LINE3");
+ map(0x20, 0x25).w(this, FUNC(z80dev_state::display_w));
+
+ map(0x13, 0x13).r(this, FUNC(z80dev_state::test_r));
+}
/* Input ports */
INPUT_PORTS_START( z80dev )