summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/toypop.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/toypop.cpp')
-rw-r--r--src/mame/drivers/toypop.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/mame/drivers/toypop.cpp b/src/mame/drivers/toypop.cpp
index 617462c0b40..d5f51d0da8c 100644
--- a/src/mame/drivers/toypop.cpp
+++ b/src/mame/drivers/toypop.cpp
@@ -103,6 +103,11 @@ public:
DECLARE_WRITE8_MEMBER(bg_rmw_w);
void toypop(machine_config &config);
void liblrabl(machine_config &config);
+ void master_liblrabl_map(address_map &map);
+ void master_toypop_map(address_map &map);
+ void namcos16_master_base_map(address_map &map);
+ void slave_map(address_map &map);
+ void sound_map(address_map &map);
protected:
// driver_device overrides
// virtual void machine_start() override;
@@ -350,7 +355,7 @@ WRITE8_MEMBER(namcos16_state::pal_bank_w)
m_pal_bank = offset & 1;
}
-static ADDRESS_MAP_START( namcos16_master_base_map, AS_PROGRAM, 8, namcos16_state )
+ADDRESS_MAP_START(namcos16_state::namcos16_master_base_map)
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_SHARE("fgvram")
AM_RANGE(0x0400, 0x07ff) AM_RAM AM_SHARE("fgattr")
AM_RANGE(0x0800, 0x1fff) AM_RAM AM_SHARE("master_workram")
@@ -364,7 +369,7 @@ static ADDRESS_MAP_START( namcos16_master_base_map, AS_PROGRAM, 8, namcos16_stat
AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("master_rom",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_liblrabl_map, AS_PROGRAM, 8, namcos16_state )
+ADDRESS_MAP_START(namcos16_state::master_liblrabl_map)
AM_IMPORT_FROM( namcos16_master_base_map )
AM_RANGE(0x6000, 0x63ff) AM_DEVREADWRITE("namco", namco_15xx_device, sharedram_r, sharedram_w)
AM_RANGE(0x6800, 0x680f) AM_DEVREADWRITE("58xx", namco58xx_device, read, write)
@@ -373,7 +378,7 @@ static ADDRESS_MAP_START( master_liblrabl_map, AS_PROGRAM, 8, namcos16_state )
AM_RANGE(0x7000, 0x7fff) AM_READNOP AM_WRITE(irq_ctrl_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_toypop_map, AS_PROGRAM, 8, namcos16_state )
+ADDRESS_MAP_START(namcos16_state::master_toypop_map)
AM_IMPORT_FROM( namcos16_master_base_map )
AM_RANGE(0x6000, 0x600f) AM_DEVREADWRITE("58xx", namco58xx_device, read, write)
AM_RANGE(0x6010, 0x601f) AM_DEVREADWRITE("56xx_1", namco56xx_device, read, write)
@@ -382,7 +387,7 @@ static ADDRESS_MAP_START( master_toypop_map, AS_PROGRAM, 8, namcos16_state )
AM_RANGE(0x7000, 0x7000) AM_READWRITE(irq_enable_r,irq_disable_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 16, namcos16_state )
+ADDRESS_MAP_START(namcos16_state::slave_map)
AM_RANGE(0x000000, 0x007fff) AM_ROM AM_REGION("slave_rom", 0)
AM_RANGE(0x080000, 0x0bffff) AM_RAM
AM_RANGE(0x100000, 0x100fff) AM_READWRITE8(slave_shared_r,slave_shared_w,0x00ff)
@@ -391,7 +396,7 @@ static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 16, namcos16_state )
AM_RANGE(0x300000, 0x3fffff) AM_WRITE(slave_irq_enable_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, namcos16_state )
+ADDRESS_MAP_START(namcos16_state::sound_map)
AM_RANGE(0x0000, 0x03ff) AM_DEVREADWRITE("namco", namco_15xx_device, sharedram_r, sharedram_w)
AM_RANGE(0xe000, 0xffff) AM_ROM AM_REGION("sound_rom", 0)
ADDRESS_MAP_END