summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/bus/c64
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/bus/c64')
-rw-r--r--src/emu/bus/c64/midi_maplin.c11
-rw-r--r--src/emu/bus/c64/midi_maplin.h4
-rw-r--r--src/emu/bus/c64/midi_namesoft.c11
-rw-r--r--src/emu/bus/c64/midi_namesoft.h4
-rw-r--r--src/emu/bus/c64/midi_passport.c11
-rw-r--r--src/emu/bus/c64/midi_passport.h4
-rw-r--r--src/emu/bus/c64/midi_sci.c11
-rw-r--r--src/emu/bus/c64/midi_sci.h4
-rw-r--r--src/emu/bus/c64/midi_siel.c11
-rw-r--r--src/emu/bus/c64/midi_siel.h4
-rw-r--r--src/emu/bus/c64/swiftlink.c11
-rw-r--r--src/emu/bus/c64/swiftlink.h2
-rw-r--r--src/emu/bus/c64/turbo232.c10
-rw-r--r--src/emu/bus/c64/turbo232.h5
14 files changed, 47 insertions, 56 deletions
diff --git a/src/emu/bus/c64/midi_maplin.c b/src/emu/bus/c64/midi_maplin.c
index 4300d2b95e2..df6830064c2 100644
--- a/src/emu/bus/c64/midi_maplin.c
+++ b/src/emu/bus/c64/midi_maplin.c
@@ -10,6 +10,9 @@
**********************************************************************/
#include "midi_maplin.h"
+#include "bus/midi/midi.h"
+#include "bus/midi/midiinport.h"
+#include "bus/midi/midioutport.h"
@@ -41,7 +44,7 @@ static ACIA6850_INTERFACE( acia_intf )
{
500000,
0, // rx clock (we manually clock rx)
- DEVCB_DEVICE_LINE_MEMBER("mdout", serial_port_device, tx),
+ DEVCB_DEVICE_LINE_MEMBER("mdout", midi_port_device, write_txd),
DEVCB_NULL,
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_maplin_midi_cartridge_device, acia_irq_w)
};
@@ -82,10 +85,10 @@ SLOT_INTERFACE_END
static MACHINE_CONFIG_FRAGMENT( c64_maplin_midi )
MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf)
- MCFG_SERIAL_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_SERIAL_OUT_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_maplin_midi_cartridge_device, midi_rx_w))
+ MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
+ MCFG_MIDI_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_maplin_midi_cartridge_device, midi_rx_w))
- MCFG_SERIAL_PORT_ADD("mdout", midiout_slot, "midiout")
+ MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/midi_maplin.h b/src/emu/bus/c64/midi_maplin.h
index 94faa9a5c20..c9ddf94dbe4 100644
--- a/src/emu/bus/c64/midi_maplin.h
+++ b/src/emu/bus/c64/midi_maplin.h
@@ -14,12 +14,8 @@
#ifndef __C64_MIDI_MAPLIN__
#define __C64_MIDI_MAPLIN__
-#include "emu.h"
#include "exp.h"
#include "machine/6850acia.h"
-#include "machine/serial.h"
-#include "machine/midiinport.h"
-#include "machine/midioutport.h"
diff --git a/src/emu/bus/c64/midi_namesoft.c b/src/emu/bus/c64/midi_namesoft.c
index dcee8205f1c..aea458cbd5a 100644
--- a/src/emu/bus/c64/midi_namesoft.c
+++ b/src/emu/bus/c64/midi_namesoft.c
@@ -10,6 +10,9 @@
**********************************************************************/
#include "midi_namesoft.h"
+#include "bus/midi/midi.h"
+#include "bus/midi/midiinport.h"
+#include "bus/midi/midioutport.h"
@@ -41,7 +44,7 @@ static ACIA6850_INTERFACE( acia_intf )
{
500000,
0, // rx clock (we manually clock rx)
- DEVCB_DEVICE_LINE_MEMBER("mdout", serial_port_device, tx),
+ DEVCB_DEVICE_LINE_MEMBER("mdout", midi_port_device, write_txd),
DEVCB_NULL,
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_namesoft_midi_cartridge_device, acia_irq_w)
};
@@ -82,10 +85,10 @@ SLOT_INTERFACE_END
static MACHINE_CONFIG_FRAGMENT( c64_passport_midi )
MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf)
- MCFG_SERIAL_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_SERIAL_OUT_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_namesoft_midi_cartridge_device, midi_rx_w))
+ MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
+ MCFG_MIDI_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_namesoft_midi_cartridge_device, midi_rx_w))
- MCFG_SERIAL_PORT_ADD("mdout", midiout_slot, "midiout")
+ MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/midi_namesoft.h b/src/emu/bus/c64/midi_namesoft.h
index f5d54f6337f..547fee0140a 100644
--- a/src/emu/bus/c64/midi_namesoft.h
+++ b/src/emu/bus/c64/midi_namesoft.h
@@ -14,12 +14,8 @@
#ifndef __C64_MIDI_NAMESOFT__
#define __C64_MIDI_NAMESOFT__
-#include "emu.h"
#include "exp.h"
#include "machine/6850acia.h"
-#include "machine/serial.h"
-#include "machine/midiinport.h"
-#include "machine/midioutport.h"
diff --git a/src/emu/bus/c64/midi_passport.c b/src/emu/bus/c64/midi_passport.c
index 3c4a1d092b0..e28b0182553 100644
--- a/src/emu/bus/c64/midi_passport.c
+++ b/src/emu/bus/c64/midi_passport.c
@@ -10,6 +10,9 @@
**********************************************************************/
#include "midi_passport.h"
+#include "bus/midi/midi.h"
+#include "bus/midi/midiinport.h"
+#include "bus/midi/midioutport.h"
@@ -64,7 +67,7 @@ static ACIA6850_INTERFACE( acia_intf )
{
500000,
0, // rx clock (we manually clock rx)
- DEVCB_DEVICE_LINE_MEMBER("mdout", serial_port_device, tx),
+ DEVCB_DEVICE_LINE_MEMBER("mdout", midi_port_device, write_txd),
DEVCB_NULL,
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_passport_midi_cartridge_device, acia_irq_w)
};
@@ -106,10 +109,10 @@ static MACHINE_CONFIG_FRAGMENT( c64_passport_midi )
MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf)
MCFG_PTM6840_ADD(MC6840_TAG, ptm_intf)
- MCFG_SERIAL_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_SERIAL_OUT_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_passport_midi_cartridge_device, midi_rx_w))
+ MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
+ MCFG_MIDI_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_passport_midi_cartridge_device, midi_rx_w))
- MCFG_SERIAL_PORT_ADD("mdout", midiout_slot, "midiout")
+ MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/midi_passport.h b/src/emu/bus/c64/midi_passport.h
index fe02d5fef52..a126e97d56d 100644
--- a/src/emu/bus/c64/midi_passport.h
+++ b/src/emu/bus/c64/midi_passport.h
@@ -14,13 +14,9 @@
#ifndef __C64_MIDI_PASSPORT__
#define __C64_MIDI_PASSPORT__
-#include "emu.h"
#include "exp.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
-#include "machine/serial.h"
-#include "machine/midiinport.h"
-#include "machine/midioutport.h"
diff --git a/src/emu/bus/c64/midi_sci.c b/src/emu/bus/c64/midi_sci.c
index 144e1510299..ef39829bfb7 100644
--- a/src/emu/bus/c64/midi_sci.c
+++ b/src/emu/bus/c64/midi_sci.c
@@ -10,6 +10,9 @@
**********************************************************************/
#include "midi_sci.h"
+#include "bus/midi/midi.h"
+#include "bus/midi/midiinport.h"
+#include "bus/midi/midioutport.h"
@@ -41,7 +44,7 @@ static ACIA6850_INTERFACE( acia_intf )
{
500000,
0, // rx clock (we manually clock rx)
- DEVCB_DEVICE_LINE_MEMBER("mdout", serial_port_device, tx),
+ DEVCB_DEVICE_LINE_MEMBER("mdout", midi_port_device, write_txd),
DEVCB_NULL,
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_sequential_midi_cartridge_device, acia_irq_w)
};
@@ -82,10 +85,10 @@ SLOT_INTERFACE_END
static MACHINE_CONFIG_FRAGMENT( c64_sequential_midi )
MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf)
- MCFG_SERIAL_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_SERIAL_OUT_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_sequential_midi_cartridge_device, midi_rx_w))
+ MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
+ MCFG_MIDI_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_sequential_midi_cartridge_device, midi_rx_w))
- MCFG_SERIAL_PORT_ADD("mdout", midiout_slot, "midiout")
+ MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/midi_sci.h b/src/emu/bus/c64/midi_sci.h
index c1ff88cdcb8..1f5010ff3c6 100644
--- a/src/emu/bus/c64/midi_sci.h
+++ b/src/emu/bus/c64/midi_sci.h
@@ -14,12 +14,8 @@
#ifndef __C64_MIDI_SCI__
#define __C64_MIDI_SCI__
-#include "emu.h"
#include "exp.h"
#include "machine/6850acia.h"
-#include "machine/serial.h"
-#include "machine/midiinport.h"
-#include "machine/midioutport.h"
diff --git a/src/emu/bus/c64/midi_siel.c b/src/emu/bus/c64/midi_siel.c
index 8f2e4160365..7acda555651 100644
--- a/src/emu/bus/c64/midi_siel.c
+++ b/src/emu/bus/c64/midi_siel.c
@@ -10,6 +10,9 @@
**********************************************************************/
#include "midi_siel.h"
+#include "bus/midi/midi.h"
+#include "bus/midi/midiinport.h"
+#include "bus/midi/midioutport.h"
@@ -41,7 +44,7 @@ static ACIA6850_INTERFACE( acia_intf )
{
XTAL_2MHz,
0, // rx clock (we manually clock rx)
- DEVCB_DEVICE_LINE_MEMBER("mdout", serial_port_device, tx),
+ DEVCB_DEVICE_LINE_MEMBER("mdout", midi_port_device, write_txd),
DEVCB_NULL,
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_siel_midi_cartridge_device, acia_irq_w)
};
@@ -82,10 +85,10 @@ SLOT_INTERFACE_END
static MACHINE_CONFIG_FRAGMENT( c64_siel_midi )
MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf)
- MCFG_SERIAL_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_SERIAL_OUT_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_siel_midi_cartridge_device, midi_rx_w))
+ MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
+ MCFG_MIDI_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_siel_midi_cartridge_device, midi_rx_w))
- MCFG_SERIAL_PORT_ADD("mdout", midiout_slot, "midiout")
+ MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/midi_siel.h b/src/emu/bus/c64/midi_siel.h
index 80a94d25f7a..a4682c488b9 100644
--- a/src/emu/bus/c64/midi_siel.h
+++ b/src/emu/bus/c64/midi_siel.h
@@ -14,12 +14,8 @@
#ifndef __C64_MIDI_SIEL__
#define __C64_MIDI_SIEL__
-#include "emu.h"
#include "exp.h"
#include "machine/6850acia.h"
-#include "machine/serial.h"
-#include "machine/midiinport.h"
-#include "machine/midioutport.h"
diff --git a/src/emu/bus/c64/swiftlink.c b/src/emu/bus/c64/swiftlink.c
index 2552239b2a2..0f7604860ec 100644
--- a/src/emu/bus/c64/swiftlink.c
+++ b/src/emu/bus/c64/swiftlink.c
@@ -16,6 +16,7 @@
*/
#include "swiftlink.h"
+#include "bus/rs232/rs232.h"
@@ -42,13 +43,13 @@ const device_type C64_SWIFTLINK = &device_creator<c64_swiftlink_cartridge_device
static MACHINE_CONFIG_FRAGMENT( c64_swiftlink )
MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, XTAL_3_6864MHz)
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_swiftlink_cartridge_device, acia_irq_w))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, tx))
+ MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL)
- MCFG_SERIAL_OUT_RX_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, rxd_w))
- MCFG_RS232_OUT_DCD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, dcd_w))
- MCFG_RS232_OUT_DSR_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, dsr_w))
- MCFG_RS232_OUT_CTS_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, cts_w))
+ MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, rxd_w))
+ MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, dsr_w))
+ MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, cts_w))
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/swiftlink.h b/src/emu/bus/c64/swiftlink.h
index d4aec28f962..f9b615dd56b 100644
--- a/src/emu/bus/c64/swiftlink.h
+++ b/src/emu/bus/c64/swiftlink.h
@@ -15,10 +15,8 @@
#define __SWIFTLINK__
-#include "emu.h"
#include "exp.h"
#include "machine/mos6551.h"
-#include "machine/serial.h"
diff --git a/src/emu/bus/c64/turbo232.c b/src/emu/bus/c64/turbo232.c
index 8e497cda3d3..73cb133d767 100644
--- a/src/emu/bus/c64/turbo232.c
+++ b/src/emu/bus/c64/turbo232.c
@@ -42,13 +42,13 @@ const device_type C64_TURBO232 = &device_creator<c64_turbo232_cartridge_device>;
static MACHINE_CONFIG_FRAGMENT( c64_turbo232 )
MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, XTAL_3_6864MHz)
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_turbo232_cartridge_device, acia_irq_w))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, tx))
+ MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL)
- MCFG_SERIAL_OUT_RX_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, rxd_w))
- MCFG_RS232_OUT_DCD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, dcd_w))
- MCFG_RS232_OUT_DSR_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, dsr_w))
- MCFG_RS232_OUT_CTS_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, cts_w))
+ MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, rxd_w))
+ MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, dsr_w))
+ MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, cts_w))
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/turbo232.h b/src/emu/bus/c64/turbo232.h
index 4686bfa4626..308c7455b26 100644
--- a/src/emu/bus/c64/turbo232.h
+++ b/src/emu/bus/c64/turbo232.h
@@ -15,12 +15,9 @@
#define __TURBO232__
-#include "emu.h"
#include "exp.h"
#include "machine/mos6551.h"
-#include "machine/null_modem.h"
-#include "machine/serial.h"
-#include "machine/terminal.h"
+#include "bus/rs232/rs232.h"