diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/isa/ibm_mfc.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/isa/ibm_mfc.cpp')
-rw-r--r-- | src/devices/bus/isa/ibm_mfc.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp index 40ce54ff6fc..30a638d1c27 100644 --- a/src/devices/bus/isa/ibm_mfc.cpp +++ b/src/devices/bus/isa/ibm_mfc.cpp @@ -374,11 +374,10 @@ ROM_END // device_add_mconfig - add device configuration //------------------------------------------------- -void isa8_ibm_mfc_device::device_add_mconfig(machine_config &config) -{ - Z80(config, m_cpu, XTAL(11'800'000) / 2); - m_cpu->set_addrmap(AS_PROGRAM, &isa8_ibm_mfc_device::prg_map); - m_cpu->set_addrmap(AS_IO, &isa8_ibm_mfc_device::io_map); +MACHINE_CONFIG_START(isa8_ibm_mfc_device::device_add_mconfig) + MCFG_DEVICE_ADD("ibm_mfc", Z80, XTAL(11'800'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(prg_map) + MCFG_DEVICE_IO_MAP(io_map) I8255(config, m_d71055c_0); m_d71055c_0->in_pa_callback().set(FUNC(isa8_ibm_mfc_device::ppi0_i_a)); @@ -391,10 +390,10 @@ void isa8_ibm_mfc_device::device_add_mconfig(machine_config &config) m_d71055c_1->in_pb_callback().set(FUNC(isa8_ibm_mfc_device::ppi1_i_b)); m_d71055c_1->out_pc_callback().set(FUNC(isa8_ibm_mfc_device::ppi1_o_c)); - I8251(config, m_d71051, 0); + I8251(config, "d71051", 0); - clock_device &usart_clock(CLOCK(config, "usart_clock", XTAL(4'000'000) / 8)); // 500KHz - usart_clock.signal_handler().set(FUNC(isa8_ibm_mfc_device::write_usart_clock)); + MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL(4'000'000) / 8) // 500KHz + MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, isa8_ibm_mfc_device, write_usart_clock)) PIT8253(config, m_d8253, 0); m_d8253->set_clk<0>(XTAL(4'000'000) / 8); @@ -410,7 +409,7 @@ void isa8_ibm_mfc_device::device_add_mconfig(machine_config &config) m_ym2151->irq_handler().set(FUNC(isa8_ibm_mfc_device::ibm_mfc_ym_irq)); m_ym2151->add_route(0, "ymleft", 1.00); m_ym2151->add_route(1, "ymright", 1.00); -} +MACHINE_CONFIG_END //------------------------------------------------- |