summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/prestige.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/prestige.cpp
parentf155992daab88ad024cec995428a67108218b51d (diff)
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/prestige.cpp')
-rw-r--r--src/mame/drivers/prestige.cpp55
1 files changed, 29 insertions, 26 deletions
diff --git a/src/mame/drivers/prestige.cpp b/src/mame/drivers/prestige.cpp
index 546c1784557..7e9770cb0b5 100644
--- a/src/mame/drivers/prestige.cpp
+++ b/src/mame/drivers/prestige.cpp
@@ -323,32 +323,35 @@ WRITE8_MEMBER( prestige_state::lcdc_w )
}
-ADDRESS_MAP_START(prestige_state::prestige_mem)
- AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1")
- AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2")
- AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3")
- AM_RANGE(0xc000, 0xdfff) AM_RAMBANK("bank4")
- AM_RANGE(0xe000, 0xffff) AM_RAMBANK("bank5")
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(prestige_state::prestige_io)
- ADDRESS_MAP_UNMAP_HIGH
- ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x04, 0x05) AM_READWRITE(mouse_r, mouse_w)
- AM_RANGE(0x30, 0x3f) AM_WRITE(lcdc_w)
- AM_RANGE(0x40, 0x40) AM_WRITE(kb_w)
- AM_RANGE(0x41, 0x42) AM_READ(kb_r)
- AM_RANGE(0x50, 0x56) AM_READWRITE(bankswitch_r, bankswitch_w)
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(prestige_state::glcolor_io)
- ADDRESS_MAP_UNMAP_HIGH
- ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x30, 0x3f) AM_WRITE(lcdc_w)
- AM_RANGE(0x40, 0x40) AM_WRITE(kb_w)
- AM_RANGE(0x41, 0x42) AM_READ(kb_r)
- AM_RANGE(0x50, 0x56) AM_READWRITE(bankswitch_r, bankswitch_w)
-ADDRESS_MAP_END
+void prestige_state::prestige_mem(address_map &map)
+{
+ map(0x0000, 0x3fff).bankr("bank1");
+ map(0x4000, 0x7fff).bankr("bank2");
+ map(0x8000, 0xbfff).bankr("bank3");
+ map(0xc000, 0xdfff).bankrw("bank4");
+ map(0xe000, 0xffff).bankrw("bank5");
+}
+
+void prestige_state::prestige_io(address_map &map)
+{
+ map.unmap_value_high();
+ map.global_mask(0xff);
+ map(0x04, 0x05).rw(this, FUNC(prestige_state::mouse_r), FUNC(prestige_state::mouse_w));
+ map(0x30, 0x3f).w(this, FUNC(prestige_state::lcdc_w));
+ map(0x40, 0x40).w(this, FUNC(prestige_state::kb_w));
+ map(0x41, 0x42).r(this, FUNC(prestige_state::kb_r));
+ map(0x50, 0x56).rw(this, FUNC(prestige_state::bankswitch_r), FUNC(prestige_state::bankswitch_w));
+}
+
+void prestige_state::glcolor_io(address_map &map)
+{
+ map.unmap_value_high();
+ map.global_mask(0xff);
+ map(0x30, 0x3f).w(this, FUNC(prestige_state::lcdc_w));
+ map(0x40, 0x40).w(this, FUNC(prestige_state::kb_w));
+ map(0x41, 0x42).r(this, FUNC(prestige_state::kb_r));
+ map(0x50, 0x56).rw(this, FUNC(prestige_state::bankswitch_r), FUNC(prestige_state::bankswitch_w));
+}
/* Input ports */
INPUT_PORTS_START( prestige )