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/c64/midi_namesoft.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/c64/midi_namesoft.cpp')
-rw-r--r-- | src/devices/bus/c64/midi_namesoft.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/devices/bus/c64/midi_namesoft.cpp b/src/devices/bus/c64/midi_namesoft.cpp index d4e7c8b59ac..c572cf4ea55 100644 --- a/src/devices/bus/c64/midi_namesoft.cpp +++ b/src/devices/bus/c64/midi_namesoft.cpp @@ -44,19 +44,19 @@ WRITE_LINE_MEMBER( c64_namesoft_midi_cartridge_device::write_acia_clock ) // device_add_mconfig - add device configuration //------------------------------------------------- -void c64_namesoft_midi_cartridge_device::device_add_mconfig(machine_config &config) -{ +MACHINE_CONFIG_START(c64_namesoft_midi_cartridge_device::device_add_mconfig) ACIA6850(config, m_acia, 0); m_acia->txd_handler().set("mdout", FUNC(midi_port_device::write_txd)); m_acia->irq_handler().set(FUNC(c64_namesoft_midi_cartridge_device::acia_irq_w)); - MIDI_PORT(config, "mdin", midiin_slot, "midiin").rxd_handler().set(m_acia, FUNC(acia6850_device::write_rxd)); + MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin") + MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_TAG, acia6850_device, write_rxd)) - MIDI_PORT(config, "mdout", midiout_slot, "midiout"); + MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout") - clock_device &acia_clock(CLOCK(config, "acia_clock", 31250*16)); - acia_clock.signal_handler().set(FUNC(c64_namesoft_midi_cartridge_device::write_acia_clock)); -} + MCFG_DEVICE_ADD("acia_clock", CLOCK, 31250*16) + MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, c64_namesoft_midi_cartridge_device, write_acia_clock)) +MACHINE_CONFIG_END @@ -98,7 +98,7 @@ void c64_namesoft_midi_cartridge_device::device_reset() // c64_cd_r - cartridge data read //------------------------------------------------- -uint8_t c64_namesoft_midi_cartridge_device::c64_cd_r(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) +uint8_t c64_namesoft_midi_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { if (!io1) { @@ -106,7 +106,7 @@ uint8_t c64_namesoft_midi_cartridge_device::c64_cd_r(offs_t offset, uint8_t data { case 2: case 3: - data = m_acia->read(offset & 1); + data = m_acia->read(space, offset & 1); break; } } @@ -119,7 +119,7 @@ uint8_t c64_namesoft_midi_cartridge_device::c64_cd_r(offs_t offset, uint8_t data // c64_cd_w - cartridge data write //------------------------------------------------- -void c64_namesoft_midi_cartridge_device::c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) +void c64_namesoft_midi_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { if (!io1) { @@ -127,7 +127,7 @@ void c64_namesoft_midi_cartridge_device::c64_cd_w(offs_t offset, uint8_t data, i { case 0: case 1: - m_acia->write(offset & 1, data); + m_acia->write(space, offset & 1, data); break; } } |