diff options
Diffstat (limited to 'src/devices/bus/isa/gus.cpp')
-rw-r--r-- | src/devices/bus/isa/gus.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp index 99404470140..423c1e3629f 100644 --- a/src/devices/bus/isa/gus.cpp +++ b/src/devices/bus/isa/gus.cpp @@ -1250,7 +1250,8 @@ INPUT_PORTS_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(isa16_gus_device::device_add_mconfig) +void isa16_gus_device::device_add_mconfig(machine_config &config) +{ SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); GGF1(config, m_gf1, GF1_CLOCK); @@ -1270,14 +1271,13 @@ MACHINE_CONFIG_START(isa16_gus_device::device_add_mconfig) m_gf1->drq2_handler().set(FUNC(isa16_gus_device::drq2_w)); m_gf1->nmi_handler().set(FUNC(isa16_gus_device::nmi_w)); - MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin") - MCFG_MIDI_RX_HANDLER(WRITELINE("gf1", acia6850_device, write_rxd)) + MIDI_PORT(config, "mdin", midiin_slot, "midiin").rxd_handler().set(m_gf1, FUNC(acia6850_device::write_rxd)); - MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout") + MIDI_PORT(config, "mdout", midiout_slot, "midiout"); - MCFG_DEVICE_ADD("acia_clock", CLOCK, 31250*16) - MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, isa16_gus_device, write_acia_clock)) -MACHINE_CONFIG_END + clock_device &acia_clock(CLOCK(config, "acia_clock", 31250*16)); + acia_clock.signal_handler().set(FUNC(isa16_gus_device::write_acia_clock)); +} ioport_constructor isa16_gus_device::device_input_ports() const { @@ -1384,9 +1384,9 @@ READ8_MEMBER(isa16_gus_device::synth_r) switch(offset) { case 0x00: - return m_gf1->status_r(space,0); + return m_gf1->status_r(); case 0x01: - return m_gf1->data_r(space,0); + return m_gf1->data_r(); case 0x02: case 0x03: return m_gf1->global_reg_select_r(space,offset-2); @@ -1407,10 +1407,10 @@ WRITE8_MEMBER(isa16_gus_device::synth_w) switch(offset) { case 0x00: - m_gf1->control_w(space,0,data); + m_gf1->control_w(data); break; case 0x01: - m_gf1->data_w(space,0,data); + m_gf1->data_w(data); break; case 0x02: case 0x03: |