From 687c87abc039525c65d578809ec0bd253cdf2f17 Mon Sep 17 00:00:00 2001 From: Vinicius Sa Date: Wed, 11 Jul 2018 17:22:29 +0000 Subject: z80: Remove some MCFG_ macros. (nw) --- src/devices/bus/a2bus/a2applicard.cpp | 11 ++++++----- src/devices/bus/a2bus/a2softcard.cpp | 9 +++++---- src/devices/bus/c64/cpm.cpp | 11 ++++++----- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp index cb6b72a2db5..2b5aea0609a 100644 --- a/src/devices/bus/a2bus/a2applicard.cpp +++ b/src/devices/bus/a2bus/a2applicard.cpp @@ -52,11 +52,12 @@ ROM_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(a2bus_applicard_device::device_add_mconfig) - MCFG_DEVICE_ADD(Z80_TAG, Z80, 6000000) // Z80 runs at 6 MHz - MCFG_DEVICE_PROGRAM_MAP(z80_mem) - MCFG_DEVICE_IO_MAP(z80_io) -MACHINE_CONFIG_END +void a2bus_applicard_device::device_add_mconfig(machine_config &config) +{ + Z80(config, m_z80, 6000000); // Z80 runs at 6 MHz + m_z80->set_addrmap(AS_PROGRAM, &a2bus_applicard_device::z80_mem); + m_z80->set_addrmap(AS_IO, &a2bus_applicard_device::z80_io); +} //------------------------------------------------- // device_rom_region - device-specific ROMs diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp index 51d4c53d873..b8c71153e7b 100644 --- a/src/devices/bus/a2bus/a2softcard.cpp +++ b/src/devices/bus/a2bus/a2softcard.cpp @@ -37,10 +37,11 @@ void a2bus_softcard_device::z80_mem(address_map &map) // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(a2bus_softcard_device::device_add_mconfig) - MCFG_DEVICE_ADD(Z80_TAG, Z80, 1021800*2) // Z80 runs on double the Apple II's clock - MCFG_DEVICE_PROGRAM_MAP(z80_mem) -MACHINE_CONFIG_END +void a2bus_softcard_device::device_add_mconfig(machine_config &config) +{ + Z80(config, m_z80, 1021800*2); // Z80 runs on double the Apple II's clock + m_z80->set_addrmap(AS_PROGRAM, &a2bus_softcard_device::z80_mem); +} //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/c64/cpm.cpp b/src/devices/bus/c64/cpm.cpp index abff3ac15fe..81b6dd4eea2 100644 --- a/src/devices/bus/c64/cpm.cpp +++ b/src/devices/bus/c64/cpm.cpp @@ -60,11 +60,12 @@ void c64_cpm_cartridge_device::z80_io(address_map &map) // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(c64_cpm_cartridge_device::device_add_mconfig) - MCFG_DEVICE_ADD(Z80_TAG, Z80, 3000000) - MCFG_DEVICE_PROGRAM_MAP(z80_mem) - MCFG_DEVICE_IO_MAP(z80_io) -MACHINE_CONFIG_END +void c64_cpm_cartridge_device::device_add_mconfig(machine_config &config) +{ + Z80(config, m_maincpu, 3000000); + m_maincpu->set_addrmap(AS_PROGRAM, &c64_cpm_cartridge_device::z80_mem); + m_maincpu->set_addrmap(AS_IO, &c64_cpm_cartridge_device::z80_io); +} -- cgit v1.2.3