summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-04-04 22:18:14 -0400
committer AJR <ajrhacker@users.noreply.github.com>2019-04-04 22:18:14 -0400
commitbda6a83a492f5d3112f55e8d6d9f2f0d1a14576d (patch)
treec6bb800b4351b5806d4a34a1d4e7923b9fb3471e
parent900a5f2f5e69ad572f862388470bb0e95ba07c49 (diff)
taito_en: Use CPU space for interrupt vectoring (nw)
-rw-r--r--src/mame/audio/taito_en.cpp19
-rw-r--r--src/mame/audio/taito_en.h4
2 files changed, 9 insertions, 14 deletions
diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp
index bec1aa88503..1e2cfc96cd5 100644
--- a/src/mame/audio/taito_en.cpp
+++ b/src/mame/audio/taito_en.cpp
@@ -112,6 +112,11 @@ void taito_en_device::en_sound_map(address_map &map)
map(0xff0000, 0xffffff).ram().share("osram"); // mirror
}
+void taito_en_device::fc7_map(address_map &map)
+{
+ map(0xfffffd, 0xfffffd).r(m_duart68681, FUNC(mc68681_device::get_irq_vector));
+}
+
/*************************************
*
@@ -147,18 +152,6 @@ void taito_en_device::es5505_clock_changed(u32 data)
/*************************************
*
- * M68681 callback
- *
- *************************************/
-
-IRQ_CALLBACK_MEMBER(taito_en_device::duart_iack)
-{
- return m_duart68681->get_irq_vector();
-}
-
-
-/*************************************
- *
* Device interfaces
*
*************************************/
@@ -204,7 +197,7 @@ 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));
+ m_audiocpu->set_addrmap(m68000_device::AS_CPU_SPACE, &taito_en_device::fc7_map);
ES5510(config, m_esp, XTAL(10'000'000)); // from Gun Buster schematics
m_esp->set_disable();
diff --git a/src/mame/audio/taito_en.h b/src/mame/audio/taito_en.h
index e3ab4c749e8..c50a7db221a 100644
--- a/src/mame/audio/taito_en.h
+++ b/src/mame/audio/taito_en.h
@@ -31,7 +31,6 @@ public:
void set_bank(int bank, int entry) { m_cpubank[bank]->set_entry(entry); }
- void en_sound_map(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;
@@ -39,6 +38,9 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
private:
+ void en_sound_map(address_map &map);
+ void fc7_map(address_map &map);
+
// inherited devices/pointers
required_device<cpu_device> m_audiocpu;
required_device<es5505_device> m_ensoniq;