summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine/7200fifo.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/machine/7200fifo.c')
-rw-r--r--src/emu/machine/7200fifo.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/emu/machine/7200fifo.c b/src/emu/machine/7200fifo.c
index 728fc5c8563..f4a6cb758b3 100644
--- a/src/emu/machine/7200fifo.c
+++ b/src/emu/machine/7200fifo.c
@@ -38,9 +38,9 @@ void fifo7200_device::device_start()
m_buffer.resize(m_ram_size);
// resolve callbacks
- m_ef_handler.resolve();
- m_ff_handler.resolve();
- m_hf_handler.resolve();
+ m_ef_handler.resolve_safe();
+ m_ff_handler.resolve_safe();
+ m_hf_handler.resolve_safe();
// state save
save_item(NAME(m_read_ptr));
@@ -65,9 +65,9 @@ void fifo7200_device::device_reset()
m_ff = 0;
m_hf = 0;
- if (!m_ef_handler.isnull()) m_ef_handler(!m_ef);
- if (!m_ff_handler.isnull()) m_ff_handler(!m_ff);
- if (!m_hf_handler.isnull()) m_hf_handler(!m_hf);
+ m_ef_handler(!m_ef);
+ m_ff_handler(!m_ff);
+ m_hf_handler(!m_hf);
}
@@ -87,19 +87,19 @@ void fifo7200_device::fifo_write(UINT16 data)
if (m_ef)
{
m_ef = 0;
- if (!m_ef_handler.isnull()) m_ef_handler(!m_ef);
+ m_ef_handler(!m_ef);
}
else if (m_read_ptr == m_write_ptr)
{
m_ff = 1;
- if (!m_ff_handler.isnull()) m_ff_handler(!m_ff);
+ m_ff_handler(!m_ff);
}
else if (((m_read_ptr + 1 + m_ram_size / 2) % m_ram_size) == m_write_ptr)
{
m_hf = 1;
- if (!m_hf_handler.isnull()) m_hf_handler(!m_hf);
+ m_hf_handler(!m_hf);
}
}
@@ -118,19 +118,19 @@ UINT16 fifo7200_device::fifo_read()
if (m_ff)
{
m_ff = 0;
- if (!m_ff_handler.isnull()) m_ff_handler(!m_ff);
+ m_ff_handler(!m_ff);
}
else if (m_read_ptr == m_write_ptr)
{
m_ef = 1;
- if (!m_ef_handler.isnull()) m_ef_handler(!m_ef);
+ m_ef_handler(!m_ef);
}
else if (((m_read_ptr + m_ram_size / 2) % m_ram_size) == m_write_ptr)
{
m_hf = 0;
- if (!m_hf_handler.isnull()) m_hf_handler(!m_hf);
+ m_hf_handler(!m_hf);
}
return ret;