summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/elwro800.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/elwro800.cpp')
-rw-r--r--src/mame/drivers/elwro800.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp
index 07fc12bd86c..60e08f31e88 100644
--- a/src/mame/drivers/elwro800.cpp
+++ b/src/mame/drivers/elwro800.cpp
@@ -68,6 +68,11 @@ public:
DECLARE_WRITE_LINE_MEMBER(write_centronics_ack);
void elwro800(machine_config &config);
+ void elwro800_bank1(address_map &map);
+ void elwro800_bank2(address_map &map);
+ void elwro800_io(address_map &map);
+ void elwro800_m1(address_map &map);
+ void elwro800_mem(address_map &map);
protected:
required_device<i8251_device> m_i8251;
required_device<i8255_device> m_i8255;
@@ -364,30 +369,30 @@ WRITE8_MEMBER(elwro800_state::elwro800jr_io_w)
*
*************************************/
-static ADDRESS_MAP_START(elwro800_mem, AS_PROGRAM, 8, elwro800_state)
+ADDRESS_MAP_START(elwro800_state::elwro800_mem)
AM_RANGE(0x0000, 0x1fff) AM_DEVICE("bank1", address_map_bank_device, amap8)
AM_RANGE(0x2000, 0x3fff) AM_DEVICE("bank2", address_map_bank_device, amap8)
AM_RANGE(0x4000, 0xffff) AM_RAMBANK("rambank3")
ADDRESS_MAP_END
-static ADDRESS_MAP_START(elwro800_io, AS_IO, 8, elwro800_state)
+ADDRESS_MAP_START(elwro800_state::elwro800_io)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(elwro800jr_io_r, elwro800jr_io_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START(elwro800_m1, AS_OPCODES, 8, elwro800_state)
+ADDRESS_MAP_START(elwro800_state::elwro800_m1)
AM_RANGE(0x0000, 0x1fff) AM_DEVICE("bank1", address_map_bank_device, amap8)
AM_RANGE(0x0066, 0x0066) AM_READ(nmi_r)
AM_RANGE(0x2000, 0x3fff) AM_DEVICE("bank2", address_map_bank_device, amap8)
AM_RANGE(0x4000, 0xffff) AM_RAMBANK("rambank3")
ADDRESS_MAP_END
-static ADDRESS_MAP_START(elwro800_bank1, AS_PROGRAM, 8, elwro800_state)
+ADDRESS_MAP_START(elwro800_state::elwro800_bank1)
AM_RANGE(0x0000, 0x1fff) AM_RAMBANK("rambank1")
AM_RANGE(0x2000, 0x3fff) AM_ROM AM_REGION("maincpu", 0x0000) AM_WRITENOP // BAS0 ROM
AM_RANGE(0x4000, 0x5fff) AM_ROM AM_REGION("maincpu", 0x4000) AM_WRITENOP // BOOT ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(elwro800_bank2, AS_PROGRAM, 8, elwro800_state)
+ADDRESS_MAP_START(elwro800_state::elwro800_bank2)
AM_RANGE(0x0000, 0x1fff) AM_RAMBANK("rambank2")
AM_RANGE(0x2000, 0x3fff) AM_ROM AM_REGION("maincpu", 0x2000) AM_WRITENOP // BAS1 ROM
ADDRESS_MAP_END
@@ -561,7 +566,7 @@ MACHINE_CONFIG_START(elwro800_state::elwro800)
MCFG_CPU_ADD("maincpu",Z80, 3500000) /* 3.5 MHz */
MCFG_CPU_PROGRAM_MAP(elwro800_mem)
MCFG_CPU_IO_MAP(elwro800_io)
- MCFG_CPU_DECRYPTED_OPCODES_MAP(elwro800_m1)
+ MCFG_CPU_OPCODES_MAP(elwro800_m1)
MCFG_CPU_VBLANK_INT_DRIVER("screen", elwro800_state, elwro800jr_interrupt)
MCFG_MACHINE_RESET_OVERRIDE(elwro800_state,elwro800)