summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/sf.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/sf.cpp')
-rw-r--r--src/mame/drivers/sf.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp
index 32a2e346785..4953f2a86eb 100644
--- a/src/mame/drivers/sf.cpp
+++ b/src/mame/drivers/sf.cpp
@@ -161,7 +161,7 @@ WRITE8_MEMBER(sf_state::msm2_5205_w)
m_msm2->vclk_w(0);
}
-static ADDRESS_MAP_START( sfan_map, AS_PROGRAM, 16, sf_state )
+ADDRESS_MAP_START(sf_state::sfan_map)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x04ffff) AM_ROM
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(videoram_w) AM_SHARE("videoram")
@@ -184,7 +184,7 @@ static ADDRESS_MAP_START( sfan_map, AS_PROGRAM, 16, sf_state )
AM_RANGE(0xffe000, 0xffffff) AM_RAM AM_SHARE("objectram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sfus_map, AS_PROGRAM, 16, sf_state )
+ADDRESS_MAP_START(sf_state::sfus_map)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x04ffff) AM_ROM
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(videoram_w) AM_SHARE("videoram")
@@ -207,7 +207,7 @@ static ADDRESS_MAP_START( sfus_map, AS_PROGRAM, 16, sf_state )
AM_RANGE(0xffe000, 0xffffff) AM_RAM AM_SHARE("objectram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sfjp_map, AS_PROGRAM, 16, sf_state )
+ADDRESS_MAP_START(sf_state::sfjp_map)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x04ffff) AM_ROM
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(videoram_w) AM_SHARE("videoram")
@@ -230,7 +230,7 @@ static ADDRESS_MAP_START( sfjp_map, AS_PROGRAM, 16, sf_state )
AM_RANGE(0xffe000, 0xffffff) AM_RAM AM_SHARE("objectram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, sf_state )
+ADDRESS_MAP_START(sf_state::sound_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_DEVREAD("soundlatch", generic_latch_8_device, read)
@@ -238,13 +238,13 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, sf_state )
ADDRESS_MAP_END
/* Yes, _no_ ram */
-static ADDRESS_MAP_START( sound2_map, AS_PROGRAM, 8, sf_state )
+ADDRESS_MAP_START(sf_state::sound2_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
AM_RANGE(0x0000, 0xffff) AM_WRITENOP /* avoid cluttering up error.log */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound2_io_map, AS_IO, 8, sf_state )
+ADDRESS_MAP_START(sf_state::sound2_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(msm1_5205_w)
AM_RANGE(0x01, 0x01) AM_WRITE(msm2_5205_w)