diff options
Diffstat (limited to 'src/devices/sound/tms5110.h')
-rw-r--r-- | src/devices/sound/tms5110.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/devices/sound/tms5110.h b/src/devices/sound/tms5110.h index 12f279155eb..0f367323f6d 100644 --- a/src/devices/sound/tms5110.h +++ b/src/devices/sound/tms5110.h @@ -41,26 +41,26 @@ public: auto data() { return m_data_cb.bind(); } auto romclk() { return m_romclk_cb.bind(); } - DECLARE_WRITE8_MEMBER( ctl_w ); - DECLARE_READ8_MEMBER( ctl_r ); - DECLARE_WRITE_LINE_MEMBER( pdc_w ); + void ctl_w(uint8_t data); + uint8_t ctl_r(); + void pdc_w(int state); - // this is only used by cvs.c + // this is only used by cvs.cpp // it is not related at all to the speech generation and conflicts with the new ROM controller interface. - DECLARE_READ_LINE_MEMBER( romclk_hack_r ); + int romclk_hack_r(); protected: tms5110_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int variant); // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; + virtual void device_start() override ATTR_COLD; + virtual void device_reset() override ATTR_COLD; virtual void device_clock_changed() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + TIMER_CALLBACK_MEMBER(romclk_hack_toggle); // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; + virtual void sound_stream_update(sound_stream &stream) override; uint8_t TALK_STATUS() const { return m_SPEN | m_TALKD; } @@ -74,7 +74,7 @@ private: void new_int_write_addr(uint8_t addr); uint8_t new_int_read(); void register_for_save_states(); - int extract_bits(int count); + int read_bits(int count); void perform_dummy_read(); int32_t lattice_filter(); void process(int16_t *buffer, unsigned int size); @@ -238,7 +238,7 @@ class m58817_device : public tms5110_device public: m58817_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( status_r ); + uint8_t status_r(); }; @@ -273,19 +273,19 @@ public: auto pdc() { return m_pdc_cb.bind(); } auto ctl() { return m_ctl_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER( m0_w ); - DECLARE_READ_LINE_MEMBER( data_r ); + void m0_w(int state); + int data_r(); /* offset is rom # */ - DECLARE_WRITE8_MEMBER( rom_csq_w ); - DECLARE_WRITE8_MEMBER( bit_w ); - DECLARE_WRITE_LINE_MEMBER( enable_w ); + void rom_csq_w(offs_t offset, uint8_t data); + void bit_w(uint8_t data); + void enable_w(int state); protected: // device-level overrides - virtual void device_start() override; + virtual void device_start() override ATTR_COLD; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + TIMER_CALLBACK_MEMBER(update_romclk); private: void register_for_save_states(); |