diff options
Diffstat (limited to 'src/emu/devcb.cpp')
-rw-r--r-- | src/emu/devcb.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/emu/devcb.cpp b/src/emu/devcb.cpp index aa69ce9e7d1..d54c25e530b 100644 --- a/src/emu/devcb.cpp +++ b/src/emu/devcb.cpp @@ -37,12 +37,12 @@ devcb_base::devcb_base(device_t &device, UINT64 defmask) void devcb_base::reset(callback_type type) { m_type = type; - m_target_tag = NULL; + m_target_tag = nullptr; m_target_int = 0; - m_space_tag = NULL; + m_space_tag = nullptr; m_space_num = AS_0; - m_space = NULL; - m_target.ptr = NULL; + m_space = nullptr; + m_target.ptr = nullptr; m_rshift = 0; m_mask = ~U64(0); } @@ -56,8 +56,8 @@ void devcb_base::reset(callback_type type) void devcb_base::resolve_ioport() { // attempt to resolve, fatal error if fail - m_target.ioport = (m_target_tag != NULL) ? m_device.owner()->ioport(m_target_tag) : NULL; - if (m_target.ioport == NULL) + m_target.ioport = (m_target_tag != nullptr) ? m_device.owner()->ioport(m_target_tag) : 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, m_device.tag()); } @@ -70,8 +70,8 @@ void devcb_base::resolve_ioport() void devcb_base::resolve_inputline() { // attempt to resolve, fatal error if fail - m_target.device = (m_target_tag != NULL) ? m_device.owner()->subdevice(m_target_tag) : NULL; - if (m_target.device == NULL) + m_target.device = (m_target_tag != nullptr) ? m_device.owner()->subdevice(m_target_tag) : nullptr; + if (m_target.device == nullptr) throw emu_fatalerror("Unable to resolve device reference to '%s' in device '%s'\n", m_target_tag, m_device.tag()); // make sure we have an execute interface @@ -89,8 +89,8 @@ void devcb_base::resolve_inputline() void devcb_base::resolve_space() { // attempt to resolve, fatal error if fail - device_t *spacedev = (m_space_tag != NULL) ? m_device.owner()->subdevice(m_space_tag) : NULL; - if (spacedev == NULL) + device_t *spacedev = (m_space_tag != nullptr) ? m_device.owner()->subdevice(m_space_tag) : nullptr; + if (spacedev == nullptr) throw emu_fatalerror("Unable to resolve device reference to '%s' in device '%s'\n", m_space_tag, m_device.tag()); if (!spacedev->memory().has_space(m_space_num)) throw emu_fatalerror("Unable to resolve device address space %d on '%s' in device '%s'\n", m_space_num, m_space_tag, m_device.tag()); @@ -108,8 +108,8 @@ void devcb_base::resolve_space() //------------------------------------------------- devcb_read_base::devcb_read_base(device_t &device, UINT64 defmask) - : devcb_base(device, defmask), - m_adapter(NULL) + : devcb_base(device, defmask), + m_adapter(nullptr) { } @@ -141,7 +141,7 @@ void devcb_read_base::reset(callback_type type) void devcb_read_base::resolve() { // first resolve any address spaces - if (m_space_tag != NULL) + if (m_space_tag != nullptr) resolve_space(); else m_space = &downcast<driver_device &>(m_device.machine().root_device()).generic_space(); @@ -193,7 +193,7 @@ void devcb_read_base::resolve() case CALLBACK_IOPORT: resolve_ioport(); m_target_int = 0; - m_adapter = (m_target.ioport == NULL) ? &devcb_read_base::read_constant_adapter : &devcb_read_base::read_ioport_adapter; + m_adapter = (m_target.ioport == nullptr) ? &devcb_read_base::read_constant_adapter : &devcb_read_base::read_ioport_adapter; break; case CALLBACK_LOG: @@ -336,8 +336,8 @@ UINT64 devcb_read_base::read_constant_adapter(address_space &space, offs_t offse //------------------------------------------------- devcb_write_base::devcb_write_base(device_t &device, UINT64 defmask) - : devcb_base(device, defmask), - m_adapter(NULL) + : devcb_base(device, defmask), + m_adapter(nullptr) { } @@ -369,7 +369,7 @@ void devcb_write_base::reset(callback_type type) void devcb_write_base::resolve() { // first resolve any address spaces - if (m_space_tag != NULL) + if (m_space_tag != nullptr) resolve_space(); else m_space = &downcast<driver_device &>(m_device.machine().root_device()).generic_space(); @@ -415,7 +415,7 @@ void devcb_write_base::resolve() case CALLBACK_IOPORT: resolve_ioport(); - m_adapter = (m_target.ioport == NULL) ? &devcb_write_base::write_noop_adapter : &devcb_write_base::write_ioport_adapter; + m_adapter = (m_target.ioport == nullptr) ? &devcb_write_base::write_noop_adapter : &devcb_write_base::write_ioport_adapter; break; case CALLBACK_LOG: |