summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/hotblock.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/hotblock.cpp
parentf155992daab88ad024cec995428a67108218b51d (diff)
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/hotblock.cpp')
-rw-r--r--src/mame/drivers/hotblock.cpp26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/mame/drivers/hotblock.cpp b/src/mame/drivers/hotblock.cpp
index 0358e90b5b4..60b7ca6bb1d 100644
--- a/src/mame/drivers/hotblock.cpp
+++ b/src/mame/drivers/hotblock.cpp
@@ -130,18 +130,20 @@ WRITE8_MEMBER(hotblock_state::video_write)
}
}
-ADDRESS_MAP_START(hotblock_state::hotblock_map)
- AM_RANGE(0x00000, 0x0ffff) AM_RAM
- AM_RANGE(0x10000, 0x1ffff) AM_READWRITE(video_read, video_write) AM_SHARE("vram")
- AM_RANGE(0x20000, 0xfffff) AM_ROM
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(hotblock_state::hotblock_io)
- AM_RANGE(0x0000, 0x0000) AM_WRITE(port0_w)
- AM_RANGE(0x0004, 0x0004) AM_READWRITE(port4_r, port4_w)
- AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("aysnd", ym2149_device, address_data_w)
- AM_RANGE(0x8001, 0x8001) AM_DEVREAD("aysnd", ym2149_device, data_r)
-ADDRESS_MAP_END
+void hotblock_state::hotblock_map(address_map &map)
+{
+ map(0x00000, 0x0ffff).ram();
+ map(0x10000, 0x1ffff).rw(this, FUNC(hotblock_state::video_read), FUNC(hotblock_state::video_write)).share("vram");
+ map(0x20000, 0xfffff).rom();
+}
+
+void hotblock_state::hotblock_io(address_map &map)
+{
+ map(0x0000, 0x0000).w(this, FUNC(hotblock_state::port0_w));
+ map(0x0004, 0x0004).rw(this, FUNC(hotblock_state::port4_r), FUNC(hotblock_state::port4_w));
+ map(0x8000, 0x8001).w("aysnd", FUNC(ym2149_device::address_data_w));
+ map(0x8001, 0x8001).r("aysnd", FUNC(ym2149_device::data_r));
+}