diff options
Diffstat (limited to 'src/mame/audio/williams.h')
-rw-r--r-- | src/mame/audio/williams.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/mame/audio/williams.h b/src/mame/audio/williams.h index 3171ef57361..44e308a9e2e 100644 --- a/src/mame/audio/williams.h +++ b/src/mame/audio/williams.h @@ -45,16 +45,12 @@ public: // internal communications DECLARE_WRITE8_MEMBER(bank_select_w); - DECLARE_WRITE8_MEMBER(talkback_w); DECLARE_WRITE8_MEMBER(cvsd_digit_clock_clear_w); DECLARE_WRITE8_MEMBER(cvsd_clock_set_w); - DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w); - DECLARE_WRITE_LINE_MEMBER(pia_irqa); - DECLARE_WRITE_LINE_MEMBER(pia_irqb); protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; virtual void device_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -67,6 +63,12 @@ private: // internal state uint8_t m_talkback; + + DECLARE_WRITE8_MEMBER(talkback_w); + DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w); + DECLARE_WRITE_LINE_MEMBER(pia_irqa); + DECLARE_WRITE_LINE_MEMBER(pia_irqb); + }; @@ -96,11 +98,10 @@ public: DECLARE_WRITE8_MEMBER(slave_sync_w); DECLARE_WRITE8_MEMBER(cvsd_digit_clock_clear_w); DECLARE_WRITE8_MEMBER(cvsd_clock_set_w); - DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w); protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; virtual void device_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -125,6 +126,8 @@ private: uint8_t m_talkback; uint8_t m_audio_sync; uint8_t m_sound_int_state; + + DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w); }; @@ -147,7 +150,6 @@ public: DECLARE_WRITE8_MEMBER(oki6295_bank_select_w); DECLARE_READ8_MEMBER(command_r); DECLARE_WRITE8_MEMBER(talkback_w); - DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w); protected: // timer IDs @@ -158,7 +160,7 @@ protected: }; // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; virtual void device_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -171,4 +173,6 @@ private: uint8_t m_latch; uint8_t m_talkback; uint8_t m_sound_int_state; + + DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w); }; |