From 44bbd47830f10890bcac3de4197247b18b92265f Mon Sep 17 00:00:00 2001 From: Ryan Holtz Date: Fri, 27 Aug 2010 12:11:31 +0000 Subject: [PATCH] Turns out those 'redundant' NULL checks were there for a reason. Balls. No whatsnew. --- src/emu/machine/ins8154.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/emu/machine/ins8154.c b/src/emu/machine/ins8154.c index 54e818a1b73..95fc850d710 100644 --- a/src/emu/machine/ins8154.c +++ b/src/emu/machine/ins8154.c @@ -141,24 +141,36 @@ READ8_DEVICE_HANDLER_TRAMPOLINE(ins8154, ins8154_r) switch (offset) { case 0x20: - val = devcb_call_read8(&m_in_a_func, 0); + if(m_in_a_func.read != NULL) + { + val = devcb_call_read8(&m_in_a_func, 0); + } m_in_a = val; break; case 0x21: - val = devcb_call_read8(&m_in_b_func, 0); + if(m_in_b_func.read != NULL) + { + val = devcb_call_read8(&m_in_b_func, 0); + } m_in_b = val; break; default: if (offset < 0x08) { - val = (devcb_call_read8(&m_in_a_func, 0) << (8 - offset)) & 0x80; + if(m_in_a_func.read != NULL) + { + val = (devcb_call_read8(&m_in_a_func, 0) << (8 - offset)) & 0x80; + } m_in_a = val; } else { - val = (devcb_call_read8(&m_in_b_func, 0) << (8 - (offset >> 4))) & 0x80; + if(m_in_b_func.read != NULL) + { + val = (devcb_call_read8(&m_in_b_func, 0) << (8 - (offset >> 4))) & 0x80; + } m_in_b = val; } break;