summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/scorpion.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/scorpion.cpp')
-rw-r--r--src/mame/drivers/scorpion.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp
index 09caa0c4250..31137594861 100644
--- a/src/mame/drivers/scorpion.cpp
+++ b/src/mame/drivers/scorpion.cpp
@@ -36,6 +36,9 @@ public:
void scorpion(machine_config &config);
void profi(machine_config &config);
void quorum(machine_config &config);
+ void scorpion_io(address_map &map);
+ void scorpion_mem(address_map &map);
+ void scorpion_switch(address_map &map);
protected:
required_memory_bank m_bank1;
required_memory_bank m_bank2;
@@ -173,14 +176,14 @@ READ8_MEMBER(scorpion_state::beta_disable_r)
return m_program->read_byte(offset + 0x4000);
}
-static ADDRESS_MAP_START( scorpion_mem, AS_PROGRAM, 8, scorpion_state )
+ADDRESS_MAP_START(scorpion_state::scorpion_mem)
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1") AM_WRITE(scorpion_0000_w)
AM_RANGE(0x4000, 0x7fff) AM_RAMBANK("bank2")
AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank3")
AM_RANGE(0xc000, 0xffff) AM_RAMBANK("bank4")
ADDRESS_MAP_END
-static ADDRESS_MAP_START (scorpion_io, AS_IO, 8, scorpion_state )
+ADDRESS_MAP_START(scorpion_state::scorpion_io)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x001f, 0x001f) AM_DEVREADWRITE(BETA_DISK_TAG, beta_disk_device, status_r, command_w) AM_MIRROR(0xff00)
AM_RANGE(0x003f, 0x003f) AM_DEVREADWRITE(BETA_DISK_TAG, beta_disk_device, track_r, track_w) AM_MIRROR(0xff00)
@@ -194,7 +197,7 @@ static ADDRESS_MAP_START (scorpion_io, AS_IO, 8, scorpion_state )
AM_RANGE(0x0021, 0x0021) AM_WRITE(scorpion_port_1ffd_w) AM_MIRROR(0x3fdc)
ADDRESS_MAP_END
-static ADDRESS_MAP_START (scorpion_switch, AS_OPCODES, 8, scorpion_state)
+ADDRESS_MAP_START(scorpion_state::scorpion_switch)
AM_RANGE(0x0000, 0x3fff) AM_READ(beta_neutral_r) // Overlap with previous because we want real addresses on the 3e00-3fff range
AM_RANGE(0x3d00, 0x3dff) AM_READ(beta_enable_r)
AM_RANGE(0x4000, 0xffff) AM_READ(beta_disable_r)
@@ -287,7 +290,7 @@ MACHINE_CONFIG_DERIVED(scorpion_state::scorpion, spectrum_128)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(scorpion_mem)
MCFG_CPU_IO_MAP(scorpion_io)
- MCFG_CPU_DECRYPTED_OPCODES_MAP(scorpion_switch)
+ MCFG_CPU_OPCODES_MAP(scorpion_switch)
MCFG_MACHINE_START_OVERRIDE(scorpion_state, scorpion )
MCFG_MACHINE_RESET_OVERRIDE(scorpion_state, scorpion )