summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/ncd68k.cpp
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2019-07-19 02:46:30 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2019-07-19 02:46:30 +1000
commit7978022a9712629f0a96a301092967a0730f9a4f (patch)
treeab3b791db330150b82d054771df6bc7c71f68356 /src/mame/drivers/ncd68k.cpp
parent8093eb3a543e346dadf0a389c70807c1b2046c34 (diff)
parentc182039d8e96f046eaf8d8f6d071f61d46bf87f4 (diff)
Merge remote-tracking branch 'upstream/master'
# Conflicts: # src/emu/digfx.h # src/frontend/mame/ui/ui.cpp
Diffstat (limited to 'src/mame/drivers/ncd68k.cpp')
-rw-r--r--src/mame/drivers/ncd68k.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/mame/drivers/ncd68k.cpp b/src/mame/drivers/ncd68k.cpp
index 617832bc373..e1a4e99e3fb 100644
--- a/src/mame/drivers/ncd68k.cpp
+++ b/src/mame/drivers/ncd68k.cpp
@@ -126,7 +126,7 @@ protected:
//private:
u8 m_portc, m_to_68k, m_from_68k;
u8 m_porta_in, m_porta_out;
- u8 m_portb_in, m_portb_out;
+ u8 m_portb_out;
};
class ncd16_state : public ncd68k_state
@@ -200,7 +200,7 @@ private:
void ncd68k_state::machine_reset()
{
- m_porta_in = m_porta_out = m_portb_in = m_portb_out = m_portc = 0;
+ m_porta_in = m_porta_out = m_portb_out = m_portc = 0;
m_to_68k = m_from_68k = 0;
m_porta_in |= 0x20;
@@ -300,7 +300,7 @@ u8 ncd68k_state::mcu_portb_r()
return m_from_68k;
}
else
- return m_portb_in;
+ return m_eeprom->do_read() ? 0x04 : 0x00;
}
void ncd68k_state::mcu_porta_w(u8 data)
@@ -657,14 +657,6 @@ void ncd68k_state::common(machine_config &config)
// eeprom
EEPROM_93C46_16BIT(config, m_eeprom);
- m_eeprom->do_callback().set(
- [this](int state)
- {
- if (state)
- m_portb_in |= 0x04;
- else
- m_portb_in &= ~0x04;
- });
}
static INPUT_PORTS_START(ncd68k)