From fc09634167a4b8032aadcd32c6da900384fa4bd0 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Fri, 31 Aug 2018 18:20:13 +0200 Subject: z80daisy: finished removing MCFG macro (nw) --- src/devices/bus/abcbus/fd2.cpp | 8 ++++---- src/devices/bus/abcbus/fd2.h | 2 +- src/devices/bus/abcbus/lux10828.cpp | 8 ++++---- src/devices/bus/abcbus/lux21046.cpp | 8 ++++---- src/devices/bus/abcbus/lux21046.h | 2 +- src/devices/bus/ecbbus/grip.cpp | 8 ++++---- src/devices/bus/imi7000/imi5000h.cpp | 8 ++++---- src/devices/bus/imi7000/imi5000h.h | 2 +- src/devices/bus/wangpc/rtc.cpp | 10 +++++----- src/devices/bus/wangpc/rtc.h | 2 +- src/devices/bus/wangpc/wdc.cpp | 10 +++++----- src/devices/bus/wangpc/wdc.h | 2 +- src/devices/machine/ldv1000.cpp | 8 ++++---- src/devices/machine/z80ctc.cpp | 13 +++++++------ src/devices/machine/z80daisy.h | 11 ----------- src/mame/drivers/bigbord2.cpp | 10 +++++----- src/mame/drivers/bullet.cpp | 16 ++++++++-------- src/mame/drivers/chessmst.cpp | 30 +++++++++++++++--------------- src/mame/drivers/kc.cpp | 17 +++++++++-------- src/mame/drivers/mc8020.cpp | 10 +++++----- src/mame/drivers/mc8030.cpp | 10 +++++----- src/mame/drivers/onyx.cpp | 32 +++++++++++++++++--------------- src/mame/drivers/xerox820.cpp | 25 +++++++++++++------------ src/mame/includes/bullet.h | 2 +- src/mame/includes/kc.h | 2 +- src/mame/includes/xerox820.h | 2 +- 26 files changed, 126 insertions(+), 132 deletions(-) diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp index 02131c32269..57c55be21e3 100644 --- a/src/devices/bus/abcbus/fd2.cpp +++ b/src/devices/bus/abcbus/fd2.cpp @@ -238,10 +238,10 @@ FLOPPY_FORMATS_END //------------------------------------------------- MACHINE_CONFIG_START(abc_fd2_device::device_add_mconfig) - MCFG_DEVICE_ADD(Z80_TAG, Z80, 4_MHz_XTAL / 2) - MCFG_DEVICE_PROGRAM_MAP(abc_fd2_mem) - MCFG_DEVICE_IO_MAP(abc_fd2_io) - MCFG_Z80_DAISY_CHAIN(daisy_chain) + Z80(config, m_maincpu, 4_MHz_XTAL / 2); + m_maincpu->set_addrmap(AS_PROGRAM, &abc_fd2_device::abc_fd2_mem); + m_maincpu->set_addrmap(AS_IO, &abc_fd2_device::abc_fd2_io); + m_maincpu->set_daisy_config(daisy_chain); Z80PIO(config, m_pio, 4_MHz_XTAL / 2); m_pio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); diff --git a/src/devices/bus/abcbus/fd2.h b/src/devices/bus/abcbus/fd2.h index b9a2dd85181..9077e071949 100644 --- a/src/devices/bus/abcbus/fd2.h +++ b/src/devices/bus/abcbus/fd2.h @@ -64,7 +64,7 @@ private: void abc_fd2_io(address_map &map); void abc_fd2_mem(address_map &map); - required_device m_maincpu; + required_device m_maincpu; required_device m_pio; required_device m_fdc; required_device m_floppy0; diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp index 834f852dadc..5010bf9bf0e 100644 --- a/src/devices/bus/abcbus/lux10828.cpp +++ b/src/devices/bus/abcbus/lux10828.cpp @@ -321,10 +321,10 @@ WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_drq_w ) //------------------------------------------------- MACHINE_CONFIG_START(luxor_55_10828_device::device_add_mconfig) - MCFG_DEVICE_ADD(Z80_TAG, Z80, 4_MHz_XTAL / 2) - MCFG_DEVICE_PROGRAM_MAP(luxor_55_10828_mem) - MCFG_DEVICE_IO_MAP(luxor_55_10828_io) - MCFG_Z80_DAISY_CHAIN(daisy_chain) + Z80(config, m_maincpu, 4_MHz_XTAL / 2); + m_maincpu->set_addrmap(AS_PROGRAM, &luxor_55_10828_device::luxor_55_10828_mem); + m_maincpu->set_addrmap(AS_IO, &luxor_55_10828_device::luxor_55_10828_io); + m_maincpu->set_daisy_config(daisy_chain); Z80PIO(config, m_pio, 4_MHz_XTAL / 2); m_pio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index 984193f5e66..6d4b3dc7804 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -291,10 +291,10 @@ static const z80_daisy_config z80_daisy_chain[] = //------------------------------------------------- MACHINE_CONFIG_START(luxor_55_21046_device::device_add_mconfig) - MCFG_DEVICE_ADD(Z80_TAG, Z80, 16_MHz_XTAL / 4) - MCFG_Z80_DAISY_CHAIN(z80_daisy_chain) - MCFG_DEVICE_PROGRAM_MAP(luxor_55_21046_mem) - MCFG_DEVICE_IO_MAP(luxor_55_21046_io) + Z80(config, m_maincpu, 16_MHz_XTAL / 4); + m_maincpu->set_daisy_config(z80_daisy_chain); + m_maincpu->set_addrmap(AS_PROGRAM, &luxor_55_21046_device::luxor_55_21046_mem); + m_maincpu->set_addrmap(AS_IO, &luxor_55_21046_device::luxor_55_21046_io); Z80DMA(config, m_dma, 16_MHz_XTAL / 4); m_dma->out_busreq_callback().set_inputline(m_maincpu, INPUT_LINE_HALT); diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h index d6964347676..c3f14ed47b3 100644 --- a/src/devices/bus/abcbus/lux21046.h +++ b/src/devices/bus/abcbus/lux21046.h @@ -98,7 +98,7 @@ private: void luxor_55_21046_io(address_map &map); void luxor_55_21046_mem(address_map &map); - required_device m_maincpu; + required_device m_maincpu; required_device m_dma; required_device m_fdc; required_device m_floppy0; diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index 7a98f57bb1d..5390e3a2015 100644 --- a/src/devices/bus/ecbbus/grip.cpp +++ b/src/devices/bus/ecbbus/grip.cpp @@ -407,10 +407,10 @@ void ecb_grip21_device::kb_w(uint8_t data) MACHINE_CONFIG_START(ecb_grip21_device::device_add_mconfig) // basic machine hardware - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4) - MCFG_Z80_DAISY_CHAIN(grip_daisy_chain) - MCFG_DEVICE_PROGRAM_MAP(grip_mem) - MCFG_DEVICE_IO_MAP(grip_io) + z80_device& z80(Z80(config, Z80_TAG, XTAL(16'000'000)/4)); + z80.set_daisy_config(grip_daisy_chain); + z80.set_addrmap(AS_PROGRAM, &ecb_grip21_device::grip_mem); + z80.set_addrmap(AS_IO, &ecb_grip21_device::grip_io); // video hardware MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::white()) diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp index ec8ac8c8347..26bde60c8ae 100644 --- a/src/devices/bus/imi7000/imi5000h.cpp +++ b/src/devices/bus/imi7000/imi5000h.cpp @@ -343,10 +343,10 @@ WRITE8_MEMBER( imi5000h_device::pio3_pb_w ) //------------------------------------------------- MACHINE_CONFIG_START(imi5000h_device::device_add_mconfig) - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) - MCFG_Z80_DAISY_CHAIN(z80_daisy_chain) - MCFG_DEVICE_PROGRAM_MAP(imi5000h_mem) - MCFG_DEVICE_IO_MAP(imi5000h_io) + Z80(config, m_maincpu, XTAL(8'000'000)/2); + m_maincpu->set_daisy_config(z80_daisy_chain); + m_maincpu->set_addrmap(AS_PROGRAM, &imi5000h_device::imi5000h_mem); + m_maincpu->set_addrmap(AS_IO, &imi5000h_device::imi5000h_io); MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000) / 2) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) diff --git a/src/devices/bus/imi7000/imi5000h.h b/src/devices/bus/imi7000/imi5000h.h index c3e38eea6af..935b6d7046b 100644 --- a/src/devices/bus/imi7000/imi5000h.h +++ b/src/devices/bus/imi7000/imi5000h.h @@ -74,7 +74,7 @@ private: LED_READY }; - required_device m_maincpu; + required_device m_maincpu; required_device m_ctc; required_ioport m_lsi11; required_ioport m_mux; diff --git a/src/devices/bus/wangpc/rtc.cpp b/src/devices/bus/wangpc/rtc.cpp index dbff0547a4f..0b563814726 100644 --- a/src/devices/bus/wangpc/rtc.cpp +++ b/src/devices/bus/wangpc/rtc.cpp @@ -106,12 +106,12 @@ static const z80_daisy_config wangpc_rtc_daisy_chain[] = //------------------------------------------------- MACHINE_CONFIG_START(wangpc_rtc_device::device_add_mconfig) - MCFG_DEVICE_ADD(Z80_TAG, Z80, 2000000) - MCFG_Z80_DAISY_CHAIN(wangpc_rtc_daisy_chain) - MCFG_DEVICE_PROGRAM_MAP(wangpc_rtc_mem) - MCFG_DEVICE_IO_MAP(wangpc_rtc_io) + Z80(config, m_maincpu, 2000000); + m_maincpu->set_daisy_config(wangpc_rtc_daisy_chain); + m_maincpu->set_addrmap(AS_PROGRAM, &wangpc_rtc_device::wangpc_rtc_mem); + m_maincpu->set_addrmap(AS_IO, &wangpc_rtc_device::wangpc_rtc_io); - MCFG_DEVICE_ADD(AM9517A_TAG, AM9517A, 2000000) + AM9517A(config, m_dmac, 2000000); MCFG_DEVICE_ADD(Z80CTC_0_TAG, Z80CTC, 2000000) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) diff --git a/src/devices/bus/wangpc/rtc.h b/src/devices/bus/wangpc/rtc.h index b1bc38d4570..4f0b22372f2 100644 --- a/src/devices/bus/wangpc/rtc.h +++ b/src/devices/bus/wangpc/rtc.h @@ -47,7 +47,7 @@ protected: virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; private: - required_device m_maincpu; + required_device m_maincpu; required_device m_dmac; required_device m_ctc0; required_device m_ctc1; diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp index 49b8725e167..353d8a1fc62 100644 --- a/src/devices/bus/wangpc/wdc.cpp +++ b/src/devices/bus/wangpc/wdc.cpp @@ -93,15 +93,15 @@ void wangpc_wdc_device::wangpc_wdc_io(address_map &map) //------------------------------------------------- MACHINE_CONFIG_START(wangpc_wdc_device::device_add_mconfig) - MCFG_DEVICE_ADD(Z80_TAG, Z80, 2000000) // XTAL(10'000'000) / ? - //MCFG_Z80_DAISY_CHAIN(wangpc_wdc_daisy_chain) - MCFG_DEVICE_PROGRAM_MAP(wangpc_wdc_mem) - MCFG_DEVICE_IO_MAP(wangpc_wdc_io) + Z80(config, m_maincpu, 2000000); // XTAL(10'000'000) / ? + //m_maincpu->set_daisy_config(wangpc_wdc_daisy_chain); + m_maincpu->set_addrmap(AS_PROGRAM, &wangpc_wdc_device::wangpc_wdc_mem); + m_maincpu->set_addrmap(AS_IO, &wangpc_wdc_device::wangpc_wdc_io); MCFG_DEVICE_ADD(MK3882_TAG, Z80CTC, 2000000) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("harddisk0", SCSIHD, 0) + SCSIHD(config, "harddisk0", 0); MACHINE_CONFIG_END diff --git a/src/devices/bus/wangpc/wdc.h b/src/devices/bus/wangpc/wdc.h index 7f169db3898..e270a961750 100644 --- a/src/devices/bus/wangpc/wdc.h +++ b/src/devices/bus/wangpc/wdc.h @@ -64,7 +64,7 @@ private: void wangpc_wdc_io(address_map &map); void wangpc_wdc_mem(address_map &map); - required_device m_maincpu; + required_device m_maincpu; required_device m_ctc; uint8_t m_status; diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp index 21d27f351c5..d7e1ba4789e 100644 --- a/src/devices/machine/ldv1000.cpp +++ b/src/devices/machine/ldv1000.cpp @@ -273,10 +273,10 @@ const tiny_rom_entry *pioneer_ldv1000_device::device_rom_region() const //------------------------------------------------- MACHINE_CONFIG_START(pioneer_ldv1000_device::device_add_mconfig) - MCFG_DEVICE_ADD("ldv1000", Z80, XTAL(5'000'000)/2) - MCFG_Z80_DAISY_CHAIN(daisy_chain) - MCFG_DEVICE_PROGRAM_MAP(ldv1000_map) - MCFG_DEVICE_IO_MAP(ldv1000_portmap) + Z80(config, m_z80_cpu, XTAL(5'000'000)/2); + m_z80_cpu->set_daisy_config(daisy_chain); + m_z80_cpu->set_addrmap(AS_PROGRAM, &pioneer_ldv1000_device::ldv1000_map); + m_z80_cpu->set_addrmap(AS_IO, &pioneer_ldv1000_device::ldv1000_portmap); MCFG_DEVICE_ADD("ldvctc", Z80CTC, XTAL(5'000'000)/2) MCFG_Z80CTC_INTR_CB(WRITELINE(*this, pioneer_ldv1000_device, ctc_interrupt)) diff --git a/src/devices/machine/z80ctc.cpp b/src/devices/machine/z80ctc.cpp index 7be4ecb62b3..0ad5719a047 100644 --- a/src/devices/machine/z80ctc.cpp +++ b/src/devices/machine/z80ctc.cpp @@ -123,12 +123,13 @@ WRITE_LINE_MEMBER( z80ctc_device::trg3 ) { m_channel[3]->trigger(state != 0); } // machine configuration //------------------------------------------------- -MACHINE_CONFIG_START(z80ctc_device::device_add_mconfig) - MCFG_DEVICE_ADD("ch0", Z80CTC_CHANNEL, 0) - MCFG_DEVICE_ADD("ch1", Z80CTC_CHANNEL, 0) - MCFG_DEVICE_ADD("ch2", Z80CTC_CHANNEL, 0) - MCFG_DEVICE_ADD("ch3", Z80CTC_CHANNEL, 0) -MACHINE_CONFIG_END +void z80ctc_device::device_add_mconfig(machine_config & config) +{ + Z80CTC_CHANNEL(config, m_channel[0], 0); + Z80CTC_CHANNEL(config, m_channel[1], 0); + Z80CTC_CHANNEL(config, m_channel[2], 0); + Z80CTC_CHANNEL(config, m_channel[3], 0); +} //------------------------------------------------- diff --git a/src/devices/machine/z80daisy.h b/src/devices/machine/z80daisy.h index 439b1022f44..02c8037f66b 100644 --- a/src/devices/machine/z80daisy.h +++ b/src/devices/machine/z80daisy.h @@ -23,17 +23,6 @@ const uint8_t Z80_DAISY_INT = 0x01; // interrupt request mask const uint8_t Z80_DAISY_IEO = 0x02; // interrupt disable mask (IEO) - -//************************************************************************** -// DEVICE CONFIGURATION MACROS -//************************************************************************** - -// configure devices -#define MCFG_Z80_DAISY_CHAIN(_config) \ - dynamic_cast(*device).set_daisy_config(_config); - - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp index ad2fb715885..72c9747cfd6 100644 --- a/src/mame/drivers/bigbord2.cpp +++ b/src/mame/drivers/bigbord2.cpp @@ -148,7 +148,7 @@ private: address_space *m_mem; address_space *m_io; required_device m_palette; - required_device m_maincpu; + required_device m_maincpu; required_region_ptr m_p_ram; required_region_ptr m_p_chargen; required_device m_ctc1; @@ -549,10 +549,10 @@ MC6845_UPDATE_ROW( bigbord2_state::crtc_update_row ) MACHINE_CONFIG_START(bigbord2_state::bigbord2) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK) - MCFG_DEVICE_PROGRAM_MAP(bigbord2_mem) - MCFG_DEVICE_IO_MAP(bigbord2_io) - MCFG_Z80_DAISY_CHAIN(daisy_chain) + Z80(config, m_maincpu, MAIN_CLOCK); + m_maincpu->set_addrmap(AS_PROGRAM, &bigbord2_state::bigbord2_mem); + m_maincpu->set_addrmap(AS_IO, &bigbord2_state::bigbord2_io); + m_maincpu->set_daisy_config(daisy_chain); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp index d17e88a6a06..87f8a9a262b 100644 --- a/src/mame/drivers/bullet.cpp +++ b/src/mame/drivers/bullet.cpp @@ -1108,10 +1108,10 @@ void bulletf_state::machine_reset() MACHINE_CONFIG_START(bullet_state::bullet) // basic machine hardware - MCFG_DEVICE_ADD(Z80_TAG, Z80, 16_MHz_XTAL / 4) - MCFG_DEVICE_PROGRAM_MAP(bullet_mem) - MCFG_DEVICE_IO_MAP(bullet_io) - MCFG_Z80_DAISY_CHAIN(daisy_chain) + Z80(config, m_maincpu, 16_MHz_XTAL / 4); + m_maincpu->set_addrmap(AS_PROGRAM, &bullet_state::bullet_mem); + m_maincpu->set_addrmap(AS_IO, &bullet_state::bullet_io); + m_maincpu->set_daisy_config(daisy_chain); // devices MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 16_MHz_XTAL / 4) @@ -1187,10 +1187,10 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(bulletf_state::bulletf) // basic machine hardware - MCFG_DEVICE_ADD(Z80_TAG, Z80, 16_MHz_XTAL / 4) - MCFG_DEVICE_PROGRAM_MAP(bulletf_mem) - MCFG_DEVICE_IO_MAP(bulletf_io) - MCFG_Z80_DAISY_CHAIN(daisy_chain) + Z80(config, m_maincpu, 16_MHz_XTAL / 4); + m_maincpu->set_addrmap(AS_PROGRAM, &bulletf_state::bulletf_mem); + m_maincpu->set_addrmap(AS_IO, &bulletf_state::bulletf_io); + m_maincpu->set_daisy_config(daisy_chain); // devices MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 16_MHz_XTAL / 4) diff --git a/src/mame/drivers/chessmst.cpp b/src/mame/drivers/chessmst.cpp index bcb50b77787..5b8669f7782 100644 --- a/src/mame/drivers/chessmst.cpp +++ b/src/mame/drivers/chessmst.cpp @@ -64,13 +64,13 @@ protected: void chessmst_io(address_map &map); void chessmst_mem(address_map &map); - void chessmstdm(address_map &map); + void chessmstdm_mem(address_map &map); void chessmstdm_io(address_map &map); private: void update_display(); - required_device m_maincpu; + required_device m_maincpu; required_device m_pia2; optional_device m_speaker; optional_device m_beeper; @@ -96,7 +96,7 @@ void chessmst_state::chessmst_mem(address_map &map) map(0x3400, 0x3bff).ram(); } -void chessmst_state::chessmstdm(address_map &map) +void chessmst_state::chessmstdm_mem(address_map &map) { map.unmap_value_high(); map(0x0000, 0x3fff).rom(); @@ -381,10 +381,10 @@ static const z80_daisy_config chessmstdm_daisy_chain[] = MACHINE_CONFIG_START(chessmst_state::chessmst) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, 9.8304_MHz_XTAL/4) // U880 Z80 clone - MCFG_DEVICE_PROGRAM_MAP(chessmst_mem) - MCFG_DEVICE_IO_MAP(chessmst_io) - MCFG_Z80_DAISY_CHAIN(chessmst_daisy_chain) + Z80(config, m_maincpu, 9.8304_MHz_XTAL/4); // U880 Z80 clone + m_maincpu->set_addrmap(AS_PROGRAM, &chessmst_state::chessmst_mem); + m_maincpu->set_addrmap(AS_IO, &chessmst_state::chessmst_io); + m_maincpu->set_daisy_config(chessmst_daisy_chain); z80pio_device& pio1(Z80PIO(config, "z80pio1", 9.8304_MHz_XTAL/4)); pio1.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); @@ -406,10 +406,10 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(chessmst_state::chessmsta) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, 8_MHz_XTAL/4) // U880 Z80 clone - MCFG_DEVICE_PROGRAM_MAP(chessmst_mem) - MCFG_DEVICE_IO_MAP(chessmst_io) - MCFG_Z80_DAISY_CHAIN(chessmst_daisy_chain) + Z80(config, m_maincpu, 8_MHz_XTAL/4); // U880 Z80 clone + m_maincpu->set_addrmap(AS_PROGRAM, &chessmst_state::chessmst_mem); + m_maincpu->set_addrmap(AS_IO, &chessmst_state::chessmst_io); + m_maincpu->set_daisy_config(chessmst_daisy_chain); z80pio_device& pio1(Z80PIO(config, "z80pio1", 8_MHz_XTAL/4)); pio1.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); @@ -431,10 +431,10 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(chessmst_state::chessmstdm) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, 8_MHz_XTAL/2) // U880 Z80 clone - MCFG_DEVICE_PROGRAM_MAP(chessmstdm) - MCFG_DEVICE_IO_MAP(chessmstdm_io) - MCFG_Z80_DAISY_CHAIN(chessmstdm_daisy_chain) + Z80(config, m_maincpu, 8_MHz_XTAL/2); // U880 Z80 clone + m_maincpu->set_addrmap(AS_PROGRAM, &chessmst_state::chessmstdm_mem); + m_maincpu->set_addrmap(AS_IO, &chessmst_state::chessmstdm_io); + m_maincpu->set_daisy_config(chessmstdm_daisy_chain); z80pio_device& pio1(Z80PIO(config, "z80pio1", 8_MHz_XTAL/4)); pio1.out_pa_callback().set(FUNC(chessmst_state::pio1_port_a_w)); diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp index 176627250e8..ad0a5b6291e 100644 --- a/src/mame/drivers/kc.cpp +++ b/src/mame/drivers/kc.cpp @@ -98,10 +98,11 @@ void kc85_exp(device_slot_interface &device) MACHINE_CONFIG_START(kc_state::kc85_3) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, KC85_3_CLOCK) - MCFG_DEVICE_PROGRAM_MAP(kc85_3_mem) - MCFG_DEVICE_IO_MAP(kc85_3_io) - MCFG_Z80_DAISY_CHAIN(kc85_daisy_chain) + Z80(config, m_maincpu, KC85_3_CLOCK); + m_maincpu->set_addrmap(AS_PROGRAM, &kc_state::kc85_3_mem); + m_maincpu->set_addrmap(AS_IO, &kc_state::kc85_3_io); + m_maincpu->set_daisy_config(kc85_daisy_chain); + MCFG_QUANTUM_TIME(attotime::from_hz(60)) Z80PIO(config, m_z80pio, KC85_3_CLOCK); @@ -179,10 +180,10 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(kc85_4_state::kc85_4) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, KC85_4_CLOCK) - MCFG_DEVICE_PROGRAM_MAP(kc85_4_mem) - MCFG_DEVICE_IO_MAP(kc85_4_io) - MCFG_Z80_DAISY_CHAIN(kc85_daisy_chain) + Z80(config, m_maincpu, KC85_4_CLOCK); + m_maincpu->set_addrmap(AS_PROGRAM, &kc85_4_state::kc85_4_mem); + m_maincpu->set_addrmap(AS_IO, &kc85_4_state::kc85_4_io); + m_maincpu->set_daisy_config(kc85_daisy_chain); MCFG_QUANTUM_TIME(attotime::from_hz(60)) Z80PIO(config, m_z80pio, KC85_4_CLOCK); diff --git a/src/mame/drivers/mc8020.cpp b/src/mame/drivers/mc8020.cpp index 70a23be711e..e3bc4a43bbb 100644 --- a/src/mame/drivers/mc8020.cpp +++ b/src/mame/drivers/mc8020.cpp @@ -47,7 +47,7 @@ private: u8 m_row; required_shared_ptr m_p_videoram; - required_device m_maincpu; + required_device m_maincpu; required_ioport_array<7> m_keyboard; }; @@ -299,10 +299,10 @@ static const z80_daisy_config daisy_chain[] = MACHINE_CONFIG_START(mc8020_state::mc8020) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",Z80, XTAL(2'457'600)) - MCFG_DEVICE_PROGRAM_MAP(mem_map) - MCFG_DEVICE_IO_MAP(io_map) - MCFG_Z80_DAISY_CHAIN(daisy_chain) + Z80(config, m_maincpu, XTAL(2'457'600)); + m_maincpu->set_addrmap(AS_PROGRAM, &mc8020_state::mem_map); + m_maincpu->set_addrmap(AS_IO, &mc8020_state::io_map); + m_maincpu->set_daisy_config(daisy_chain); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/mc8030.cpp b/src/mame/drivers/mc8030.cpp index 7cc5140cdd1..219c0ce6880 100644 --- a/src/mame/drivers/mc8030.cpp +++ b/src/mame/drivers/mc8030.cpp @@ -58,7 +58,7 @@ private: void mem_map(address_map &map); required_region_ptr m_p_videoram; - required_device m_maincpu; + required_device m_maincpu; }; @@ -186,10 +186,10 @@ static const z80_daisy_config daisy_chain[] = MACHINE_CONFIG_START(mc8030_state::mc8030) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",Z80, XTAL(2'457'600)) - MCFG_DEVICE_PROGRAM_MAP(mem_map) - MCFG_DEVICE_IO_MAP(io_map) - MCFG_Z80_DAISY_CHAIN(daisy_chain) + Z80(config, m_maincpu, XTAL(2'457'600)); + m_maincpu->set_addrmap(AS_PROGRAM, &mc8030_state::mem_map); + m_maincpu->set_addrmap(AS_IO, &mc8030_state::io_map); + m_maincpu->set_daisy_config(daisy_chain); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/onyx.cpp b/src/mame/drivers/onyx.cpp index 57b6addba5b..ab8e520e82e 100644 --- a/src/mame/drivers/onyx.cpp +++ b/src/mame/drivers/onyx.cpp @@ -67,7 +67,7 @@ private: DECLARE_MACHINE_RESET(c8002); void z8002_m1_w(uint8_t data); - required_device m_maincpu; + required_device m_maincpu; // z8002 or z80 depending on driver optional_device_array m_sio; optional_device_array m_ctc; optional_device_array m_pio; @@ -138,16 +138,17 @@ void onyx_state::subio(address_map &map) MACHINE_CONFIG_START(onyx_state::c8002) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z8002, XTAL(4'000'000) ) - //MCFG_Z80_DAISY_CHAIN(main_daisy_chain) - MCFG_DEVICE_PROGRAM_MAP(c8002_mem) - //MCFG_DEVICE_DATA_MAP(c8002_data) - MCFG_DEVICE_IO_MAP(c8002_io) - - MCFG_DEVICE_ADD("subcpu", Z80, XTAL(4'000'000) ) - //MCFG_Z80_DAISY_CHAIN(sub_daisy_chain) - MCFG_DEVICE_PROGRAM_MAP(submem) - MCFG_DEVICE_IO_MAP(subio) + z8002_device& maincpu(Z8002(config, m_maincpu, XTAL(4'000'000))); + //maincpu.set_daisy_config(main_daisy_chain); + maincpu.set_addrmap(AS_PROGRAM, &onyx_state::c8002_mem); + //maincpu.set_addrmap(AS_DATA, &onyx_state::c8002_data); + maincpu.set_addrmap(AS_IO, &onyx_state::c8002_io); + + z80_device& subcpu(Z80(config, "subcpu", XTAL(4'000'000))); + //subcpu.set_daisy_config(sub_daisy_chain); + subcpu.set_addrmap(AS_PROGRAM, &onyx_state::submem); + subcpu.set_addrmap(AS_IO, &onyx_state::subio); + MCFG_MACHINE_RESET_OVERRIDE(onyx_state, c8002) clock_device &sio1_clock(CLOCK(config, "sio1_clock", 307200)); @@ -251,10 +252,11 @@ void onyx_state::c5000_io(address_map &map) MACHINE_CONFIG_START(onyx_state::c5000) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4 ) - //MCFG_Z80_DAISY_CHAIN(sub_daisy_chain) - MCFG_DEVICE_PROGRAM_MAP(c5000_mem) - MCFG_DEVICE_IO_MAP(c5000_io) + z80_device& maincpu(Z80(config, m_maincpu, XTAL(16'000'000) / 4)); + //maincpu.set_daisy_config(sub_daisy_chain); + maincpu.set_addrmap(AS_PROGRAM, &onyx_state::c5000_mem); + maincpu.set_addrmap(AS_IO, &onyx_state::c5000_io); + //MCFG_MACHINE_RESET_OVERRIDE(onyx_state, c8002) MCFG_DEVICE_ADD("sio1_clock", CLOCK, 614400) diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp index c61fcfb2d95..17c3190a190 100644 --- a/src/mame/drivers/xerox820.cpp +++ b/src/mame/drivers/xerox820.cpp @@ -597,10 +597,10 @@ GFXDECODE_END MACHINE_CONFIG_START(xerox820_state::xerox820) /* basic machine hardware */ - MCFG_DEVICE_ADD(Z80_TAG, Z80, 20_MHz_XTAL / 8) - MCFG_DEVICE_PROGRAM_MAP(xerox820_mem) - MCFG_DEVICE_IO_MAP(xerox820_io) - MCFG_Z80_DAISY_CHAIN(xerox820_daisy_chain) + Z80(config, m_maincpu, 20_MHz_XTAL / 8); + m_maincpu->set_addrmap(AS_PROGRAM, &xerox820_state::xerox820_mem); + m_maincpu->set_addrmap(AS_IO, &xerox820_state::xerox820_io); + m_maincpu->set_daisy_config(xerox820_daisy_chain); /* video hardware */ MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) @@ -673,10 +673,10 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(xerox820ii_state::xerox820ii) /* basic machine hardware */ - MCFG_DEVICE_ADD(Z80_TAG, Z80, 16_MHz_XTAL / 4) - MCFG_DEVICE_PROGRAM_MAP(xerox820ii_mem) - MCFG_DEVICE_IO_MAP(xerox820ii_io) - MCFG_Z80_DAISY_CHAIN(xerox820_daisy_chain) + Z80(config, m_maincpu, 16_MHz_XTAL / 4); + m_maincpu->set_addrmap(AS_PROGRAM, &xerox820ii_state::xerox820ii_mem); + m_maincpu->set_addrmap(AS_IO, &xerox820ii_state::xerox820ii_io); + m_maincpu->set_daisy_config(xerox820_daisy_chain); /* video hardware */ MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) @@ -776,11 +776,12 @@ MACHINE_CONFIG_START(xerox820ii_state::xerox168) m_ram->set_default_size("192K").set_extra_options("320K"); MACHINE_CONFIG_END -MACHINE_CONFIG_START(xerox820_state::mk83) +void xerox820_state::mk83(machine_config & config) +{ xerox820(config); - MCFG_DEVICE_MODIFY(Z80_TAG) - MCFG_DEVICE_PROGRAM_MAP(mk83_mem) -MACHINE_CONFIG_END + + m_maincpu->set_addrmap(AS_PROGRAM, &xerox820_state::mk83_mem); +} /* ROMs */ diff --git a/src/mame/includes/bullet.h b/src/mame/includes/bullet.h index 305dd230dd5..d4aa8e4d179 100644 --- a/src/mame/includes/bullet.h +++ b/src/mame/includes/bullet.h @@ -92,7 +92,7 @@ protected: void update_dma_rdy(); - required_device m_maincpu; + required_device m_maincpu; required_device m_ctc; required_device m_dart; required_device m_dmac; diff --git a/src/mame/includes/kc.h b/src/mame/includes/kc.h index c5df7463c58..4dc25f1e17a 100644 --- a/src/mame/includes/kc.h +++ b/src/mame/includes/kc.h @@ -70,7 +70,7 @@ public: , m_expansions(*this, {"m8", "mc", "exp"}) { } - required_device m_maincpu; + required_device m_maincpu; required_device m_z80pio; required_device m_z80ctc; required_device m_ram; diff --git a/src/mame/includes/xerox820.h b/src/mame/includes/xerox820.h index 1af826313da..5dbe35eccda 100644 --- a/src/mame/includes/xerox820.h +++ b/src/mame/includes/xerox820.h @@ -97,7 +97,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; - required_device m_maincpu; + required_device m_maincpu; required_device m_kbpio; required_device m_ctc; required_device m_sio; -- cgit v1.2.3