summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/luckybal.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/luckybal.cpp
parentf155992daab88ad024cec995428a67108218b51d (diff)
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/luckybal.cpp')
-rw-r--r--src/mame/drivers/luckybal.cpp24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/mame/drivers/luckybal.cpp b/src/mame/drivers/luckybal.cpp
index 1f26a2d0ba0..b06cce32f84 100644
--- a/src/mame/drivers/luckybal.cpp
+++ b/src/mame/drivers/luckybal.cpp
@@ -322,17 +322,19 @@ public:
* Memory Map *
**************************************/
-ADDRESS_MAP_START(luckybal_state::main_map)
- AM_RANGE(0x0000, 0x57ff) AM_ROM
- AM_RANGE(0xe000, 0xffff) AM_RAM // 6264 SRAM
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(luckybal_state::main_io)
- ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x90, 0x90) AM_WRITE(port90_bitswap_w)
- AM_RANGE(0xc0, 0xc3) AM_READWRITE(ppi_bitswap_r, ppi_bitswap_w)
- AM_RANGE(0xe0, 0xe3) AM_DEVREADWRITE("v9938", v9938_device, read, write)
-ADDRESS_MAP_END
+void luckybal_state::main_map(address_map &map)
+{
+ map(0x0000, 0x57ff).rom();
+ map(0xe000, 0xffff).ram(); // 6264 SRAM
+}
+
+void luckybal_state::main_io(address_map &map)
+{
+ map.global_mask(0xff);
+ map(0x90, 0x90).w(this, FUNC(luckybal_state::port90_bitswap_w));
+ map(0xc0, 0xc3).rw(this, FUNC(luckybal_state::ppi_bitswap_r), FUNC(luckybal_state::ppi_bitswap_w));
+ map(0xe0, 0xe3).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write));
+}
/*
[:maincpu] ':maincpu' (00006): unmapped io memory write to 0010 = 00 & FF
[:maincpu] ':maincpu' (00009): unmapped io memory read from 0018 & FF