summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/ep64.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/ep64.cpp')
-rw-r--r--src/mame/drivers/ep64.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp
index 49f007af9e9..65c083d3b5e 100644
--- a/src/mame/drivers/ep64.cpp
+++ b/src/mame/drivers/ep64.cpp
@@ -219,6 +219,11 @@ public:
int m_centronics_busy;
void ep128(machine_config &config);
void ep64(machine_config &config);
+ void dave_128k_mem(address_map &map);
+ void dave_64k_mem(address_map &map);
+ void dave_io(address_map &map);
+ void ep64_io(address_map &map);
+ void ep64_mem(address_map &map);
};
@@ -358,7 +363,7 @@ WRITE8_MEMBER( ep64_state::wr2_w )
// ADDRESS_MAP( ep64_mem )
//-------------------------------------------------
-static ADDRESS_MAP_START( ep64_mem, AS_PROGRAM, 8, ep64_state )
+ADDRESS_MAP_START(ep64_state::ep64_mem)
AM_RANGE(0x0000, 0xffff) AM_DEVICE(DAVE_TAG, dave_device, z80_program_map)
ADDRESS_MAP_END
@@ -367,7 +372,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( ep64_io )
//-------------------------------------------------
-static ADDRESS_MAP_START( ep64_io, AS_IO, 8, ep64_state )
+ADDRESS_MAP_START(ep64_state::ep64_io)
AM_RANGE(0x0000, 0xffff) AM_DEVICE(DAVE_TAG, dave_device, z80_io_map)
ADDRESS_MAP_END
@@ -376,7 +381,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( dave_64k_mem )
//-------------------------------------------------
-static ADDRESS_MAP_START( dave_64k_mem, AS_PROGRAM, 8, ep64_state )
+ADDRESS_MAP_START(ep64_state::dave_64k_mem)
AM_RANGE(0x000000, 0x007fff) AM_ROM AM_REGION(Z80_TAG, 0)
//AM_RANGE(0x010000, 0x01ffff) // mapped by the cartslot
AM_RANGE(0x3f0000, 0x3fffff) AM_DEVICE(NICK_TAG, nick_device, vram_map)
@@ -387,7 +392,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( dave_128k_mem )
//-------------------------------------------------
-static ADDRESS_MAP_START( dave_128k_mem, AS_PROGRAM, 8, ep64_state )
+ADDRESS_MAP_START(ep64_state::dave_128k_mem)
AM_IMPORT_FROM(dave_64k_mem)
AM_RANGE(0x3e0000, 0x3effff) AM_RAM
ADDRESS_MAP_END
@@ -397,7 +402,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( dave_io )
//-------------------------------------------------
-static ADDRESS_MAP_START( dave_io, AS_IO, 8, ep64_state )
+ADDRESS_MAP_START(ep64_state::dave_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x80, 0x8f) AM_DEVICE(NICK_TAG, nick_device, vio_map)
AM_RANGE(0xb5, 0xb5) AM_READWRITE(rd0_r, wr0_w)