summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/kickgoal.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/kickgoal.cpp')
-rw-r--r--src/mame/drivers/kickgoal.cpp42
1 files changed, 22 insertions, 20 deletions
diff --git a/src/mame/drivers/kickgoal.cpp b/src/mame/drivers/kickgoal.cpp
index 434e5c201fa..a577345975a 100644
--- a/src/mame/drivers/kickgoal.cpp
+++ b/src/mame/drivers/kickgoal.cpp
@@ -473,24 +473,25 @@ WRITE16_MEMBER(kickgoal_state::kickgoal_eeprom_w)
/* Memory Maps *****************************************************************/
-ADDRESS_MAP_START(kickgoal_state::kickgoal_program_map)
- AM_RANGE(0x000000, 0x0fffff) AM_ROM
+void kickgoal_state::kickgoal_program_map(address_map &map)
+{
+ map(0x000000, 0x0fffff).rom();
/// AM_RANGE(0x30001e, 0x30001f) AM_WRITE(kickgoal_snd_w)
- AM_RANGE(0x800000, 0x800001) AM_READ_PORT("P1_P2")
- AM_RANGE(0x800002, 0x800003) AM_READ_PORT("SYSTEM")
+ map(0x800000, 0x800001).portr("P1_P2");
+ map(0x800002, 0x800003).portr("SYSTEM");
/// AM_RANGE(0x800004, 0x800005) AM_DEVWRITE("soundlatch", generic_latch_16_device, write)
- AM_RANGE(0x800004, 0x800005) AM_WRITE(actionhw_snd_w)
- AM_RANGE(0x900000, 0x900005) AM_WRITE(kickgoal_eeprom_w)
- AM_RANGE(0x900006, 0x900007) AM_READ(kickgoal_eeprom_r)
- AM_RANGE(0xa00000, 0xa03fff) AM_RAM_WRITE(kickgoal_fgram_w) AM_SHARE("fgram") /* FG Layer */
- AM_RANGE(0xa04000, 0xa07fff) AM_RAM_WRITE(kickgoal_bgram_w) AM_SHARE("bgram") /* Higher BG Layer */
- AM_RANGE(0xa08000, 0xa0bfff) AM_RAM_WRITE(kickgoal_bg2ram_w) AM_SHARE("bg2ram") /* Lower BG Layer */
- AM_RANGE(0xa0c000, 0xa0ffff) AM_RAM // more tilemap?
- AM_RANGE(0xa10000, 0xa1000f) AM_WRITEONLY AM_SHARE("scrram") /* Scroll Registers */
- AM_RANGE(0xb00000, 0xb007ff) AM_WRITEONLY AM_SHARE("spriteram") /* Sprites */
- AM_RANGE(0xc00000, 0xc007ff) AM_RAM_DEVWRITE("palette", palette_device, write16) AM_SHARE("palette") /* Palette */ // actionhw reads this
- AM_RANGE(0xff0000, 0xffffff) AM_RAM
-ADDRESS_MAP_END
+ map(0x800004, 0x800005).w(this, FUNC(kickgoal_state::actionhw_snd_w));
+ map(0x900000, 0x900005).w(this, FUNC(kickgoal_state::kickgoal_eeprom_w));
+ map(0x900006, 0x900007).r(this, FUNC(kickgoal_state::kickgoal_eeprom_r));
+ map(0xa00000, 0xa03fff).ram().w(this, FUNC(kickgoal_state::kickgoal_fgram_w)).share("fgram"); /* FG Layer */
+ map(0xa04000, 0xa07fff).ram().w(this, FUNC(kickgoal_state::kickgoal_bgram_w)).share("bgram"); /* Higher BG Layer */
+ map(0xa08000, 0xa0bfff).ram().w(this, FUNC(kickgoal_state::kickgoal_bg2ram_w)).share("bg2ram"); /* Lower BG Layer */
+ map(0xa0c000, 0xa0ffff).ram(); // more tilemap?
+ map(0xa10000, 0xa1000f).writeonly().share("scrram"); /* Scroll Registers */
+ map(0xb00000, 0xb007ff).writeonly().share("spriteram"); /* Sprites */
+ map(0xc00000, 0xc007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); /* Palette */ // actionhw reads this
+ map(0xff0000, 0xffffff).ram();
+}
/* INPUT ports ***************************************************************/
@@ -626,10 +627,11 @@ void kickgoal_state::machine_reset()
}
-ADDRESS_MAP_START(kickgoal_state::oki_map)
- AM_RANGE(0x00000, 0x1ffff) AM_ROM
- AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank")
-ADDRESS_MAP_END
+void kickgoal_state::oki_map(address_map &map)
+{
+ map(0x00000, 0x1ffff).rom();
+ map(0x20000, 0x3ffff).bankr("okibank");
+}
MACHINE_CONFIG_START(kickgoal_state::kickgoal)