diff options
author | 2019-01-01 13:47:31 -0600 | |
---|---|---|
committer | 2019-01-01 13:47:31 -0600 | |
commit | 42cbcb333b7da0e9901a260dfb5bd65aafe1a7f7 (patch) | |
tree | 57fdd558c54ec5c850f367c3af78f7700417a32d | |
parent | d6e6e759d38462c9f98796f4aa7c45ef74971f8a (diff) | |
parent | 971e96b62879643f99ca10fd754285baf958b59b (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
-rw-r--r-- | src/mame/audio/taito_en.cpp | 15 | ||||
-rw-r--r-- | src/mame/audio/taito_en.h | 2 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp index ad037c092c1..c4592aba133 100644 --- a/src/mame/audio/taito_en.cpp +++ b/src/mame/audio/taito_en.cpp @@ -140,17 +140,9 @@ WRITE8_MEMBER(taito_en_device::mb87078_gain_changed) * *************************************/ -WRITE_LINE_MEMBER(taito_en_device::duart_irq_handler) +IRQ_CALLBACK_MEMBER(taito_en_device::duart_iack) { - if (state == ASSERT_LINE) - { - m_audiocpu->set_input_line_vector(M68K_IRQ_6, m_duart68681->get_irq_vector()); - m_audiocpu->set_input_line(M68K_IRQ_6, ASSERT_LINE); - } - else - { - m_audiocpu->set_input_line(M68K_IRQ_6, CLEAR_LINE); - } + return m_duart68681->get_irq_vector(); } @@ -201,13 +193,14 @@ void taito_en_device::device_add_mconfig(machine_config &config) /* basic machine hardware */ M68000(config, m_audiocpu, XTAL(30'476'100) / 2); m_audiocpu->set_addrmap(AS_PROGRAM, &taito_en_device::en_sound_map); + m_audiocpu->set_irq_acknowledge_callback(FUNC(taito_en_device::duart_iack)); ES5510(config, m_esp, XTAL(10'000'000)); // from Gun Buster schematics m_esp->set_disable(); MC68681(config, m_duart68681, XTAL(16'000'000) / 4); m_duart68681->set_clocks(XTAL(16'000'000)/2/8, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/8); - m_duart68681->irq_cb().set(FUNC(taito_en_device::duart_irq_handler)); + m_duart68681->irq_cb().set_inputline(m_audiocpu, M68K_IRQ_6); m_duart68681->outport_cb().set(FUNC(taito_en_device::duart_output)); MB87078(config, m_mb87078); diff --git a/src/mame/audio/taito_en.h b/src/mame/audio/taito_en.h index bdcaf714c7f..ca5854118d0 100644 --- a/src/mame/audio/taito_en.h +++ b/src/mame/audio/taito_en.h @@ -54,7 +54,7 @@ private: uint32_t m_bankmask; - DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); + IRQ_CALLBACK_MEMBER(duart_iack); DECLARE_WRITE8_MEMBER(duart_output); DECLARE_WRITE8_MEMBER(mb87078_gain_changed); |