diff options
Diffstat (limited to 'src/emu/bus')
-rw-r--r-- | src/emu/bus/ieee488/softbox.c | 34 | ||||
-rw-r--r-- | src/emu/bus/rs232/rs232.h | 4 |
2 files changed, 13 insertions, 25 deletions
diff --git a/src/emu/bus/ieee488/softbox.c b/src/emu/bus/ieee488/softbox.c index 21de6666d6d..e71b3cd16fa 100644 --- a/src/emu/bus/ieee488/softbox.c +++ b/src/emu/bus/ieee488/softbox.c @@ -99,22 +99,6 @@ ADDRESS_MAP_END //------------------------------------------------- -// i8251_interface usart_intf -//------------------------------------------------- - -static const i8251_interface usart_intf = -{ - DEVCB_DEVICE_LINE_MEMBER(RS232_TAG, rs232_port_device, write_txd), - DEVCB_DEVICE_LINE_MEMBER(RS232_TAG, rs232_port_device, write_dtr), - DEVCB_DEVICE_LINE_MEMBER(RS232_TAG, rs232_port_device, write_rts), - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL -}; - - -//------------------------------------------------- // I8255A_INTERFACE( ppi0_intf ) //------------------------------------------------- @@ -281,20 +265,24 @@ static MACHINE_CONFIG_FRAGMENT( softbox ) MCFG_CPU_IO_MAP(softbox_io) // devices - MCFG_I8251_ADD(I8251_TAG, usart_intf) + MCFG_DEVICE_ADD(I8251_TAG, I8251, 0) + MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) + MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr)) + MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts)) + + MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd)) + MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr)) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_I8255A_ADD(I8255_0_TAG, ppi0_intf) MCFG_I8255A_ADD(I8255_1_TAG, ppi1_intf) - MCFG_COM8116_ADD(COM8116_TAG, XTAL_5_0688MHz, NULL, DEVWRITELINE(I8251_TAG, i8251_device, rxc_w), DEVWRITELINE(I8251_TAG, i8251_device, txc_w)) + MCFG_COM8116_ADD(COM8116_TAG, XTAL_5_0688MHz, NULL, DEVWRITELINE(I8251_TAG, i8251_device, write_rxc), DEVWRITELINE(I8251_TAG, i8251_device, write_txc)) MCFG_HARDDISK_ADD("harddisk1") MCFG_HARDDISK_ADD("harddisk2") MCFG_HARDDISK_ADD("harddisk3") MCFG_HARDDISK_ADD("harddisk4") - MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rx)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) - //MCFG_IMI7000_BUS_ADD("imi5000h", NULL, NULL, NULL) MACHINE_CONFIG_END diff --git a/src/emu/bus/rs232/rs232.h b/src/emu/bus/rs232/rs232.h index e4b7ed3ac0b..b9223651ff5 100644 --- a/src/emu/bus/rs232/rs232.h +++ b/src/emu/bus/rs232/rs232.h @@ -8,7 +8,7 @@ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_RS232_RXD_HANDLER(_devcb) \ - devcb = &rs232_port_device::set_rx_handler(*device, DEVCB2_##_devcb); + devcb = &rs232_port_device::set_rxd_handler(*device, DEVCB2_##_devcb); #define MCFG_RS232_DCD_HANDLER(_devcb) \ devcb = &rs232_port_device::set_dcd_handler(*device, DEVCB2_##_devcb); @@ -35,7 +35,7 @@ public: virtual ~rs232_port_device(); // static configuration helpers - template<class _Object> static devcb2_base &set_rx_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_rxd_handler.set_callback(object); } + template<class _Object> static devcb2_base &set_rxd_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_rxd_handler.set_callback(object); } template<class _Object> static devcb2_base &set_dcd_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_dcd_handler.set_callback(object); } template<class _Object> static devcb2_base &set_dsr_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_dsr_handler.set_callback(object); } template<class _Object> static devcb2_base &set_ri_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_ri_handler.set_callback(object); } |