summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/sound/cdp1864.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/sound/cdp1864.h')
-rw-r--r--src/devices/sound/cdp1864.h16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/devices/sound/cdp1864.h b/src/devices/sound/cdp1864.h
index 6c589128ef7..8dc1eb04e8e 100644
--- a/src/devices/sound/cdp1864.h
+++ b/src/devices/sound/cdp1864.h
@@ -112,20 +112,15 @@ protected:
virtual void device_config_complete() 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;
// internal callbacks
virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override;
-private:
- enum
- {
- TIMER_INT,
- TIMER_EFX,
- TIMER_DMA,
- TIMER_HSYNC
- };
+ TIMER_CALLBACK_MEMBER(int_tick);
+ TIMER_CALLBACK_MEMBER(efx_tick);
+ TIMER_CALLBACK_MEMBER(dma_tick);
+private:
void initialize_palette();
static constexpr int bckgnd[4] = { 2, 0, 4, 1 };
@@ -152,7 +147,7 @@ private:
int m_disp; // display on
int m_dmaout; // DMA request active
int m_bgcolor; // background color
- int m_con; // color on
+ bool m_con; // color on
// sound state
int m_aoe; // audio on
@@ -164,7 +159,6 @@ private:
emu_timer *m_int_timer;
emu_timer *m_efx_timer;
emu_timer *m_dma_timer;
- emu_timer *m_hsync_timer;
};