Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-02 08:39:21 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "Fix callbacks resolve (nw)"

Browse Source 
This reverts commit a0ca8148eb.
This commit is contained in:
Miodrag Milanovic 2016-01-20 21:33:19 +01:00
parent 4a57509caf
commit a62e7d8565
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emu/devcb.cpp
View File

@ -56,7 +56,7 @@ void devcb_base::reset(callback_type type)
void devcb_base::resolve_ioport() void devcb_base::resolve_ioport()
{ {
// attempt to resolve, fatal error if fail // attempt to resolve, fatal error if fail
m_target.ioport = m_device.owner()->ioport(m_target_tag); m_target.ioport = (!m_target_tag.empty()) ? m_device.owner()->ioport(m_target_tag) : nullptr;
if (m_target.ioport == nullptr) if (m_target.ioport == nullptr)
throw emu_fatalerror("Unable to resolve I/O port callback reference to '%s' in device '%s'\n", m_target_tag.c_str(), m_device.tag().c_str()); throw emu_fatalerror("Unable to resolve I/O port callback reference to '%s' in device '%s'\n", m_target_tag.c_str(), m_device.tag().c_str());
} }
@ -70,7 +70,7 @@ void devcb_base::resolve_ioport()
void devcb_base::resolve_inputline() void devcb_base::resolve_inputline()
{ {
// attempt to resolve, fatal error if fail // attempt to resolve, fatal error if fail
m_target.device = m_device.owner()->subdevice(m_target_tag); m_target.device = (!m_target_tag.empty()) ? m_device.owner()->subdevice(m_target_tag) : nullptr;
if (m_target.device == nullptr) if (m_target.device == nullptr)
throw emu_fatalerror("Unable to resolve device reference to '%s' in device '%s'\n", m_target_tag.c_str(), m_device.tag().c_str()); throw emu_fatalerror("Unable to resolve device reference to '%s' in device '%s'\n", m_target_tag.c_str(), m_device.tag().c_str());
@ -89,7 +89,7 @@ void devcb_base::resolve_inputline()
void devcb_base::resolve_space() void devcb_base::resolve_space()
{ {
// attempt to resolve, fatal error if fail // attempt to resolve, fatal error if fail
device_t *spacedev = m_device.owner()->subdevice(m_space_tag); device_t *spacedev = (!m_space_tag.empty()) ? m_device.owner()->subdevice(m_space_tag) : nullptr;
if (spacedev == nullptr) if (spacedev == nullptr)
throw emu_fatalerror("Unable to resolve device reference to '%s' in device '%s'\n", m_space_tag.c_str(), m_device.tag().c_str()); throw emu_fatalerror("Unable to resolve device reference to '%s' in device '%s'\n", m_space_tag.c_str(), m_device.tag().c_str());
if (!spacedev->memory().has_space(m_space_num)) if (!spacedev->memory().has_space(m_space_num))