summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/mirax.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/mirax.cpp
parentf155992daab88ad024cec995428a67108218b51d (diff)
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/mirax.cpp')
-rw-r--r--src/mame/drivers/mirax.cpp54
1 files changed, 28 insertions, 26 deletions
diff --git a/src/mame/drivers/mirax.cpp b/src/mame/drivers/mirax.cpp
index 81d9140c60d..9bf20baf2e3 100644
--- a/src/mame/drivers/mirax.cpp
+++ b/src/mame/drivers/mirax.cpp
@@ -317,37 +317,39 @@ WRITE_LINE_MEMBER(mirax_state::flip_screen_y_w)
m_flipscreen_y = state;
}
-ADDRESS_MAP_START(mirax_state::mirax_main_map)
- AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc800, 0xd7ff) AM_RAM
- AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_SHARE("videoram")
- AM_RANGE(0xe800, 0xe9ff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xea00, 0xea3f) AM_RAM AM_SHARE("colorram") //per-column color + bank bits for the videoram
- AM_RANGE(0xf000, 0xf000) AM_READ_PORT("P1")
- AM_RANGE(0xf100, 0xf100) AM_READ_PORT("P2")
- AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW1")
- AM_RANGE(0xf300, 0xf300) AM_READNOP //watchdog? value is always read then discarded
- AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW2")
- AM_RANGE(0xf500, 0xf507) AM_DEVWRITE("mainlatch", ls259_device, write_d0)
- AM_RANGE(0xf800, 0xf800) AM_WRITE(sound_cmd_w)
+void mirax_state::mirax_main_map(address_map &map)
+{
+ map(0x0000, 0xbfff).rom();
+ map(0xc800, 0xd7ff).ram();
+ map(0xe000, 0xe3ff).ram().share("videoram");
+ map(0xe800, 0xe9ff).ram().share("spriteram");
+ map(0xea00, 0xea3f).ram().share("colorram"); //per-column color + bank bits for the videoram
+ map(0xf000, 0xf000).portr("P1");
+ map(0xf100, 0xf100).portr("P2");
+ map(0xf200, 0xf200).portr("DSW1");
+ map(0xf300, 0xf300).nopr(); //watchdog? value is always read then discarded
+ map(0xf400, 0xf400).portr("DSW2");
+ map(0xf500, 0xf507).w("mainlatch", FUNC(ls259_device::write_d0));
+ map(0xf800, 0xf800).w(this, FUNC(mirax_state::sound_cmd_w));
// AM_RANGE(0xf900, 0xf900) //sound cmd mirror? ack?
-ADDRESS_MAP_END
+}
-ADDRESS_MAP_START(mirax_state::mirax_sound_map)
- AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x8000, 0x8fff) AM_RAM
- AM_RANGE(0xa000, 0xa000) AM_DEVREAD("soundlatch", generic_latch_8_device, read)
+void mirax_state::mirax_sound_map(address_map &map)
+{
+ map(0x0000, 0x1fff).rom();
+ map(0x8000, 0x8fff).ram();
+ map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
- AM_RANGE(0xe000, 0xe000) AM_WRITENOP
- AM_RANGE(0xe001, 0xe001) AM_WRITENOP
- AM_RANGE(0xe003, 0xe003) AM_WRITE(ay1_sel) //1st ay ?
+ map(0xe000, 0xe000).nopw();
+ map(0xe001, 0xe001).nopw();
+ map(0xe003, 0xe003).w(this, FUNC(mirax_state::ay1_sel)); //1st ay ?
- AM_RANGE(0xe400, 0xe400) AM_WRITENOP
- AM_RANGE(0xe401, 0xe401) AM_WRITENOP
- AM_RANGE(0xe403, 0xe403) AM_WRITE(ay2_sel) //2nd ay ?
+ map(0xe400, 0xe400).nopw();
+ map(0xe401, 0xe401).nopw();
+ map(0xe403, 0xe403).w(this, FUNC(mirax_state::ay2_sel)); //2nd ay ?
- AM_RANGE(0xf900, 0xf9ff) AM_WRITE(audio_w)
-ADDRESS_MAP_END
+ map(0xf900, 0xf9ff).w(this, FUNC(mirax_state::audio_w));
+}
/* verified from Z80 code */