Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 09:00:04 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

move devcb resolution to device_resolve_objects for RS232 and Sun keyboard ports (nw)

Browse Source
This commit is contained in:
Vas Crabb 2018-03-04 00:53:49 +11:00
parent b40f058c90
commit 8bb25d0245
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/devices/bus/rs232/rs232.cpp
View File

@ -47,8 +47,8 @@ rs232_port_device::rs232_port_device(const machine_config &mconfig, const char *
{ {
} }
rs232_port_device::rs232_port_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) rs232_port_device::rs232_port_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
: device_t(mconfig, type, tag, owner, clock), device_t(mconfig, type, tag, owner, clock),
device_slot_interface(mconfig, *this), device_slot_interface(mconfig, *this),
m_rxd(0), m_rxd(0),
m_dcd(0), m_dcd(0),
@ -77,7 +77,7 @@ void rs232_port_device::device_config_complete()
m_dev = dynamic_cast<device_rs232_port_interface *>(get_card_device()); m_dev = dynamic_cast<device_rs232_port_interface *>(get_card_device());
} }
void rs232_port_device::device_start() void rs232_port_device::device_resolve_objects()
{ {
m_rxd_handler.resolve_safe(); m_rxd_handler.resolve_safe();
m_dcd_handler.resolve_safe(); m_dcd_handler.resolve_safe();
@ -86,7 +86,10 @@ void rs232_port_device::device_start()
m_cts_handler.resolve_safe(); m_cts_handler.resolve_safe();
m_rxc_handler.resolve_safe(); m_rxc_handler.resolve_safe();
m_txc_handler.resolve_safe(); m_txc_handler.resolve_safe();
}
void rs232_port_device::device_start()
{
save_item(NAME(m_rxd)); save_item(NAME(m_rxd));
save_item(NAME(m_dcd)); save_item(NAME(m_dcd));
save_item(NAME(m_dsr)); save_item(NAME(m_dsr));
@ -110,30 +113,30 @@ void rs232_port_device::device_start()
WRITE_LINE_MEMBER( rs232_port_device::write_txd ) WRITE_LINE_MEMBER( rs232_port_device::write_txd )
{ {
if(m_dev) if (m_dev)
m_dev->input_txd(state); m_dev->input_txd(state);
} }
WRITE_LINE_MEMBER( rs232_port_device::write_dtr ) WRITE_LINE_MEMBER( rs232_port_device::write_dtr )
{ {
if(m_dev) if (m_dev)
m_dev->input_dtr(state); m_dev->input_dtr(state);
} }
WRITE_LINE_MEMBER( rs232_port_device::write_rts ) WRITE_LINE_MEMBER( rs232_port_device::write_rts )
{ {
if(m_dev) if (m_dev)
m_dev->input_rts(state); m_dev->input_rts(state);
} }
WRITE_LINE_MEMBER( rs232_port_device::write_etc ) WRITE_LINE_MEMBER( rs232_port_device::write_etc )
{ {
if(m_dev) if (m_dev)
m_dev->input_etc(state); m_dev->input_etc(state);
} }
device_rs232_port_interface::device_rs232_port_interface(const machine_config &mconfig, device_t &device) device_rs232_port_interface::device_rs232_port_interface(const machine_config &mconfig, device_t &device) :
: device_slot_card_interface(mconfig, device) device_slot_card_interface(mconfig, device)
{ {
m_port = dynamic_cast<rs232_port_device *>(device.owner()); m_port = dynamic_cast<rs232_port_device *>(device.owner());
} }

1
src/devices/bus/rs232/rs232.h
View File

@ -150,6 +150,7 @@ public:
protected: protected:
rs232_port_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); rs232_port_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
virtual void device_resolve_objects() override;
virtual void device_start() override; virtual void device_start() override;
virtual void device_config_complete() override; virtual void device_config_complete() override;

6
src/devices/bus/sunkbd/sunkbd.cpp
View File

@ -52,10 +52,14 @@ void sun_keyboard_port_device::device_config_complete()
} }
void sun_keyboard_port_device::device_start() void sun_keyboard_port_device::device_resolve_objects()
{ {
m_rxd_handler.resolve_safe(); m_rxd_handler.resolve_safe();
}
void sun_keyboard_port_device::device_start()
{
save_item(NAME(m_rxd)); save_item(NAME(m_rxd));
m_rxd = 1; m_rxd = 1;

1
src/devices/bus/sunkbd/sunkbd.h
View File

@ -36,6 +36,7 @@ public:
protected: protected:
sun_keyboard_port_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, uint32_t clock); sun_keyboard_port_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, uint32_t clock);
virtual void device_resolve_objects() override;
virtual void device_start() override; virtual void device_start() override;
virtual void device_config_complete() override; virtual void device_config_complete() override;