summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/bus/c64
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2013-12-20 00:26:35 +0000
committer smf- <smf-@users.noreply.github.com>2013-12-20 00:26:35 +0000
commit10be53e45e0da6089a413dde34089325a246689d (patch)
tree42a6a4bbb20c1dafca5d62fe7db55795cf28df75 /src/emu/bus/c64
parent297064c46d13cf55e7b38679a54c6d53c44dabdb (diff)
converted serial & rs232 devices to devcb2 [smf]
Diffstat (limited to 'src/emu/bus/c64')
-rw-r--r--src/emu/bus/c64/midi_maplin.c16
-rw-r--r--src/emu/bus/c64/midi_namesoft.c16
-rw-r--r--src/emu/bus/c64/midi_passport.c16
-rw-r--r--src/emu/bus/c64/midi_sci.c16
-rw-r--r--src/emu/bus/c64/midi_siel.c16
-rw-r--r--src/emu/bus/c64/swiftlink.c20
-rw-r--r--src/emu/bus/c64/turbo232.c20
-rw-r--r--src/emu/bus/c64/vic1011.c17
8 files changed, 32 insertions, 105 deletions
diff --git a/src/emu/bus/c64/midi_maplin.c b/src/emu/bus/c64/midi_maplin.c
index a68325e32be..22bf507114d 100644
--- a/src/emu/bus/c64/midi_maplin.c
+++ b/src/emu/bus/c64/midi_maplin.c
@@ -78,11 +78,6 @@ WRITE_LINE_MEMBER( c64_maplin_midi_cartridge_device::midi_rx_w )
}
}
-static const serial_port_interface midiin_intf =
-{
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_maplin_midi_cartridge_device, midi_rx_w)
-};
-
//-------------------------------------------------
// SLOT_INTERFACE( midiout_slot )
@@ -92,11 +87,6 @@ static SLOT_INTERFACE_START( midiout_slot )
SLOT_INTERFACE("midiout", MIDIOUT_PORT)
SLOT_INTERFACE_END
-static const serial_port_interface midiout_intf =
-{
- DEVCB_NULL // midi out ports don't transmit inward
-};
-
//-------------------------------------------------
// MACHINE_CONFIG_FRAGMENT( c64_maplin_midi )
@@ -105,8 +95,10 @@ static const serial_port_interface midiout_intf =
static MACHINE_CONFIG_FRAGMENT( c64_maplin_midi )
MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf)
- MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin")
- MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout")
+ 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_SERIAL_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/midi_namesoft.c b/src/emu/bus/c64/midi_namesoft.c
index c6c67053d12..8e27fd63601 100644
--- a/src/emu/bus/c64/midi_namesoft.c
+++ b/src/emu/bus/c64/midi_namesoft.c
@@ -78,11 +78,6 @@ WRITE_LINE_MEMBER( c64_namesoft_midi_cartridge_device::midi_rx_w )
}
}
-static const serial_port_interface midiin_intf =
-{
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_namesoft_midi_cartridge_device, midi_rx_w)
-};
-
//-------------------------------------------------
// SLOT_INTERFACE( midiout_slot )
@@ -92,11 +87,6 @@ static SLOT_INTERFACE_START( midiout_slot )
SLOT_INTERFACE("midiout", MIDIOUT_PORT)
SLOT_INTERFACE_END
-static const serial_port_interface midiout_intf =
-{
- DEVCB_NULL // midi out ports don't transmit inward
-};
-
//-------------------------------------------------
// MACHINE_CONFIG_FRAGMENT( c64_passport_midi )
@@ -105,8 +95,10 @@ static const serial_port_interface midiout_intf =
static MACHINE_CONFIG_FRAGMENT( c64_passport_midi )
MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf)
- MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin")
- MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout")
+ 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_SERIAL_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/midi_passport.c b/src/emu/bus/c64/midi_passport.c
index d977bfa3aa4..6c25fce3c2a 100644
--- a/src/emu/bus/c64/midi_passport.c
+++ b/src/emu/bus/c64/midi_passport.c
@@ -101,11 +101,6 @@ WRITE_LINE_MEMBER( c64_passport_midi_cartridge_device::midi_rx_w )
}
}
-static const serial_port_interface midiin_intf =
-{
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_passport_midi_cartridge_device, midi_rx_w)
-};
-
//-------------------------------------------------
// SLOT_INTERFACE( midiout_slot )
@@ -115,11 +110,6 @@ static SLOT_INTERFACE_START( midiout_slot )
SLOT_INTERFACE("midiout", MIDIOUT_PORT)
SLOT_INTERFACE_END
-static const serial_port_interface midiout_intf =
-{
- DEVCB_NULL // midi out ports don't transmit inward
-};
-
//-------------------------------------------------
// MACHINE_CONFIG_FRAGMENT( c64_passport_midi )
@@ -129,8 +119,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_intf, midiin_slot, "midiin")
- MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout")
+ 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_SERIAL_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/midi_sci.c b/src/emu/bus/c64/midi_sci.c
index aeb912a4879..c62815ceaef 100644
--- a/src/emu/bus/c64/midi_sci.c
+++ b/src/emu/bus/c64/midi_sci.c
@@ -78,11 +78,6 @@ WRITE_LINE_MEMBER( c64_sequential_midi_cartridge_device::midi_rx_w )
}
}
-static const serial_port_interface midiin_intf =
-{
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_sequential_midi_cartridge_device, midi_rx_w)
-};
-
//-------------------------------------------------
// SLOT_INTERFACE( midiout_slot )
@@ -92,11 +87,6 @@ static SLOT_INTERFACE_START( midiout_slot )
SLOT_INTERFACE("midiout", MIDIOUT_PORT)
SLOT_INTERFACE_END
-static const serial_port_interface midiout_intf =
-{
- DEVCB_NULL // midi out ports don't transmit inward
-};
-
//-------------------------------------------------
// MACHINE_CONFIG_FRAGMENT( c64_sequential_midi )
@@ -105,8 +95,10 @@ static const serial_port_interface midiout_intf =
static MACHINE_CONFIG_FRAGMENT( c64_sequential_midi )
MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf)
- MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin")
- MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout")
+ 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_SERIAL_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/midi_siel.c b/src/emu/bus/c64/midi_siel.c
index 3447b58cab1..825a071d2df 100644
--- a/src/emu/bus/c64/midi_siel.c
+++ b/src/emu/bus/c64/midi_siel.c
@@ -78,11 +78,6 @@ WRITE_LINE_MEMBER( c64_siel_midi_cartridge_device::midi_rx_w )
}
}
-static const serial_port_interface midiin_intf =
-{
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_siel_midi_cartridge_device, midi_rx_w)
-};
-
//-------------------------------------------------
// SLOT_INTERFACE( midiout_slot )
@@ -92,11 +87,6 @@ static SLOT_INTERFACE_START( midiout_slot )
SLOT_INTERFACE("midiout", MIDIOUT_PORT)
SLOT_INTERFACE_END
-static const serial_port_interface midiout_intf =
-{
- DEVCB_NULL // midi out ports don't transmit inward
-};
-
//-------------------------------------------------
// MACHINE_CONFIG_FRAGMENT( c64_siel_midi )
@@ -105,8 +95,10 @@ static const serial_port_interface midiout_intf =
static MACHINE_CONFIG_FRAGMENT( c64_siel_midi )
MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf)
- MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin")
- MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout")
+ 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_SERIAL_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/swiftlink.c b/src/emu/bus/c64/swiftlink.c
index d4522da0845..00ab5170585 100644
--- a/src/emu/bus/c64/swiftlink.c
+++ b/src/emu/bus/c64/swiftlink.c
@@ -36,20 +36,6 @@ const device_type C64_SWIFTLINK = &device_creator<c64_swiftlink_cartridge_device
//-------------------------------------------------
-// rs232_port_interface rs232_intf
-//-------------------------------------------------
-
-static const rs232_port_interface rs232_intf =
-{
- DEVCB_DEVICE_LINE_MEMBER(MOS6551_TAG, mos6551_device, rxd_w),
- DEVCB_DEVICE_LINE_MEMBER(MOS6551_TAG, mos6551_device, dcd_w),
- DEVCB_DEVICE_LINE_MEMBER(MOS6551_TAG, mos6551_device, dsr_w),
- DEVCB_NULL,
- DEVCB_DEVICE_LINE_MEMBER(MOS6551_TAG, mos6551_device, cts_w)
-};
-
-
-//-------------------------------------------------
// MACHINE_CONFIG_FRAGMENT( c64_swiftlink )
//-------------------------------------------------
@@ -57,7 +43,11 @@ static MACHINE_CONFIG_FRAGMENT( c64_swiftlink )
MCFG_MOS6551_ADD(MOS6551_TAG, XTAL_3_6864MHz, WRITELINE(c64_swiftlink_cartridge_device, acia_irq_w))
MCFG_MOS6551_RXD_TXD_CALLBACKS(NULL, DEVWRITELINE(RS232_TAG, rs232_port_device, tx))
- MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL)
+ 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))
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/turbo232.c b/src/emu/bus/c64/turbo232.c
index 42489fce417..8924baeeb0d 100644
--- a/src/emu/bus/c64/turbo232.c
+++ b/src/emu/bus/c64/turbo232.c
@@ -36,20 +36,6 @@ const device_type C64_TURBO232 = &device_creator<c64_turbo232_cartridge_device>;
//-------------------------------------------------
-// rs232_port_interface rs232_intf
-//-------------------------------------------------
-
-static const rs232_port_interface rs232_intf =
-{
- DEVCB_DEVICE_LINE_MEMBER(MOS6551_TAG, mos6551_device, rxd_w),
- DEVCB_DEVICE_LINE_MEMBER(MOS6551_TAG, mos6551_device, dcd_w),
- DEVCB_DEVICE_LINE_MEMBER(MOS6551_TAG, mos6551_device, dsr_w),
- DEVCB_NULL,
- DEVCB_DEVICE_LINE_MEMBER(MOS6551_TAG, mos6551_device, cts_w)
-};
-
-
-//-------------------------------------------------
// MACHINE_CONFIG_FRAGMENT( c64_turbo232 )
//-------------------------------------------------
@@ -57,7 +43,11 @@ static MACHINE_CONFIG_FRAGMENT( c64_turbo232 )
MCFG_MOS6551_ADD(MOS6551_TAG, XTAL_3_6864MHz, WRITELINE(c64_turbo232_cartridge_device, acia_irq_w))
MCFG_MOS6551_RXD_TXD_CALLBACKS(NULL, DEVWRITELINE(RS232_TAG, rs232_port_device, tx))
- MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL)
+ 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))
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/vic1011.c b/src/emu/bus/c64/vic1011.c
index fc579bf3678..d59a42bd059 100644
--- a/src/emu/bus/c64/vic1011.c
+++ b/src/emu/bus/c64/vic1011.c
@@ -29,25 +29,12 @@ const device_type C64_VIC1011 = &device_creator<c64_vic1011_device>;
//-------------------------------------------------
-// rs232_port_interface rs232_intf
-//-------------------------------------------------
-
-static const rs232_port_interface rs232_intf =
-{
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_vic1011_device, rxd_w),
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL
-};
-
-
-//-------------------------------------------------
// MACHINE_DRIVER( vic1011 )
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( vic1011 )
- MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL)
+ MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL)
+ MCFG_SERIAL_OUT_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_vic1011_device, rxd_w))
MACHINE_CONFIG_END