summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/fanucs15.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/fanucs15.cpp
parentf155992daab88ad024cec995428a67108218b51d (diff)
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/fanucs15.cpp')
-rw-r--r--src/mame/drivers/fanucs15.cpp48
1 files changed, 26 insertions, 22 deletions
diff --git a/src/mame/drivers/fanucs15.cpp b/src/mame/drivers/fanucs15.cpp
index 61cba533231..a219255f572 100644
--- a/src/mame/drivers/fanucs15.cpp
+++ b/src/mame/drivers/fanucs15.cpp
@@ -333,28 +333,32 @@ private:
virtual void machine_reset() override;
};
-ADDRESS_MAP_START(fanucs15_state::maincpu_mem)
- AM_RANGE(0x00000000, 0x0017ffff) AM_ROM AM_REGION("base1b", 0)
- AM_RANGE(0x000f8000, 0x000fffff) AM_RAM // filled with 0x96 on boot
- AM_RANGE(0xffff0000, 0xffffffff) AM_RAM // initial stack
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(fanucs15_state::pmccpu_mem)
- AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_REGION("base1a", 0)
- AM_RANGE(0xfde000, 0xffffff) AM_RAM
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(fanucs15_state::gfxcpu_mem)
- AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_REGION("gfxboard", 0)
- AM_RANGE(0xfe0000, 0xfeffff) AM_RAM
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(fanucs15_state::convcpu_mem)
- AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_REGION("conversational", 0x40000)
- AM_RANGE(0x040000, 0x07ffff) AM_ROM AM_REGION("conversational", 0)
- AM_RANGE(0x800000, 0x87ffff) AM_RAM
- AM_RANGE(0xf80000, 0xffffff) AM_ROM AM_REGION("conversational", 0)
-ADDRESS_MAP_END
+void fanucs15_state::maincpu_mem(address_map &map)
+{
+ map(0x00000000, 0x0017ffff).rom().region("base1b", 0);
+ map(0x000f8000, 0x000fffff).ram(); // filled with 0x96 on boot
+ map(0xffff0000, 0xffffffff).ram(); // initial stack
+}
+
+void fanucs15_state::pmccpu_mem(address_map &map)
+{
+ map(0x000000, 0x03ffff).rom().region("base1a", 0);
+ map(0xfde000, 0xffffff).ram();
+}
+
+void fanucs15_state::gfxcpu_mem(address_map &map)
+{
+ map(0x000000, 0x01ffff).rom().region("gfxboard", 0);
+ map(0xfe0000, 0xfeffff).ram();
+}
+
+void fanucs15_state::convcpu_mem(address_map &map)
+{
+ map(0x000000, 0x03ffff).rom().region("conversational", 0x40000);
+ map(0x040000, 0x07ffff).rom().region("conversational", 0);
+ map(0x800000, 0x87ffff).ram();
+ map(0xf80000, 0xffffff).rom().region("conversational", 0);
+}
/* Input ports */
static INPUT_PORTS_START( fanucs15 )