summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/segae.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/segae.cpp')
-rw-r--r--src/mame/drivers/segae.cpp24
1 files changed, 15 insertions, 9 deletions
diff --git a/src/mame/drivers/segae.cpp b/src/mame/drivers/segae.cpp
index a3271606e6f..74ad723a84a 100644
--- a/src/mame/drivers/segae.cpp
+++ b/src/mame/drivers/segae.cpp
@@ -347,6 +347,12 @@ public:
void hangonjr(machine_config &config);
void systeme(machine_config &config);
void systemeb(machine_config &config);
+ void banked_decrypted_opcodes_map(address_map &map);
+ void decrypted_opcodes_map(address_map &map);
+ void io_map(address_map &map);
+ void systeme_map(address_map &map);
+ void vdp1_map(address_map &map);
+ void vdp2_map(address_map &map);
private:
// Devices
required_device<cpu_device> m_maincpu;
@@ -372,26 +378,26 @@ private:
****************************************************************************************/
/* we have to fill in the ROM addresses for systeme due to the encrypted games */
-static ADDRESS_MAP_START( systeme_map, AS_PROGRAM, 8, systeme_state )
+ADDRESS_MAP_START(systeme_state::systeme_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM /* Fixed ROM */
AM_RANGE(0x8000, 0xbfff) AM_READ_BANK("bank1") AM_WRITE_BANK("vram_write") /* Banked ROM */
AM_RANGE(0xc000, 0xffff) AM_RAM AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( decrypted_opcodes_map, AS_OPCODES, 8, systeme_state )
+ADDRESS_MAP_START(systeme_state::decrypted_opcodes_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM AM_SHARE("decrypted_opcodes")
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xffff) AM_RAM AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( banked_decrypted_opcodes_map, AS_OPCODES, 8, systeme_state )
+ADDRESS_MAP_START(systeme_state::banked_decrypted_opcodes_map)
AM_RANGE(0x0000, 0x7fff) AM_ROMBANK("bank0d")
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1d")
AM_RANGE(0xc000, 0xffff) AM_RAM AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, AS_IO, 8, systeme_state )
+ADDRESS_MAP_START(systeme_state::io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x7b, 0x7b) AM_DEVWRITE("sn1", segapsg_device, write)
@@ -411,12 +417,12 @@ static ADDRESS_MAP_START( io_map, AS_IO, 8, systeme_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vdp1_map, 0, 8, systeme_state )
+ADDRESS_MAP_START(systeme_state::vdp1_map)
AM_RANGE( 0x0000, 0x3fff ) AM_RAMBANK("vdp1_bank")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vdp2_map, 0, 8, systeme_state )
+ADDRESS_MAP_START(systeme_state::vdp2_map)
AM_RANGE( 0x0000, 0x3fff ) AM_RAMBANK("vdp2_bank")
ADDRESS_MAP_END
@@ -925,14 +931,14 @@ MACHINE_CONFIG_DERIVED(systeme_state::systemex, systeme)
MCFG_CPU_REPLACE("maincpu", MC8123, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
MCFG_CPU_PROGRAM_MAP(systeme_map)
MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(systeme_state::systemex_315_5177, systeme)
MCFG_CPU_REPLACE("maincpu", SEGA_315_5177, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
MCFG_CPU_PROGRAM_MAP(systeme_map)
MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
@@ -940,7 +946,7 @@ MACHINE_CONFIG_DERIVED(systeme_state::systemeb, systeme)
MCFG_CPU_REPLACE("maincpu", MC8123, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
MCFG_CPU_PROGRAM_MAP(systeme_map)
MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_DECRYPTED_OPCODES_MAP(banked_decrypted_opcodes_map)
+ MCFG_CPU_OPCODES_MAP(banked_decrypted_opcodes_map)
MACHINE_CONFIG_END