diff options
author | 2022-01-26 08:47:06 -0500 | |
---|---|---|
committer | 2022-01-26 08:56:03 -0500 | |
commit | ca79d71af4bca7c1b8acc1df9e5dbb5b987d1542 (patch) | |
tree | 42994b1dd615273baa3e656b569ccd478270aff3 /src/devices/video | |
parent | ba918b59faad5244d87078ab3b955f64fd803c4d (diff) |
Remove void *ptr parameter from emu_timer, timer_device and all related callbacks
Diffstat (limited to 'src/devices/video')
69 files changed, 83 insertions, 83 deletions
diff --git a/src/devices/video/315_5124.cpp b/src/devices/video/315_5124.cpp index 338fb2370ce..9afe518b6bc 100644 --- a/src/devices/video/315_5124.cpp +++ b/src/devices/video/315_5124.cpp @@ -478,7 +478,7 @@ void sega315_5377_device::set_sega315_5124_compatibility_mode(bool sega315_5124_ } -void sega315_5124_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sega315_5124_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/video/315_5124.h b/src/devices/video/315_5124.h index cfb614c8447..075d9836838 100644 --- a/src/devices/video/315_5124.h +++ b/src/devices/video/315_5124.h @@ -94,7 +94,7 @@ protected: virtual void device_post_load() 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual void device_add_mconfig(machine_config &config) override; virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/video/cdp1861.cpp b/src/devices/video/cdp1861.cpp index 03bcd3e0e90..d8318896412 100644 --- a/src/devices/video/cdp1861.cpp +++ b/src/devices/video/cdp1861.cpp @@ -154,7 +154,7 @@ void cdp1861_device::device_reset() // device_timer - handle timer events //------------------------------------------------- -void cdp1861_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cdp1861_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int scanline = screen().vpos(); diff --git a/src/devices/video/cdp1861.h b/src/devices/video/cdp1861.h index cf247d19e3e..5e7eca7f8fc 100644 --- a/src/devices/video/cdp1861.h +++ b/src/devices/video/cdp1861.h @@ -81,7 +81,7 @@ 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; private: enum diff --git a/src/devices/video/crt9007.cpp b/src/devices/video/crt9007.cpp index 3a32da74f44..de8d7554b1a 100644 --- a/src/devices/video/crt9007.cpp +++ b/src/devices/video/crt9007.cpp @@ -608,7 +608,7 @@ void crt9007_device::device_clock_changed() // device_timer - handle timer events //------------------------------------------------- -void crt9007_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void crt9007_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int x = screen().hpos(); int y = screen().vpos(); diff --git a/src/devices/video/crt9007.h b/src/devices/video/crt9007.h index 38274515447..efa591bd1d0 100644 --- a/src/devices/video/crt9007.h +++ b/src/devices/video/crt9007.h @@ -78,7 +78,7 @@ protected: virtual void device_reset() override; virtual void device_post_load() override; virtual void device_clock_changed() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/video/crtc_ega.cpp b/src/devices/video/crtc_ega.cpp index 06a691cf5bf..184800f2ef9 100644 --- a/src/devices/video/crtc_ega.cpp +++ b/src/devices/video/crtc_ega.cpp @@ -397,7 +397,7 @@ void crtc_ega_device::handle_line_timer() } -void crtc_ega_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void crtc_ega_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/video/crtc_ega.h b/src/devices/video/crtc_ega.h index e5a267bed90..1f1e65597ae 100644 --- a/src/devices/video/crtc_ega.h +++ b/src/devices/video/crtc_ega.h @@ -73,7 +73,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_post_load() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; private: devcb_write_line m_res_out_de_cb; diff --git a/src/devices/video/ef9340_1.cpp b/src/devices/video/ef9340_1.cpp index 45d88f88c12..19a636d6ffb 100644 --- a/src/devices/video/ef9340_1.cpp +++ b/src/devices/video/ef9340_1.cpp @@ -107,7 +107,7 @@ void ef9340_1_device::device_start() } -void ef9340_1_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ef9340_1_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/video/ef9340_1.h b/src/devices/video/ef9340_1.h index 6aceef46708..8f5c12e17fe 100644 --- a/src/devices/video/ef9340_1.h +++ b/src/devices/video/ef9340_1.h @@ -68,7 +68,7 @@ public: protected: // device-level overrides virtual void device_start() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual const tiny_rom_entry *device_rom_region() const override; inline u16 ef9340_get_c_addr(u8 x, u8 y); diff --git a/src/devices/video/ef9345.cpp b/src/devices/video/ef9345.cpp index f5379b26b6f..c78d7d06568 100644 --- a/src/devices/video/ef9345.cpp +++ b/src/devices/video/ef9345.cpp @@ -194,7 +194,7 @@ void ef9345_device::device_reset() //------------------------------------------------- // device_timer - handler timer events //------------------------------------------------- -void ef9345_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ef9345_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/video/ef9345.h b/src/devices/video/ef9345.h index aebd71f67ca..7c2f923574c 100644 --- a/src/devices/video/ef9345.h +++ b/src/devices/video/ef9345.h @@ -52,7 +52,7 @@ protected: // device-level overrides 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; // device_config_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/video/ef9365.cpp b/src/devices/video/ef9365.cpp index 7697e6885e6..774437e15ff 100644 --- a/src/devices/video/ef9365.cpp +++ b/src/devices/video/ef9365.cpp @@ -377,7 +377,7 @@ void ef9365_device::update_interrupts() // device_timer - handler timer events //------------------------------------------------- -void ef9365_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ef9365_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/video/ef9365.h b/src/devices/video/ef9365.h index eb2ecf894d9..7017b4e4587 100644 --- a/src/devices/video/ef9365.h +++ b/src/devices/video/ef9365.h @@ -61,7 +61,7 @@ protected: // device-level overrides 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual const tiny_rom_entry *device_rom_region() const override; // device_config_memory_interface overrides diff --git a/src/devices/video/fixfreq.h b/src/devices/video/fixfreq.h index 8e89edab355..b32992fbf8d 100644 --- a/src/devices/video/fixfreq.h +++ b/src/devices/video/fixfreq.h @@ -301,7 +301,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_post_load() override; - //virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + //virtual void device_timer(emu_timer &timer, device_timer_id id, int param); virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/video/gb_lcd.cpp b/src/devices/video/gb_lcd.cpp index 99dfc80282d..baa139b0803 100644 --- a/src/devices/video/gb_lcd.cpp +++ b/src/devices/video/gb_lcd.cpp @@ -1917,7 +1917,7 @@ void dmg_ppu_device::increment_scanline() } -void dmg_ppu_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void dmg_ppu_device::device_timer(emu_timer &timer, device_timer_id id, int param) { update_state(); } diff --git a/src/devices/video/gb_lcd.h b/src/devices/video/gb_lcd.h index 9c4e2607420..d3f98ac1265 100644 --- a/src/devices/video/gb_lcd.h +++ b/src/devices/video/gb_lcd.h @@ -80,7 +80,7 @@ protected: // device-level overrides 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; void common_start(); void common_reset(); diff --git a/src/devices/video/hd44352.cpp b/src/devices/video/hd44352.cpp index 1ca378723f3..404119e6c71 100644 --- a/src/devices/video/hd44352.cpp +++ b/src/devices/video/hd44352.cpp @@ -115,7 +115,7 @@ void hd44352_device::device_reset() //------------------------------------------------- // device_timer - handler timer events //------------------------------------------------- -void hd44352_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hd44352_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/video/hd44352.h b/src/devices/video/hd44352.h index 4bf12e359e2..2b81a5345de 100644 --- a/src/devices/video/hd44352.h +++ b/src/devices/video/hd44352.h @@ -36,7 +36,7 @@ protected: // device-level overrides 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual void device_validity_check(validity_checker &valid) const override; private: diff --git a/src/devices/video/hd44780.cpp b/src/devices/video/hd44780.cpp index a2fdb2d3032..3fbea6e8349 100644 --- a/src/devices/video/hd44780.cpp +++ b/src/devices/video/hd44780.cpp @@ -181,7 +181,7 @@ void hd44780_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void hd44780_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hd44780_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/video/hd44780.h b/src/devices/video/hd44780.h index a69e816db21..f09747c2583 100644 --- a/src/devices/video/hd44780.h +++ b/src/devices/video/hd44780.h @@ -58,7 +58,7 @@ protected: // device-level overrides 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/video/hd61830.cpp b/src/devices/video/hd61830.cpp index 6e36a550153..14fff0b3dff 100644 --- a/src/devices/video/hd61830.cpp +++ b/src/devices/video/hd61830.cpp @@ -137,7 +137,7 @@ void hd61830_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void hd61830_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hd61830_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // clear busy flag m_bf = false; diff --git a/src/devices/video/hd61830.h b/src/devices/video/hd61830.h index 052335c5e6d..c1177a908fc 100644 --- a/src/devices/video/hd61830.h +++ b/src/devices/video/hd61830.h @@ -41,7 +41,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/video/hd63484.h b/src/devices/video/hd63484.h index 7b3d8fb1225..816aa6a8ce5 100644 --- a/src/devices/video/hd63484.h +++ b/src/devices/video/hd63484.h @@ -47,7 +47,7 @@ protected: // device-level overrides 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); + //virtual void device_timer(emu_timer &timer, device_timer_id id, int param); inline uint16_t readword(offs_t address); inline void writeword(offs_t address, uint16_t data); diff --git a/src/devices/video/hlcd0438.h b/src/devices/video/hlcd0438.h index 2b1ec257d1c..c76bb4835ed 100644 --- a/src/devices/video/hlcd0438.h +++ b/src/devices/video/hlcd0438.h @@ -58,7 +58,7 @@ public: protected: // device-level overrides virtual void device_start() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override { lcd_w(!m_lcd); } + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override { lcd_w(!m_lcd); } private: emu_timer *m_lcd_timer; diff --git a/src/devices/video/hlcd0488.cpp b/src/devices/video/hlcd0488.cpp index beed0221a3f..984a5600e6c 100644 --- a/src/devices/video/hlcd0488.cpp +++ b/src/devices/video/hlcd0488.cpp @@ -55,7 +55,7 @@ void hlcd0488_device::device_start() // handlers //------------------------------------------------- -void hlcd0488_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hlcd0488_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // Latch pulse, when high, resets the %8 latch address counter if (m_latch_pulse) diff --git a/src/devices/video/hlcd0488.h b/src/devices/video/hlcd0488.h index ed71ed09bc5..66d72616374 100644 --- a/src/devices/video/hlcd0488.h +++ b/src/devices/video/hlcd0488.h @@ -54,7 +54,7 @@ public: protected: // device-level overrides virtual void device_start() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; private: // pin state diff --git a/src/devices/video/hlcd0515.cpp b/src/devices/video/hlcd0515.cpp index 911b6f0320c..55a0183a11c 100644 --- a/src/devices/video/hlcd0515.cpp +++ b/src/devices/video/hlcd0515.cpp @@ -102,7 +102,7 @@ void hlcd0515_device::device_start() // device_timer - handle timer events //------------------------------------------------- -void hlcd0515_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hlcd0515_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (m_rowout > m_rowmax) m_rowout = 0; diff --git a/src/devices/video/hlcd0515.h b/src/devices/video/hlcd0515.h index 868621c90d2..fd1a5d2c147 100644 --- a/src/devices/video/hlcd0515.h +++ b/src/devices/video/hlcd0515.h @@ -60,7 +60,7 @@ protected: // device-level overrides virtual void device_start() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual void set_control(); void clock_data(int col = 0); diff --git a/src/devices/video/hlcd0538.h b/src/devices/video/hlcd0538.h index 2b17167b160..f14598ac6c8 100644 --- a/src/devices/video/hlcd0538.h +++ b/src/devices/video/hlcd0538.h @@ -58,7 +58,7 @@ protected: // device-level overrides virtual void device_start() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override { lcd_w(!m_lcd); } + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override { lcd_w(!m_lcd); } emu_timer *m_lcd_timer; diff --git a/src/devices/video/huc6260.cpp b/src/devices/video/huc6260.cpp index 08ca9abc5d9..0830aa2bf90 100644 --- a/src/devices/video/huc6260.cpp +++ b/src/devices/video/huc6260.cpp @@ -63,7 +63,7 @@ huc6260_device::huc6260_device(const machine_config &mconfig, const char *tag, d } -void huc6260_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void huc6260_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int vpos = screen().vpos(); int hpos = screen().hpos(); diff --git a/src/devices/video/huc6260.h b/src/devices/video/huc6260.h index 69b74f8394b..ef33f7a5cea 100644 --- a/src/devices/video/huc6260.h +++ b/src/devices/video/huc6260.h @@ -43,7 +43,7 @@ protected: // device-level overrides 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual uint32_t palette_entries() const override { return PALETTE_SIZE; } diff --git a/src/devices/video/huc6261.cpp b/src/devices/video/huc6261.cpp index 4ff0080777a..546f117cf2d 100644 --- a/src/devices/video/huc6261.cpp +++ b/src/devices/video/huc6261.cpp @@ -94,7 +94,7 @@ void huc6261_device::apply_pal_offs(uint16_t *pix_data) *pix_data &= 0x1ff; } -void huc6261_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void huc6261_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int vpos = screen().vpos(); int hpos = screen().hpos(); diff --git a/src/devices/video/huc6261.h b/src/devices/video/huc6261.h index 47e10c2a0e0..b9d9b351c80 100644 --- a/src/devices/video/huc6261.h +++ b/src/devices/video/huc6261.h @@ -38,7 +38,7 @@ protected: // device-level overrides 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; private: required_device<huc6270_device> m_huc6270_a; diff --git a/src/devices/video/i8244.cpp b/src/devices/video/i8244.cpp index 48fd1180a28..8ec529afee5 100644 --- a/src/devices/video/i8244.cpp +++ b/src/devices/video/i8244.cpp @@ -188,7 +188,7 @@ void i8244_device::device_start() // device_timer - handle timer callbacks //------------------------------------------------- -void i8244_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void i8244_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/video/i8244.h b/src/devices/video/i8244.h index 245907fd604..909d39b057d 100644 --- a/src/devices/video/i8244.h +++ b/src/devices/video/i8244.h @@ -111,7 +111,7 @@ protected: // device-level overrides virtual void device_config_complete() override; virtual void device_start() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual const tiny_rom_entry *device_rom_region() const override; // device_sound_interface overrides diff --git a/src/devices/video/i8275.cpp b/src/devices/video/i8275.cpp index ed3204b8d9f..2ea9570d712 100644 --- a/src/devices/video/i8275.cpp +++ b/src/devices/video/i8275.cpp @@ -263,7 +263,7 @@ void i8275_device::dma_start() // device_timer - handle timer events //------------------------------------------------- -void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param) { //int y = screen().vpos(); //int x = screen().hpos(); diff --git a/src/devices/video/i8275.h b/src/devices/video/i8275.h index b43fcbdefa8..34f7f24419b 100644 --- a/src/devices/video/i8275.h +++ b/src/devices/video/i8275.h @@ -85,7 +85,7 @@ protected: // device-level overrides 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; void vrtc_start(); void vrtc_end(); diff --git a/src/devices/video/imagetek_i4100.cpp b/src/devices/video/imagetek_i4100.cpp index 69dc3dcd775..92b7fbe5716 100644 --- a/src/devices/video/imagetek_i4100.cpp +++ b/src/devices/video/imagetek_i4100.cpp @@ -522,7 +522,7 @@ void imagetek_i4300_device::update_irq_state() m_irq_cb(level); } -void imagetek_i4100_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void imagetek_i4100_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/video/imagetek_i4100.h b/src/devices/video/imagetek_i4100.h index 4d40c585ff1..9457cbce040 100644 --- a/src/devices/video/imagetek_i4100.h +++ b/src/devices/video/imagetek_i4100.h @@ -75,7 +75,7 @@ protected: 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual void update_irq_state(); diff --git a/src/devices/video/lc7985.cpp b/src/devices/video/lc7985.cpp index 40c7089385b..6608ad6fc71 100644 --- a/src/devices/video/lc7985.cpp +++ b/src/devices/video/lc7985.cpp @@ -66,7 +66,7 @@ void lc7985_device::busy(attotime time) m_busy_timer->adjust(time); } -void lc7985_device::device_timer(emu_timer &, device_timer_id, int, void *) +void lc7985_device::device_timer(emu_timer &, device_timer_id, int) { m_busy_flag = false; } diff --git a/src/devices/video/lc7985.h b/src/devices/video/lc7985.h index c528646852f..1d989e83e85 100644 --- a/src/devices/video/lc7985.h +++ b/src/devices/video/lc7985.h @@ -27,7 +27,7 @@ public: protected: 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual const tiny_rom_entry *device_rom_region() const override; private: diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp index abf5692b7c7..c1e3ca971aa 100644 --- a/src/devices/video/mc6845.cpp +++ b/src/devices/video/mc6845.cpp @@ -948,7 +948,7 @@ void mc6845_device::handle_line_timer() } -void mc6845_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mc6845_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -1018,7 +1018,7 @@ void mc6845_device::device_timer(emu_timer &timer, device_timer_id id, int param } -void mos8563_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mos8563_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -1039,7 +1039,7 @@ void mos8563_device::device_timer(emu_timer &timer, device_timer_id id, int para break; } default: - mc6845_device::device_timer(timer, id, param, ptr); + mc6845_device::device_timer(timer, id, param); break; } } diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h index 431c1a3608b..3be35da59c3 100644 --- a/src/devices/video/mc6845.h +++ b/src/devices/video/mc6845.h @@ -132,7 +132,7 @@ protected: virtual void device_reset() override; virtual void device_post_load() override; virtual void device_clock_changed() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; attotime cclks_to_attotime(uint64_t clocks) const { return clocks_to_attotime(clocks * m_clk_scale); } uint64_t attotime_to_cclks(const attotime &duration) const { return attotime_to_clocks(duration) / m_clk_scale; } @@ -425,7 +425,7 @@ protected: // device-level overrides 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/video/mc6847.cpp b/src/devices/video/mc6847.cpp index 56f14f3e307..972e77d0165 100644 --- a/src/devices/video/mc6847.cpp +++ b/src/devices/video/mc6847.cpp @@ -253,7 +253,7 @@ void mc6847_friend_device::update_field_sync_timer() // device_timer //------------------------------------------------- -void mc6847_friend_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mc6847_friend_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/video/mc6847.h b/src/devices/video/mc6847.h index 51ecde98334..c26582fc4c6 100644 --- a/src/devices/video/mc6847.h +++ b/src/devices/video/mc6847.h @@ -275,7 +275,7 @@ protected: // device-level overrides virtual void device_start() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual void device_reset() override; virtual void device_post_load() override; diff --git a/src/devices/video/nt7534.cpp b/src/devices/video/nt7534.cpp index d972a4b99dd..d72bdbe2b4a 100644 --- a/src/devices/video/nt7534.cpp +++ b/src/devices/video/nt7534.cpp @@ -100,7 +100,7 @@ void nt7534_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void nt7534_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nt7534_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/video/nt7534.h b/src/devices/video/nt7534.h index ef36ba36884..7b4db9d51c9 100644 --- a/src/devices/video/nt7534.h +++ b/src/devices/video/nt7534.h @@ -48,7 +48,7 @@ protected: // device-level overrides 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; private: // internal helper void set_busy_flag(uint16_t usec); diff --git a/src/devices/video/pcf2100.cpp b/src/devices/video/pcf2100.cpp index 931ed6c414c..12df4488d0a 100644 --- a/src/devices/video/pcf2100.cpp +++ b/src/devices/video/pcf2100.cpp @@ -78,7 +78,7 @@ void pcf2100_device::device_start() // handlers //------------------------------------------------- -void pcf2100_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pcf2100_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // transfer latches to output m_write_segs(m_bpout, m_latch[m_bpout]); diff --git a/src/devices/video/pcf2100.h b/src/devices/video/pcf2100.h index bf452a90336..74a830f0712 100644 --- a/src/devices/video/pcf2100.h +++ b/src/devices/video/pcf2100.h @@ -47,7 +47,7 @@ protected: // device-level overrides virtual void device_start() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; emu_timer *m_lcd_timer; diff --git a/src/devices/video/ppu2c0x.cpp b/src/devices/video/ppu2c0x.cpp index 793edf6cb03..3c30a2d7672 100644 --- a/src/devices/video/ppu2c0x.cpp +++ b/src/devices/video/ppu2c0x.cpp @@ -505,7 +505,7 @@ void ppu2c04_clone_device::init_palette_tables() // device_timer - handle timer events //------------------------------------------------- -void ppu2c0x_device::device_timer(emu_timer& timer, device_timer_id id, int param, void* ptr) +void ppu2c0x_device::device_timer(emu_timer& timer, device_timer_id id, int param) { int blanked, vblank; diff --git a/src/devices/video/ppu2c0x.h b/src/devices/video/ppu2c0x.h index 532eec0e7f1..345d2e490cd 100644 --- a/src/devices/video/ppu2c0x.h +++ b/src/devices/video/ppu2c0x.h @@ -177,7 +177,7 @@ protected: ppu2c0x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock = 0); virtual void device_start() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual void device_config_complete() override; // device_config_memory_interface overrides diff --git a/src/devices/video/sed1500.cpp b/src/devices/video/sed1500.cpp index 57d6fe5f281..abea4b94bc9 100644 --- a/src/devices/video/sed1500.cpp +++ b/src/devices/video/sed1500.cpp @@ -84,7 +84,7 @@ void sed1500_device::device_start() // handlers //------------------------------------------------- -void sed1500_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sed1500_device::device_timer(emu_timer &timer, device_timer_id id, int param) { u64 data = 0; diff --git a/src/devices/video/sed1500.h b/src/devices/video/sed1500.h index e26360966bb..1186cbc7e14 100644 --- a/src/devices/video/sed1500.h +++ b/src/devices/video/sed1500.h @@ -44,7 +44,7 @@ protected: // device-level overrides virtual void device_start() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; emu_timer *m_lcd_timer; diff --git a/src/devices/video/tms9927.cpp b/src/devices/video/tms9927.cpp index 7fef40f635e..7ef7fb143ca 100644 --- a/src/devices/video/tms9927.cpp +++ b/src/devices/video/tms9927.cpp @@ -140,7 +140,7 @@ void tms9927_device::device_stop() // device_timer - handle timer events //------------------------------------------------- -void tms9927_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tms9927_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/video/tms9927.h b/src/devices/video/tms9927.h index 0acbf5a1874..f407cddb15f 100644 --- a/src/devices/video/tms9927.h +++ b/src/devices/video/tms9927.h @@ -45,7 +45,7 @@ protected: virtual void device_stop() override; virtual void device_reset() override; virtual void device_clock_changed() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual void device_post_load() override; private: diff --git a/src/devices/video/tms9928a.cpp b/src/devices/video/tms9928a.cpp index 13b46c1592a..9ff0bbbfa52 100644 --- a/src/devices/video/tms9928a.cpp +++ b/src/devices/video/tms9928a.cpp @@ -351,7 +351,7 @@ void tms9928a_device::register_write(u8 data) } } -void tms9928a_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tms9928a_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // Handle GROM clock if present if (id==GROMCLK) diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h index cc5a5192f14..addae9e0a20 100644 --- a/src/devices/video/tms9928a.h +++ b/src/devices/video/tms9928a.h @@ -95,7 +95,7 @@ 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/video/upd3301.cpp b/src/devices/video/upd3301.cpp index ed57a55d760..b9cf060228d 100644 --- a/src/devices/video/upd3301.cpp +++ b/src/devices/video/upd3301.cpp @@ -231,7 +231,7 @@ inline void upd3301_device::reset_fifo_vrtc() } } -void upd3301_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void upd3301_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/video/upd3301.h b/src/devices/video/upd3301.h index 7532dc61c5b..bdef980f2bc 100644 --- a/src/devices/video/upd3301.h +++ b/src/devices/video/upd3301.h @@ -89,7 +89,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_clock_changed() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; private: enum diff --git a/src/devices/video/upd7220.cpp b/src/devices/video/upd7220.cpp index 7ae6c1cf7e7..fb4da2002ac 100644 --- a/src/devices/video/upd7220.cpp +++ b/src/devices/video/upd7220.cpp @@ -738,7 +738,7 @@ void upd7220_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void upd7220_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void upd7220_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/video/upd7220.h b/src/devices/video/upd7220.h index 31ac30f4dac..67c370aecb5 100644 --- a/src/devices/video/upd7220.h +++ b/src/devices/video/upd7220.h @@ -85,7 +85,7 @@ protected: // device-level overrides 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual const tiny_rom_entry *device_rom_region() const override; virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/video/v9938.cpp b/src/devices/video/v9938.cpp index e82858056e7..187192b85fb 100644 --- a/src/devices/video/v9938.cpp +++ b/src/devices/video/v9938.cpp @@ -172,7 +172,7 @@ void v99x8_device::device_config_complete() } -void v99x8_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void v99x8_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int scanline = (m_scanline - (m_scanline_start + m_offset_y)); diff --git a/src/devices/video/v9938.h b/src/devices/video/v9938.h index 3d3b06f8771..c559a74ded8 100644 --- a/src/devices/video/v9938.h +++ b/src/devices/video/v9938.h @@ -100,7 +100,7 @@ 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; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual void device_post_load() override; // device_memory_interface overrides diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp index 93ccabb1d90..ebbcfb0c80f 100644 --- a/src/devices/video/voodoo.cpp +++ b/src/devices/video/voodoo.cpp @@ -924,8 +924,8 @@ void voodoo_1_device::device_start() m_stall_trigger = 51324 + index; // allocate timers for VBLANK - m_vsync_stop_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(voodoo_1_device::vblank_stop), this), this); - m_vsync_start_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(voodoo_1_device::vblank_start),this), this); + m_vsync_stop_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(voodoo_1_device::vblank_stop), this)); + m_vsync_start_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(voodoo_1_device::vblank_start),this)); // add TMUs to the chipmask if memory is specified (later chips leave // the tmumem values at 0 and set the chipmask directly to indicate @@ -2542,7 +2542,7 @@ void voodoo_1_device::adjust_vblank_start_timer() // of VBLANK //------------------------------------------------- -void voodoo_1_device::vblank_start(void *ptr, s32 param) +void voodoo_1_device::vblank_start(s32 param) { if (LOG_VBLANK_SWAP) logerror("--- vblank start\n"); @@ -2589,7 +2589,7 @@ void voodoo_1_device::vblank_start(void *ptr, s32 param) // VBLANK //------------------------------------------------- -void voodoo_1_device::vblank_stop(void *ptr, s32 param) +void voodoo_1_device::vblank_stop(s32 param) { if (LOG_VBLANK_SWAP) logerror("--- vblank end\n"); @@ -3180,7 +3180,7 @@ void voodoo_1_device::stall_cpu(stall_state state) // check the stall state for our CPU //------------------------------------------------- -void voodoo_1_device::stall_resume_callback(void *ptr, s32 param) +void voodoo_1_device::stall_resume_callback(s32 param) { check_stalled_cpu(machine().time()); } diff --git a/src/devices/video/voodoo.h b/src/devices/video/voodoo.h index f3642a63700..94a20c0f7af 100644 --- a/src/devices/video/voodoo.h +++ b/src/devices/video/voodoo.h @@ -589,8 +589,8 @@ protected: // VBLANK timing void adjust_vblank_start_timer(); - virtual void vblank_start(void *ptr, s32 param); - virtual void vblank_stop(void *ptr, s32 param); + virtual void vblank_start(s32 param); + virtual void vblank_stop(s32 param); void swap_buffers(); virtual void rotate_buffers(); @@ -614,7 +614,7 @@ protected: void clear_pending_operation() { m_operation_end = attotime::zero; } void check_stalled_cpu(attotime current_time); void stall_cpu(stall_state state); - void stall_resume_callback(void *ptr, s32 param); + void stall_resume_callback(s32 param); // misc helpers u32 chipmask_from_offset(u32 offset) diff --git a/src/devices/video/voodoo_2.cpp b/src/devices/video/voodoo_2.cpp index 6cd34433bff..56fd7cdcc65 100644 --- a/src/devices/video/voodoo_2.cpp +++ b/src/devices/video/voodoo_2.cpp @@ -1149,9 +1149,9 @@ u32 voodoo_2_device::cmdfifo_2d_w(u32 offset, u32 data) // of VBLANK //------------------------------------------------- -void voodoo_2_device::vblank_start(void *ptr, s32 param) +void voodoo_2_device::vblank_start(s32 param) { - voodoo_1_device::vblank_start(ptr, param); + voodoo_1_device::vblank_start(param); // signal PCI VBLANK rising IRQ on Voodoo-2 and later if (m_reg.intr_ctrl().vsync_rising_enable()) @@ -1168,9 +1168,9 @@ void voodoo_2_device::vblank_start(void *ptr, s32 param) // VBLANK //------------------------------------------------- -void voodoo_2_device::vblank_stop(void *ptr, s32 param) +void voodoo_2_device::vblank_stop(s32 param) { - voodoo_1_device::vblank_stop(ptr, param); + voodoo_1_device::vblank_stop(param); // signal PCI VBLANK falling IRQ on Voodoo-2 and later if (m_reg.intr_ctrl().vsync_falling_enable()) diff --git a/src/devices/video/voodoo_2.h b/src/devices/video/voodoo_2.h index 9a6f0c9ef01..a68886b846e 100644 --- a/src/devices/video/voodoo_2.h +++ b/src/devices/video/voodoo_2.h @@ -226,8 +226,8 @@ protected: virtual u32 cmdfifo_2d_w(u32 offset, u32 data); // VBLANK timing - virtual void vblank_start(void *ptr, s32 param) override; - virtual void vblank_stop(void *ptr, s32 param) override; + virtual void vblank_start(s32 param) override; + virtual void vblank_stop(s32 param) override; // video timing and updates virtual void recompute_video_memory() override; diff --git a/src/devices/video/zeus2.cpp b/src/devices/video/zeus2.cpp index 97e42e0edf9..2772c4d1c12 100644 --- a/src/devices/video/zeus2.cpp +++ b/src/devices/video/zeus2.cpp @@ -56,8 +56,8 @@ TIMER_CALLBACK_MEMBER(zeus2_device::display_irq) { m_vblank(ASSERT_LINE); /* set a timer for the next off state */ - //machine().scheduler().timer_set(screen().time_until_pos(0), timer_expired_delegate(FUNC(zeus2_device::display_irq_off), this), 0, this); - machine().scheduler().timer_set(screen().time_until_vblank_end(), timer_expired_delegate(FUNC(zeus2_device::display_irq_off), this), 0, this); + //machine().scheduler().timer_set(screen().time_until_pos(0), timer_expired_delegate(FUNC(zeus2_device::display_irq_off), this)); + machine().scheduler().timer_set(screen().time_until_vblank_end(), timer_expired_delegate(FUNC(zeus2_device::display_irq_off), this)); //machine().scheduler().timer_set(attotime::from_hz(30000000), timer_expired_delegate(FUNC(zeus2_device::display_irq_off), this)); } |