summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/audio/efo_zsu.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-08-06 18:28:28 +1000
committer Vas Crabb <vas@vastheman.com>2017-08-06 18:28:28 +1000
commitfbe8e518392bbf262b2c185c06c6896bd0841446 (patch)
tree7dc2ca463b39dd8682fb5c2252231e7d0c282a9d /src/mame/audio/efo_zsu.cpp
parent06ac9f36e70cae121438713867331c8cb1074f79 (diff)
input_merger: syncronise on the way in, extend to 32 inputs, make some
more variants, get rid of virtual call [Vas Crabb] bublbobl.cpp, missb2.cpp: reimplemented sound cpu semaphores and sound nmi according to schematics. Implemented sound semaphores into tokio as well, fixing SOUND ERROR in test mode. Added notes about sound cpu addressing. Reimplemented /SRESET as a separate function called on sound cpu reset according to schematics. Added correct watchdog to bubble bobble and tokio, and disabled it on the bubble bobble prototype. Added proper 'wired-or' sound cpu IRQs to bubble bobble. Renamed 'slave' cpu to 'subcpu' to match schematics. [Lord Nightmare, Vas Crabb]
Diffstat (limited to 'src/mame/audio/efo_zsu.cpp')
-rw-r--r--src/mame/audio/efo_zsu.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mame/audio/efo_zsu.cpp b/src/mame/audio/efo_zsu.cpp
index 4a590b85695..698ea12f819 100644
--- a/src/mame/audio/efo_zsu.cpp
+++ b/src/mame/audio/efo_zsu.cpp
@@ -194,13 +194,13 @@ MACHINE_CONFIG_MEMBER( efo_zsu_device::device_add_mconfig )
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_DEVICE_ADD("ctc0", Z80CTC, 4000000)
- MCFG_Z80CTC_INTR_CB(DEVWRITELINE("soundirq", input_merger_device, in0_w))
+ MCFG_Z80CTC_INTR_CB(DEVWRITELINE("soundirq", input_merger_device, in_w<0>))
MCFG_Z80CTC_ZC0_CB(WRITELINE(efo_zsu_device, ctc0_z0_w))
MCFG_Z80CTC_ZC1_CB(WRITELINE(efo_zsu_device, ctc0_z1_w))
MCFG_Z80CTC_ZC2_CB(WRITELINE(efo_zsu_device, ctc0_z2_w))
MCFG_DEVICE_ADD("ctc1", Z80CTC, 4000000)
- MCFG_Z80CTC_INTR_CB(DEVWRITELINE("soundirq", input_merger_device, in0_w))
+ MCFG_Z80CTC_INTR_CB(DEVWRITELINE("soundirq", input_merger_device, in_w<1>))
MCFG_Z80CTC_ZC0_CB(WRITELINE(efo_zsu_device, ctc1_z0_w))
MCFG_Z80CTC_ZC1_CB(WRITELINE(efo_zsu_device, ctc1_z1_w))
MCFG_Z80CTC_ZC2_CB(WRITELINE(efo_zsu_device, ctc1_z2_w))
@@ -213,9 +213,9 @@ MACHINE_CONFIG_MEMBER( efo_zsu_device::device_add_mconfig )
#endif
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", input_merger_device, in1_w))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", input_merger_device, in_w<2>))
- MCFG_INPUT_MERGER_ACTIVE_HIGH("soundirq") // 74HC03 NAND gate
+ MCFG_INPUT_MERGER_ANY_HIGH("soundirq") // 74HC03 NAND gate
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("soundcpu", INPUT_LINE_IRQ0))
MCFG_SPEAKER_STANDARD_MONO("mono")