summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/novag68k.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/novag68k.cpp
parentf155992daab88ad024cec995428a67108218b51d (diff)
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/novag68k.cpp')
-rw-r--r--src/mame/drivers/novag68k.cpp24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/mame/drivers/novag68k.cpp b/src/mame/drivers/novag68k.cpp
index 52ebfefd133..0c48b204951 100644
--- a/src/mame/drivers/novag68k.cpp
+++ b/src/mame/drivers/novag68k.cpp
@@ -112,17 +112,19 @@ READ8_MEMBER(novag68k_state::diablo68k_input2_r)
// Diablo 68000
-ADDRESS_MAP_START(novag68k_state::diablo68k_map)
- AM_RANGE(0x000000, 0x00ffff) AM_ROM
- AM_RANGE(0x200000, 0x20ffff) AM_ROM AM_REGION("maincpu", 0x10000)
- AM_RANGE(0x280000, 0x28ffff) AM_RAM
- AM_RANGE(0x300000, 0x300007) AM_DEVREADWRITE8("acia", mos6551_device, read, write, 0xff00)
- AM_RANGE(0x380000, 0x380001) AM_WRITE8(diablo68k_leds_w, 0xff00) AM_READNOP
- AM_RANGE(0x3a0000, 0x3a0001) AM_WRITE8(diablo68k_lcd_data_w, 0xff00)
- AM_RANGE(0x3c0000, 0x3c0001) AM_READWRITE8(diablo68k_input2_r, diablo68k_control_w, 0xff00)
- AM_RANGE(0x3e0000, 0x3e0001) AM_READ8(diablo68k_input1_r, 0xff00)
- AM_RANGE(0xff8000, 0xffbfff) AM_RAM AM_SHARE("nvram")
-ADDRESS_MAP_END
+void novag68k_state::diablo68k_map(address_map &map)
+{
+ map(0x000000, 0x00ffff).rom();
+ map(0x200000, 0x20ffff).rom().region("maincpu", 0x10000);
+ map(0x280000, 0x28ffff).ram();
+ map(0x300000, 0x300007).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)).umask16(0xff00);
+ map(0x380000, 0x380001).nopr();
+ map(0x380000, 0x380000).w(this, FUNC(novag68k_state::diablo68k_leds_w));
+ map(0x3a0000, 0x3a0000).w(this, FUNC(novag68k_state::diablo68k_lcd_data_w));
+ map(0x3c0000, 0x3c0000).rw(this, FUNC(novag68k_state::diablo68k_input2_r), FUNC(novag68k_state::diablo68k_control_w));
+ map(0x3e0000, 0x3e0000).r(this, FUNC(novag68k_state::diablo68k_input1_r));
+ map(0xff8000, 0xffbfff).ram().share("nvram");
+}