summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/xorworld.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/xorworld.cpp')
-rw-r--r--src/mame/drivers/xorworld.cpp27
1 files changed, 14 insertions, 13 deletions
diff --git a/src/mame/drivers/xorworld.cpp b/src/mame/drivers/xorworld.cpp
index 894e2cc3fd9..570406d2df3 100644
--- a/src/mame/drivers/xorworld.cpp
+++ b/src/mame/drivers/xorworld.cpp
@@ -61,19 +61,20 @@ WRITE16_MEMBER(xorworld_state::irq6_ack_w)
m_maincpu->set_input_line(6, CLEAR_LINE);
}
-ADDRESS_MAP_START(xorworld_state::xorworld_map)
- AM_RANGE(0x000000, 0x01ffff) AM_ROM
- AM_RANGE(0x200000, 0x200001) AM_READ_PORT("P1")
- AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P2")
- AM_RANGE(0x600000, 0x600001) AM_READ_PORT("DSW")
- AM_RANGE(0x800000, 0x800003) AM_DEVWRITE8("saa", saa1099_device, write, 0x00ff)
- AM_RANGE(0xa00000, 0xa0000f) AM_DEVWRITE8("mainlatch", ls259_device, write_d0, 0x00ff)
- AM_RANGE(0xffc000, 0xffc7ff) AM_RAM_WRITE(videoram_w) AM_SHARE("videoram")
- AM_RANGE(0xffc800, 0xffc87f) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xffc880, 0xffc881) AM_WRITE(irq2_ack_w) AM_READNOP
- AM_RANGE(0xffc882, 0xffc883) AM_WRITE(irq6_ack_w) AM_READNOP
- AM_RANGE(0xffc884, 0xffffff) AM_RAM
-ADDRESS_MAP_END
+void xorworld_state::xorworld_map(address_map &map)
+{
+ map(0x000000, 0x01ffff).rom();
+ map(0x200000, 0x200001).portr("P1");
+ map(0x400000, 0x400001).portr("P2");
+ map(0x600000, 0x600001).portr("DSW");
+ map(0x800000, 0x800003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff);
+ map(0xa00000, 0xa0000f).w("mainlatch", FUNC(ls259_device::write_d0)).umask16(0x00ff);
+ map(0xffc000, 0xffc7ff).ram().w(this, FUNC(xorworld_state::videoram_w)).share("videoram");
+ map(0xffc800, 0xffc87f).ram().share("spriteram");
+ map(0xffc880, 0xffc881).w(this, FUNC(xorworld_state::irq2_ack_w)).nopr();
+ map(0xffc882, 0xffc883).w(this, FUNC(xorworld_state::irq6_ack_w)).nopr();
+ map(0xffc884, 0xffffff).ram();
+}
static INPUT_PORTS_START( xorworld )