From 11d0b41e5f2dc16cfcc2e87bf291fd8a31614e6a Mon Sep 17 00:00:00 2001 From: hap Date: Sat, 16 Feb 2019 20:22:05 +0100 Subject: [PATCH] fidel*: removed last remaining MACHINE_CONFIG_START (nw) --- src/mame/drivers/fidel68k.cpp | 11 ++++++----- src/mame/drivers/fidelz80.cpp | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp index be45eb18ad0..8ee543db846 100644 --- a/src/mame/drivers/fidel68k.cpp +++ b/src/mame/drivers/fidel68k.cpp @@ -640,7 +640,8 @@ void fidel68k_state::fdes2325(machine_config &config) config.set_default_layout(layout_fidel_desdis_68kg); } -MACHINE_CONFIG_START(fidel68k_state::eag_base) +void fidel68k_state::eag_base(machine_config &config) +{ /* basic machine hardware */ M68000(config, m_maincpu, 16_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &fidel68k_state::eag_map); @@ -663,11 +664,11 @@ MACHINE_CONFIG_START(fidel68k_state::eag_base) vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); /* cartridge */ - MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "fidel_scc") - MCFG_GENERIC_EXTENSIONS("bin,dat") - MCFG_GENERIC_LOAD(fidelbase_state, scc_cartridge) + generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "fidel_scc", "bin,dat")); + cartslot.set_device_load(device_image_load_delegate(&fidelbase_state::device_image_load_scc_cartridge, this)); + SOFTWARE_LIST(config, "cart_list").set_original("fidel_scc"); -MACHINE_CONFIG_END +} void fidel68k_state::eag(machine_config &config) { diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index b09f8880fca..84f44947084 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -663,8 +663,8 @@ public: private: // devices/pointers - optional_device m_mcu; - optional_device m_i8243; + required_device m_mcu; + required_device m_i8243; void vbrc_prepare_display(); DECLARE_WRITE8_MEMBER(vbrc_speech_w); @@ -925,6 +925,7 @@ void ccx_state::ccx_prepare_display() display_matrix(8, 4, outdata, m_led_select >> 2 & 0xf); } + // I8255 PPI WRITE8_MEMBER(ccx_state::ccx_ppi_porta_w)