diff options
Diffstat (limited to 'src/devices/bus/c64/midi_passport.cpp')
-rw-r--r-- | src/devices/bus/c64/midi_passport.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/devices/bus/c64/midi_passport.cpp b/src/devices/bus/c64/midi_passport.cpp index 05a3fbb1a36..bedab8e52c1 100644 --- a/src/devices/bus/c64/midi_passport.cpp +++ b/src/devices/bus/c64/midi_passport.cpp @@ -58,8 +58,7 @@ WRITE_LINE_MEMBER( c64_passport_midi_cartridge_device::write_acia_clock ) // device_add_mconfig - add device configuration //------------------------------------------------- -void c64_passport_midi_cartridge_device::device_add_mconfig(machine_config &config) -{ +MACHINE_CONFIG_START(c64_passport_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_passport_midi_cartridge_device::acia_irq_w)); @@ -68,13 +67,14 @@ void c64_passport_midi_cartridge_device::device_add_mconfig(machine_config &conf m_ptm->set_external_clocks(1021800.0f, 1021800.0f, 1021800.0f); m_ptm->irq_callback().set(FUNC(c64_passport_midi_cartridge_device::ptm_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)); // TODO: work out if the clock should come from the 6840 - acia_clock.signal_handler().set(FUNC(c64_passport_midi_cartridge_device::write_acia_clock)); -} + MCFG_DEVICE_ADD("acia_clock", CLOCK, 31250*16) /// TODO: work out if the clock should come from the 6840 + MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, c64_passport_midi_cartridge_device, write_acia_clock)) +MACHINE_CONFIG_END @@ -124,7 +124,7 @@ void c64_passport_midi_cartridge_device::device_reset() // c64_cd_r - cartridge data read //------------------------------------------------- -uint8_t c64_passport_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_passport_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) { @@ -132,11 +132,11 @@ uint8_t c64_passport_midi_cartridge_device::c64_cd_r(offs_t offset, uint8_t data { case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: - data = m_ptm->read(offset & 0x07); + data = m_ptm->read(space, offset & 0x07); break; case 8: case 9: - data = m_acia->read(offset & 0x01); + data = m_acia->read(space, offset & 0x01); break; } } @@ -149,7 +149,7 @@ uint8_t c64_passport_midi_cartridge_device::c64_cd_r(offs_t offset, uint8_t data // c64_cd_w - cartridge data write //------------------------------------------------- -void c64_passport_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_passport_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) { @@ -157,11 +157,11 @@ void c64_passport_midi_cartridge_device::c64_cd_w(offs_t offset, uint8_t data, i { case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: - m_ptm->write(offset & 0x07, data); + m_ptm->write(space, offset & 0x07, data); break; case 8: case 9: - m_acia->write(offset & 0x01, data); + m_acia->write(space, offset & 0x01, data); break; case 0x30: |