summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/zx.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/zx.cpp')
-rw-r--r--src/mame/drivers/zx.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/drivers/zx.cpp b/src/mame/drivers/zx.cpp
index 17209f4b969..d7318b779a2 100644
--- a/src/mame/drivers/zx.cpp
+++ b/src/mame/drivers/zx.cpp
@@ -51,34 +51,34 @@
/* Memory Maps */
-static ADDRESS_MAP_START( zx80_map, AS_PROGRAM, 8, zx_state )
+ADDRESS_MAP_START(zx_state::zx80_map)
AM_RANGE(0x0000, 0x0fff) AM_ROM AM_MIRROR(0x3000)
AM_RANGE(0x4000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( zx81_map, AS_PROGRAM, 8, zx_state )
+ADDRESS_MAP_START(zx_state::zx81_map)
AM_RANGE(0x0000, 0x1fff) AM_ROM AM_MIRROR(0x2000)
AM_RANGE(0x4000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ula_map, AS_OPCODES, 8, zx_state )
+ADDRESS_MAP_START(zx_state::ula_map)
AM_RANGE(0x0000, 0x7fff) AM_READ(ula_low_r)
AM_RANGE(0x8000, 0xffff) AM_READ(ula_high_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( zx80_io_map, AS_IO, 8, zx_state )
+ADDRESS_MAP_START(zx_state::zx80_io_map)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(zx80_io_r, zx80_io_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( zx81_io_map, AS_IO, 8, zx_state )
+ADDRESS_MAP_START(zx_state::zx81_io_map)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(zx81_io_r, zx81_io_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pc8300_io_map, AS_IO, 8, zx_state )
+ADDRESS_MAP_START(zx_state::pc8300_io_map)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(pc8300_io_r, zx81_io_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pow3000_io_map, AS_IO, 8, zx_state )
+ADDRESS_MAP_START(zx_state::pow3000_io_map)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(pow3000_io_r, zx81_io_w)
ADDRESS_MAP_END
@@ -323,7 +323,7 @@ MACHINE_CONFIG_START(zx_state::zx80)
MCFG_CPU_ADD("maincpu", Z80, XTAL(6'500'000)/2)
MCFG_CPU_PROGRAM_MAP(zx80_map)
MCFG_CPU_IO_MAP(zx80_io_map)
- MCFG_CPU_DECRYPTED_OPCODES_MAP(ula_map)
+ MCFG_CPU_OPCODES_MAP(ula_map)
MCFG_Z80_SET_REFRESH_CALLBACK(WRITE16(zx_state, refresh_w))
MCFG_SCREEN_ADD("screen", RASTER)