summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/sound/cdp1869.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/sound/cdp1869.h')
-rw-r--r--src/devices/sound/cdp1869.h26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/devices/sound/cdp1869.h b/src/devices/sound/cdp1869.h
index dc9c1501ea0..6ce373a6931 100644
--- a/src/devices/sound/cdp1869.h
+++ b/src/devices/sound/cdp1869.h
@@ -210,7 +210,6 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
virtual void device_start() override;
virtual void device_post_load() override;
- virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// device_memory_interface overrides
virtual space_config_vector memory_space_config() const override;
@@ -218,18 +217,21 @@ protected:
// device_sound_interface callbacks
virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override;
- inline bool is_ntsc();
- inline uint8_t read_page_ram_byte(offs_t address);
- inline void write_page_ram_byte(offs_t address, uint8_t data);
- inline uint8_t read_char_ram_byte(offs_t pma, offs_t cma, uint8_t pmd);
- inline void write_char_ram_byte(offs_t pma, offs_t cma, uint8_t pmd, uint8_t data);
- inline int read_pcb(offs_t pma, offs_t cma, uint8_t pmd);
- inline void update_prd_changed_timer();
+ TIMER_CALLBACK_MEMBER(prd_update);
+
static rgb_t get_rgb(int i, int c, int l);
- inline int get_lines();
- inline uint16_t get_pmemsize(int cols, int rows);
- inline uint16_t get_pma();
- inline int get_pen(int ccb0, int ccb1, int pcb);
+
+ bool is_ntsc();
+ uint8_t read_page_ram_byte(offs_t address);
+ void write_page_ram_byte(offs_t address, uint8_t data);
+ uint8_t read_char_ram_byte(offs_t pma, offs_t cma, uint8_t pmd);
+ void write_char_ram_byte(offs_t pma, offs_t cma, uint8_t pmd, uint8_t data);
+ int read_pcb(offs_t pma, offs_t cma, uint8_t pmd);
+ void update_prd_changed_timer();
+ int get_lines();
+ uint16_t get_pmemsize(int cols, int rows);
+ uint16_t get_pma();
+ int get_pen(int ccb0, int ccb1, int pcb);
void draw_line(bitmap_rgb32 &bitmap, const rectangle &rect, int x, int y, uint8_t data, int color);
void draw_char(bitmap_rgb32 &bitmap, const rectangle &rect, int x, int y, uint16_t pma);