summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/z8536.cpp
diff options
context:
space:
mode:
author Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
committer Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
commit2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch)
treeb468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/devices/machine/z8536.cpp
parent077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff)
parent11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff)
Merge https://github.com/mamedev/mame
# Conflicts: # src/devices/video/ef9365.cpp
Diffstat (limited to 'src/devices/machine/z8536.cpp')
-rw-r--r--src/devices/machine/z8536.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/machine/z8536.cpp b/src/devices/machine/z8536.cpp
index fc5e770b15a..f10b1c8f97a 100644
--- a/src/devices/machine/z8536.cpp
+++ b/src/devices/machine/z8536.cpp
@@ -214,7 +214,7 @@ void z8536_device::get_interrupt_vector()
void z8536_device::check_interrupt()
{
- int state = ASSERT_LINE;
+ int state;
if (m_register[MASTER_INTERRUPT_CONTROL] & MICR_MIE)
{
@@ -251,7 +251,7 @@ void z8536_device::check_interrupt()
UINT8 z8536_device::read_register(offs_t offset)
{
- UINT8 data = 0;
+ UINT8 data;
switch (offset)
{
@@ -905,9 +905,9 @@ void z8536_device::device_reset()
{
m_state = STATE_RESET;
- for (int i = 0; i < 48; i++)
+ for (auto & elem : m_register)
{
- m_register[i] = 0;
+ elem = 0;
}
m_register[MASTER_INTERRUPT_CONTROL] = MICR_RESET;