diff options
Diffstat (limited to 'src/mame/drivers/aussiebyte.cpp')
-rw-r--r-- | src/mame/drivers/aussiebyte.cpp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp index 82932a19a88..4ac252dac0f 100644 --- a/src/mame/drivers/aussiebyte.cpp +++ b/src/mame/drivers/aussiebyte.cpp @@ -513,17 +513,16 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MCFG_DEVICE_ADD("votrax", VOTRAX_SC01, 720000) /* 720kHz? needs verify */ - MCFG_VOTRAX_SC01_REQUEST_CB(WRITELINE(*this, aussiebyte_state, votrax_w)) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) + SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50); + VOTRAX_SC01(config, m_votrax, 720000); // 720kHz? needs verify + m_votrax->ar_callback().set(FUNC(aussiebyte_state::votrax_w)); + m_votrax->add_route(ALL_OUTPUTS, "mono", 1.00); /* devices */ - MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") - MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") - MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, aussiebyte_state, write_centronics_busy)) - MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0) + CENTRONICS(config, m_centronics, centronics_devices, "printer"); + m_centronics->set_data_input_buffer("cent_data_in"); + m_centronics->busy_handler().set(FUNC(aussiebyte_state::write_centronics_busy)); + INPUT_BUFFER(config, "cent_data_in"); MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") clock_device &ctc_clock(CLOCK(config, "ctc_clock", 4.9152_MHz_XTAL / 4)); @@ -541,14 +540,14 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) m_ctc->zc_callback<2>().set(FUNC(aussiebyte_state::ctc_z2_w)); // SIO2 Ch B, CTC Ch 3 m_ctc->zc_callback<2>().append("sio2", FUNC(z80sio_device::rxtxcb_w)); - MCFG_DEVICE_ADD("dma", Z80DMA, 16_MHz_XTAL / 4) - MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, aussiebyte_state, busreq_w)) + Z80DMA(config, m_dma, 16_MHz_XTAL / 4); + m_dma->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); + m_dma->out_busreq_callback().set(FUNC(aussiebyte_state::busreq_w)); // BAO, not used - MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, aussiebyte_state, memory_read_byte)) - MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, aussiebyte_state, memory_write_byte)) - MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, aussiebyte_state, io_read_byte)) - MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, aussiebyte_state, io_write_byte)) + m_dma->in_mreq_callback().set(FUNC(aussiebyte_state::memory_read_byte)); + m_dma->out_mreq_callback().set(FUNC(aussiebyte_state::memory_write_byte)); + m_dma->in_iorq_callback().set(FUNC(aussiebyte_state::io_read_byte)); + m_dma->out_iorq_callback().set(FUNC(aussiebyte_state::io_write_byte)); Z80PIO(config, m_pio1, 16_MHz_XTAL / 4); m_pio1->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); @@ -556,9 +555,9 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) m_pio1->in_pb_callback().set("cent_data_in", FUNC(input_buffer_device::bus_r)); m_pio1->out_ardy_callback().set(m_centronics, FUNC(centronics_device::write_strobe)).invert(); - MCFG_DEVICE_ADD("pio2", Z80PIO, 16_MHz_XTAL / 4) - MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, aussiebyte_state, port20_w)) + Z80PIO(config, m_pio2, 16_MHz_XTAL / 4); + m_pio2->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); + m_pio2->out_pa_callback().set(FUNC(aussiebyte_state::port20_w)); MCFG_DEVICE_ADD("sio1", Z80SIO, 16_MHz_XTAL / 4) MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) |