summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2017-10-26 18:01:31 -0400
committer AJR <ajrhacker@users.noreply.github.com>2017-10-26 18:03:30 -0400
commit4fafc9d5cb2ae7eb207f67da9acbd5ac4808764d (patch)
treef5b3bb5ad950dc1d90e4f62e56108e5f12b2ab9e
parent95ad1a3d813596eb2e4b0fd115c546342df676f8 (diff)
ringking: NMI gate was misconfigured; works again now
input_merger.cpp: Add a little logging (nw)
-rw-r--r--src/devices/machine/input_merger.cpp4
-rw-r--r--src/mame/drivers/kingobox.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/devices/machine/input_merger.cpp b/src/devices/machine/input_merger.cpp
index de2790bff1b..28652cdb66f 100644
--- a/src/devices/machine/input_merger.cpp
+++ b/src/devices/machine/input_merger.cpp
@@ -15,6 +15,9 @@
#include <algorithm>
#include <iterator>
+//#define VERBOSE 1
+#include "logmacro.h"
+
//**************************************************************************
// DEVICE DEFINITIONS
@@ -79,6 +82,7 @@ TIMER_CALLBACK_MEMBER(input_merger_device::update_state)
{
if (BIT(m_state, param >> 1) != BIT(param, 0))
{
+ LOG("state[%d] = %d\n", param >> 1, BIT(param, 0));
m_state ^= u32(1) << (param >> 1);
m_output_handler((m_state ^ m_xorval) ? m_active : !m_active);
}
diff --git a/src/mame/drivers/kingobox.cpp b/src/mame/drivers/kingobox.cpp
index d9e64990d0a..f6f117c04c9 100644
--- a/src/mame/drivers/kingobox.cpp
+++ b/src/mame/drivers/kingobox.cpp
@@ -524,7 +524,7 @@ static MACHINE_CONFIG_START( ringking )
MCFG_CPU_ADD("sprite", Z80, 4000000) /* 4.0 MHz */
MCFG_CPU_PROGRAM_MAP(ringking_sprite_map)
- MCFG_INPUT_MERGER_ANY_HIGH("nmigate")
+ MCFG_INPUT_MERGER_ALL_HIGH("nmigate")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("video", INPUT_LINE_NMI))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("sprite", INPUT_LINE_NMI))