diff options
Diffstat (limited to 'src/devices/bus/acorn/system/vib.cpp')
-rw-r--r-- | src/devices/bus/acorn/system/vib.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/devices/bus/acorn/system/vib.cpp b/src/devices/bus/acorn/system/vib.cpp index e392225f1e0..69a5d2189a4 100644 --- a/src/devices/bus/acorn/system/vib.cpp +++ b/src/devices/bus/acorn/system/vib.cpp @@ -26,8 +26,7 @@ DEFINE_DEVICE_TYPE(ACORN_VIB, acorn_vib_device, "acorn_vib", "Acorn Versatile In // device_add_mconfig - add device configuration //------------------------------------------------- -void acorn_vib_device::device_add_mconfig(machine_config &config) -{ +MACHINE_CONFIG_START(acorn_vib_device::device_add_mconfig) INPUT_MERGER_ANY_HIGH(config, m_irqs).output_handler().set(FUNC(acorn_vib_device::irq_w)); VIA6522(config, m_via6522, XTAL(1'000'000)); @@ -38,8 +37,7 @@ void acorn_vib_device::device_add_mconfig(machine_config &config) CENTRONICS(config, m_centronics, centronics_devices, "printer"); m_centronics->ack_handler().set(m_via6522, FUNC(via6522_device::write_ca1)); m_centronics->busy_handler().set(m_via6522, FUNC(via6522_device::write_pa7)); - output_latch_device ¢_data_out(OUTPUT_LATCH(config, "cent_data_out")); - m_centronics->set_output_latch(cent_data_out); + MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") I8255(config, m_ppi8255, 0); @@ -55,7 +53,7 @@ void acorn_vib_device::device_add_mconfig(machine_config &config) CLOCK(config, m_acia_clock, 1.8432_MHz_XTAL); m_acia_clock->signal_handler().set(FUNC(acorn_vib_device::write_acia_clock)); -} +MACHINE_CONFIG_END //************************************************************************** // LIVE DEVICE @@ -96,7 +94,7 @@ void acorn_vib_device::device_reset() address_space &space = m_bus->memspace(); space.install_readwrite_handler(0x0c00, 0x0c0f, 0, 0x10, 0, read8sm_delegate(FUNC(via6522_device::read), m_via6522.target()), write8sm_delegate(FUNC(via6522_device::write), m_via6522.target())); - space.install_readwrite_handler(0x0c20, 0x0c21, 0, 0x1e, 0, read8sm_delegate(FUNC(acia6850_device::read), m_acia.target()), write8sm_delegate(FUNC(acia6850_device::write), m_acia.target())); + space.install_readwrite_handler(0x0c20, 0x0c21, 0, 0x1e, 0, read8_delegate(FUNC(acia6850_device::read), m_acia.target()), write8_delegate(FUNC(acia6850_device::write), m_acia.target())); space.install_readwrite_handler(0x0c40, 0x0c43, 0, 0x1c, 0, read8sm_delegate(FUNC(i8255_device::read), m_ppi8255.target()), write8sm_delegate(FUNC(i8255_device::write), m_ppi8255.target())); } |