summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/srmp2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/srmp2.cpp')
-rw-r--r--src/mame/drivers/srmp2.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mame/drivers/srmp2.cpp b/src/mame/drivers/srmp2.cpp
index 0080134fa52..f2291c3800e 100644
--- a/src/mame/drivers/srmp2.cpp
+++ b/src/mame/drivers/srmp2.cpp
@@ -392,7 +392,7 @@ WRITE8_MEMBER(srmp2_state::srmp2_irq4_ack_w)
}
-static ADDRESS_MAP_START( srmp2_map, AS_PROGRAM, 16, srmp2_state )
+ADDRESS_MAP_START(srmp2_state::srmp2_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x0c0000, 0x0c3fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x140000, 0x143fff) AM_RAM AM_DEVREADWRITE("spritegen", seta001_device, spritecode_r16, spritecode_w16) /* Sprites Code + X + Attr */
@@ -425,7 +425,7 @@ READ8_MEMBER(srmp2_state::mjyuugi_irq4_ack_r)
return 0xff; // value returned doesn't matter
}
-static ADDRESS_MAP_START( mjyuugi_map, AS_PROGRAM, 16, srmp2_state )
+ADDRESS_MAP_START(srmp2_state::mjyuugi_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("SYSTEM") /* Coinage */
AM_RANGE(0x100000, 0x100001) AM_WRITE(mjyuugi_flags_w) /* Coin Counter */
@@ -471,7 +471,7 @@ WRITE8_MEMBER(srmp2_state::srmp3_irq_ack_w)
m_maincpu->set_input_line(0, CLEAR_LINE);
}
-static ADDRESS_MAP_START( srmp3_map, AS_PROGRAM, 8, srmp2_state )
+ADDRESS_MAP_START(srmp2_state::srmp3_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") /* rom bank */
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE("nvram") /* work ram */
@@ -483,7 +483,7 @@ static ADDRESS_MAP_START( srmp3_map, AS_PROGRAM, 8, srmp2_state )
AM_RANGE(0xe000, 0xffff) AM_RAM AM_DEVREADWRITE("spritegen", seta001_device, spritecodehigh_r8, spritecodehigh_w8)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( srmp3_io_map, AS_IO, 8, srmp2_state )
+ADDRESS_MAP_START(srmp2_state::srmp3_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x20, 0x20) AM_WRITE(srmp3_irq_ack_w) /* interrupt acknowledge */
AM_RANGE(0x40, 0x40) AM_READ_PORT("SYSTEM") AM_WRITE(srmp3_flags_w) /* coin, service | GFX bank, counter, lockout */
@@ -496,7 +496,7 @@ static ADDRESS_MAP_START( srmp3_io_map, AS_IO, 8, srmp2_state )
AM_RANGE(0xe2, 0xe2) AM_DEVREAD("aysnd", ay8910_device, data_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rmgoldyh_map, AS_PROGRAM, 8, srmp2_state )
+ADDRESS_MAP_START(srmp2_state::rmgoldyh_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") /* rom bank */
AM_RANGE(0xa000, 0xafff) AM_RAM AM_SHARE("nvram") /* work ram */
@@ -518,7 +518,7 @@ WRITE8_MEMBER(srmp2_state::rmgoldyh_rombank_w)
membank("bank1")->set_entry(data & 0x1f);
}
-static ADDRESS_MAP_START( rmgoldyh_io_map, AS_IO, 8, srmp2_state )
+ADDRESS_MAP_START(srmp2_state::rmgoldyh_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM(srmp3_io_map)
AM_RANGE(0x00, 0x00) AM_WRITENOP /* watchdog */