diff options
author | 2022-01-26 08:47:06 -0500 | |
---|---|---|
committer | 2022-01-26 08:56:03 -0500 | |
commit | ca79d71af4bca7c1b8acc1df9e5dbb5b987d1542 (patch) | |
tree | 42994b1dd615273baa3e656b569ccd478270aff3 | |
parent | ba918b59faad5244d87078ab3b955f64fd803c4d (diff) |
Remove void *ptr parameter from emu_timer, timer_device and all related callbacks
1258 files changed, 1814 insertions, 1827 deletions
diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp index 1ef164aff41..7e154ad99f7 100644 --- a/src/devices/bus/a2bus/a2mcms.cpp +++ b/src/devices/bus/a2bus/a2mcms.cpp @@ -207,8 +207,8 @@ void mcms_device::device_start() { m_write_irq.resolve(); m_stream = stream_alloc(0, 2, 31250); - m_timer = timer_alloc(0, nullptr); - m_clrtimer = timer_alloc(1, nullptr); + m_timer = timer_alloc(0); + m_clrtimer = timer_alloc(1); m_enabled = false; memset(m_vols, 0, sizeof(m_vols)); memset(m_table, 0, sizeof(m_table)); @@ -238,7 +238,7 @@ void mcms_device::device_reset() m_enabled = false; } -void mcms_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void mcms_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (tid == 0) { diff --git a/src/devices/bus/a2bus/a2mcms.h b/src/devices/bus/a2bus/a2mcms.h index 487c6ddb7a7..f6244dfbf74 100644 --- a/src/devices/bus/a2bus/a2mcms.h +++ b/src/devices/bus/a2bus/a2mcms.h @@ -40,7 +40,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 sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp index 9a56eeaf19d..7fe1487187e 100644 --- a/src/devices/bus/a2bus/a2pic.cpp +++ b/src/devices/bus/a2bus/a2pic.cpp @@ -49,11 +49,11 @@ private: TIMER_CALLBACK_MEMBER(release_strobe); // synchronised inputs - void set_ack_in(void *ptr, s32 param); - void set_perror_in(void *ptr, s32 param); - void set_select_in(void *ptr, s32 param); - void set_fault_in(void *ptr, s32 param); - void data_write(void *ptr, s32 param); + void set_ack_in(s32 param); + void set_perror_in(s32 param); + void set_select_in(s32 param); + void set_fault_in(s32 param); + void data_write(s32 param); // helpers void reset_mode(); @@ -426,7 +426,7 @@ TIMER_CALLBACK_MEMBER(a2bus_pic_device::release_strobe) // synchronised inputs //---------------------------------------------- -void a2bus_pic_device::set_ack_in(void *ptr, s32 param) +void a2bus_pic_device::set_ack_in(s32 param) { if (u32(param) != m_ack_in) { @@ -441,7 +441,7 @@ void a2bus_pic_device::set_ack_in(void *ptr, s32 param) } -void a2bus_pic_device::set_perror_in(void *ptr, s32 param) +void a2bus_pic_device::set_perror_in(s32 param) { if (u32(param) != m_perror_in) { @@ -451,7 +451,7 @@ void a2bus_pic_device::set_perror_in(void *ptr, s32 param) } -void a2bus_pic_device::set_select_in(void *ptr, s32 param) +void a2bus_pic_device::set_select_in(s32 param) { if (u32(param) != m_select_in) { @@ -461,7 +461,7 @@ void a2bus_pic_device::set_select_in(void *ptr, s32 param) } -void a2bus_pic_device::set_fault_in(void *ptr, s32 param) +void a2bus_pic_device::set_fault_in(s32 param) { if (u32(param) != m_fault_in) { @@ -471,7 +471,7 @@ void a2bus_pic_device::set_fault_in(void *ptr, s32 param) } -void a2bus_pic_device::data_write(void *ptr, s32 param) +void a2bus_pic_device::data_write(s32 param) { // latch output data - remember MSB can be forced low by jumper if (BIT(param, 8)) diff --git a/src/devices/bus/a2bus/a2sd.cpp b/src/devices/bus/a2bus/a2sd.cpp index 3f9bd439bc6..5d1306abab6 100644 --- a/src/devices/bus/a2bus/a2sd.cpp +++ b/src/devices/bus/a2bus/a2sd.cpp @@ -119,7 +119,7 @@ void a2bus_a2sd_device::device_reset() m_sdcard->spi_clock_w(CLEAR_LINE); } -void a2bus_a2sd_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void a2bus_a2sd_device::device_timer(emu_timer &timer, device_timer_id id, int param) { LOGMASKED(LOG_SPI, ">>>>>>> SHIFT %d (%c)\n", m_shift_count, (m_shift_count & 1) ? 'L' : 'S'); if (!(m_shift_count & 1)) diff --git a/src/devices/bus/a2bus/a2sd.h b/src/devices/bus/a2bus/a2sd.h index c4d8b4c8f02..85165248319 100644 --- a/src/devices/bus/a2bus/a2sd.h +++ b/src/devices/bus/a2bus/a2sd.h @@ -36,7 +36,7 @@ protected: virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const 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; // overrides of standard a2bus slot functions virtual u8 read_c0nx(u8 offset) override; diff --git a/src/devices/bus/a2bus/agat840k_hle.cpp b/src/devices/bus/a2bus/agat840k_hle.cpp index 6d8cbc97d0a..76afe57518c 100644 --- a/src/devices/bus/a2bus/agat840k_hle.cpp +++ b/src/devices/bus/a2bus/agat840k_hle.cpp @@ -226,7 +226,7 @@ void a2bus_agat840k_hle_device::device_reset() m_mxcs &= ~MXCSR_TR; } -void a2bus_agat840k_hle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void a2bus_agat840k_hle_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/a2bus/agat840k_hle.h b/src/devices/bus/a2bus/agat840k_hle.h index f5aba6818dc..f51bda3324f 100644 --- a/src/devices/bus/a2bus/agat840k_hle.h +++ b/src/devices/bus/a2bus/agat840k_hle.h @@ -55,7 +55,7 @@ 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 void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/a2bus/agat_fdc.cpp b/src/devices/bus/a2bus/agat_fdc.cpp index 6867b4ef6d5..f6743c35964 100644 --- a/src/devices/bus/a2bus/agat_fdc.cpp +++ b/src/devices/bus/a2bus/agat_fdc.cpp @@ -162,7 +162,7 @@ void a2bus_agat_fdc_device::device_reset() m_timer_lss->adjust(attotime::from_msec(10), 0, attotime::from_msec(10)); } -void a2bus_agat_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void a2bus_agat_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/a2bus/agat_fdc.h b/src/devices/bus/a2bus/agat_fdc.h index b2f0e72adff..e209902c709 100644 --- a/src/devices/bus/a2bus/agat_fdc.h +++ b/src/devices/bus/a2bus/agat_fdc.h @@ -49,7 +49,7 @@ 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 void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp index 0afb2de8aed..5f80726d1bc 100644 --- a/src/devices/bus/a2bus/corvfdc02.cpp +++ b/src/devices/bus/a2bus/corvfdc02.cpp @@ -118,7 +118,7 @@ void a2bus_corvfdc02_device::device_reset() m_timer->adjust(attotime::never); } -void a2bus_corvfdc02_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void a2bus_corvfdc02_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_fdc->tc_w(true); m_fdc->tc_w(false); diff --git a/src/devices/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h index 6f196bda67b..028770450cd 100644 --- a/src/devices/bus/a2bus/corvfdc02.h +++ b/src/devices/bus/a2bus/corvfdc02.h @@ -35,7 +35,7 @@ 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 void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/a2bus/grappler.cpp b/src/devices/bus/a2bus/grappler.cpp index 503fc95fd18..68f49edcf37 100644 --- a/src/devices/bus/a2bus/grappler.cpp +++ b/src/devices/bus/a2bus/grappler.cpp @@ -89,9 +89,9 @@ private: DECLARE_WRITE_LINE_MEMBER(slct_w); // synchronised printer status inputs - void set_busy_in(void *ptr, s32 param); - void set_pe_in(void *ptr, s32 param); - void set_slct_in(void *ptr, s32 param); + void set_busy_in(s32 param); + void set_pe_in(s32 param); + void set_slct_in(s32 param); u16 m_rom_bank; // U2D (pin 13) u8 m_busy_in; // printer connector pin 21 (synchronised) @@ -192,7 +192,7 @@ WRITE_LINE_MEMBER(a2bus_grappler_device_base::slct_w) // synchronised printer status inputs //-------------------------------------------------- -void a2bus_grappler_device_base::set_busy_in(void *ptr, s32 param) +void a2bus_grappler_device_base::set_busy_in(s32 param) { if (u32(param) != m_busy_in) { @@ -202,7 +202,7 @@ void a2bus_grappler_device_base::set_busy_in(void *ptr, s32 param) } -void a2bus_grappler_device_base::set_pe_in(void *ptr, s32 param) +void a2bus_grappler_device_base::set_pe_in(s32 param) { if (u32(param) != m_pe_in) { @@ -212,7 +212,7 @@ void a2bus_grappler_device_base::set_pe_in(void *ptr, s32 param) } -void a2bus_grappler_device_base::set_slct_in(void *ptr, s32 param) +void a2bus_grappler_device_base::set_slct_in(s32 param) { if (u32(param) != m_slct_in) { @@ -250,9 +250,9 @@ private: DECLARE_WRITE_LINE_MEMBER(ack_w); // synchronised signals - void set_data(void *ptr, s32 param); - void set_strobe(void *ptr, s32 param); - void set_ack_in(void *ptr, s32 param); + void set_data(s32 param); + void set_strobe(s32 param); + void set_ack_in(s32 param); u8 m_strobe; // U3 (pin 4) u8 m_ack_latch; // U3 (pin 13) @@ -373,14 +373,14 @@ WRITE_LINE_MEMBER(a2bus_grappler_device::ack_w) // synchronised signals //-------------------------------------------------- -void a2bus_grappler_device::set_data(void *ptr, s32 param) +void a2bus_grappler_device::set_data(s32 param) { LOG("Output data %02X\n", u8(u32(param))); m_printer_out->write(u8(u32(param))); } -void a2bus_grappler_device::set_strobe(void *ptr, s32 param) +void a2bus_grappler_device::set_strobe(s32 param) { LOG("Output /STROBE=%d\n", param); m_printer_conn->write_strobe(param); @@ -403,7 +403,7 @@ void a2bus_grappler_device::set_strobe(void *ptr, s32 param) } -void a2bus_grappler_device::set_ack_in(void *ptr, s32 param) +void a2bus_grappler_device::set_ack_in(s32 param) { if (u32(param) != m_ack_in) { @@ -460,7 +460,7 @@ protected: private: // synchronised printer status inputs - void set_ack_in(void *ptr, s32 param); + void set_ack_in(s32 param); // for derived devices to implement virtual void data_latched(u8 data) = 0; @@ -592,7 +592,7 @@ WRITE_LINE_MEMBER(a2bus_grapplerplus_device_base::ack_w) // synchronised printer status inputs //-------------------------------------------------- -void a2bus_grapplerplus_device_base::set_ack_in(void *ptr, s32 param) +void a2bus_grapplerplus_device_base::set_ack_in(s32 param) { if (u32(param) != m_ack_in) { @@ -877,9 +877,9 @@ private: void mcu_bus_w(u8 data); // synchronised signals - void set_buf_data(void *ptr, s32 param); - void set_buf_ack_in(void *ptr, s32 param); - void clear_ibusy(void *ptr, s32 param); + void set_buf_data(s32 param); + void set_buf_ack_in(s32 param); + void clear_ibusy(s32 param); required_device<mcs48_cpu_device> m_mcu; std::unique_ptr<u8 []> m_ram; @@ -1177,13 +1177,13 @@ void a2bus_buf_grapplerplus_device::mcu_bus_w(u8 data) // synchronised signals //-------------------------------------------------- -void a2bus_buf_grapplerplus_device::set_buf_data(void *ptr, s32 param) +void a2bus_buf_grapplerplus_device::set_buf_data(s32 param) { m_data_latch = u8(u32(param)); } -void a2bus_buf_grapplerplus_device::set_buf_ack_in(void *ptr, s32 param) +void a2bus_buf_grapplerplus_device::set_buf_ack_in(s32 param) { if (u32(param) != m_buf_ack_in) { @@ -1201,7 +1201,7 @@ void a2bus_buf_grapplerplus_device::set_buf_ack_in(void *ptr, s32 param) } -void a2bus_buf_grapplerplus_device::clear_ibusy(void *ptr, s32 param) +void a2bus_buf_grapplerplus_device::clear_ibusy(s32 param) { if (m_ibusy) { diff --git a/src/devices/bus/a2bus/transwarp.cpp b/src/devices/bus/a2bus/transwarp.cpp index 3c2c976c229..719fe7993df 100644 --- a/src/devices/bus/a2bus/transwarp.cpp +++ b/src/devices/bus/a2bus/transwarp.cpp @@ -187,7 +187,7 @@ void a2bus_transwarp_device::device_reset() } } -void a2bus_transwarp_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void a2bus_transwarp_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (m_bIn1MHzMode) { diff --git a/src/devices/bus/a2bus/transwarp.h b/src/devices/bus/a2bus/transwarp.h index 998a1807fcd..1401f61776b 100644 --- a/src/devices/bus/a2bus/transwarp.h +++ b/src/devices/bus/a2bus/transwarp.h @@ -33,7 +33,7 @@ protected: virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const 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; // overrides of standard a2bus slot functions diff --git a/src/devices/bus/a800/cassette.cpp b/src/devices/bus/a800/cassette.cpp index 6a409611bbb..6e2c0073691 100644 --- a/src/devices/bus/a800/cassette.cpp +++ b/src/devices/bus/a800/cassette.cpp @@ -82,7 +82,7 @@ WRITE_LINE_MEMBER( a8sio_cassette_device::motor_w ) } } -void a8sio_cassette_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void a8sio_cassette_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/a800/cassette.h b/src/devices/bus/a800/cassette.h index 17c45a9880b..ed75b00bdc8 100644 --- a/src/devices/bus/a800/cassette.h +++ b/src/devices/bus/a800/cassette.h @@ -36,7 +36,7 @@ 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 void device_add_mconfig(machine_config &config) override; required_device<cassette_image_device> m_cassette; diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp index 5d0760a58c3..0175916e700 100644 --- a/src/devices/bus/abckb/abc77.cpp +++ b/src/devices/bus/abckb/abc77.cpp @@ -472,7 +472,7 @@ void abc77_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void abc77_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void abc77_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h index 1d79f374f90..ccfb1b8effd 100644 --- a/src/devices/bus/abckb/abc77.h +++ b/src/devices/bus/abckb/abc77.h @@ -40,7 +40,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/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp index c69515eafbd..21c30b245ab 100644 --- a/src/devices/bus/abckb/abc800kb.cpp +++ b/src/devices/bus/abckb/abc800kb.cpp @@ -362,7 +362,7 @@ void abc800_keyboard_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void abc800_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void abc800_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param) { serial_clock(); } diff --git a/src/devices/bus/abckb/abc800kb.h b/src/devices/bus/abckb/abc800kb.h index f076beeb102..acbd19ef299 100644 --- a/src/devices/bus/abckb/abc800kb.h +++ b/src/devices/bus/abckb/abc800kb.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; // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp index 461bbaa0ffd..3c05f749227 100644 --- a/src/devices/bus/abckb/abc99.cpp +++ b/src/devices/bus/abckb/abc99.cpp @@ -539,7 +539,7 @@ void abc99_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void abc99_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void abc99_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/abckb/abc99.h b/src/devices/bus/abckb/abc99.h index 8adb348d6c5..7f7fbbfbd73 100644 --- a/src/devices/bus/abckb/abc99.h +++ b/src/devices/bus/abckb/abc99.h @@ -37,7 +37,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/bus/astrocde/lightpen.cpp b/src/devices/bus/astrocde/lightpen.cpp index 07c5c7480ee..407f2a9e852 100644 --- a/src/devices/bus/astrocde/lightpen.cpp +++ b/src/devices/bus/astrocde/lightpen.cpp @@ -42,7 +42,7 @@ void astrocade_lightpen_device::device_reset() m_retrigger = false; } -void astrocade_lightpen_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void astrocade_lightpen_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_TRIGGER) { diff --git a/src/devices/bus/astrocde/lightpen.h b/src/devices/bus/astrocde/lightpen.h index a0863d5d3e8..136ea918a81 100644 --- a/src/devices/bus/astrocde/lightpen.h +++ b/src/devices/bus/astrocde/lightpen.h @@ -29,7 +29,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual ioport_constructor device_input_ports() const 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; static const device_timer_id TIMER_TRIGGER = 0; diff --git a/src/devices/bus/ata/atahle.cpp b/src/devices/bus/ata/atahle.cpp index de38c9dd71e..8cf3a3b110a 100644 --- a/src/devices/bus/ata/atahle.cpp +++ b/src/devices/bus/ata/atahle.cpp @@ -150,7 +150,7 @@ void ata_hle_device::soft_reset() start_busy(DIAGNOSTIC_TIME, PARAM_DIAGNOSTIC); } -void ata_hle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ata_hle_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/bus/ata/atahle.h b/src/devices/bus/ata/atahle.h index 176d45e8e2b..2c5f2ba803c 100644 --- a/src/devices/bus/ata/atahle.h +++ b/src/devices/bus/ata/atahle.h @@ -35,7 +35,7 @@ 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; void set_irq(int state); void set_dmarq(int state); diff --git a/src/devices/bus/bbc/1mhzbus/m5000.cpp b/src/devices/bus/bbc/1mhzbus/m5000.cpp index 1844de74a0d..2e3a525622d 100644 --- a/src/devices/bus/bbc/1mhzbus/m5000.cpp +++ b/src/devices/bus/bbc/1mhzbus/m5000.cpp @@ -303,7 +303,7 @@ void htmusic_device::device_reset() #define INVERT(c) (BIT(CTL(c), 4)) #define PAN(c) (CTL(c) & 0x0f) -void htmusic_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void htmusic_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // 4-bit channel select uint8_t channel = (m_counter >> 3) & 0x0f; diff --git a/src/devices/bus/bbc/1mhzbus/m5000.h b/src/devices/bus/bbc/1mhzbus/m5000.h index d2507ab4abe..f49f2804187 100644 --- a/src/devices/bus/bbc/1mhzbus/m5000.h +++ b/src/devices/bus/bbc/1mhzbus/m5000.h @@ -41,7 +41,7 @@ public: void ram_w(offs_t offset, uint8_t data) { m_wave_ram[offset & 0x7ff] = data; } - 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; protected: // device-level overrides diff --git a/src/devices/bus/c64/c128_partner.cpp b/src/devices/bus/c64/c128_partner.cpp index 808926d8583..c17bf49f792 100644 --- a/src/devices/bus/c64/c128_partner.cpp +++ b/src/devices/bus/c64/c128_partner.cpp @@ -130,7 +130,7 @@ void c128_partner_cartridge_device::device_reset() // device_timer - //------------------------------------------------- -void c128_partner_cartridge_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void c128_partner_cartridge_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (m_ls74_cd) { diff --git a/src/devices/bus/c64/c128_partner.h b/src/devices/bus/c64/c128_partner.h index da906531122..6f45b32a64f 100644 --- a/src/devices/bus/c64/c128_partner.h +++ b/src/devices/bus/c64/c128_partner.h @@ -39,7 +39,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_c64_expansion_card_interface overrides virtual uint8_t c64_cd_r(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; diff --git a/src/devices/bus/c64/epyx_fast_load.cpp b/src/devices/bus/c64/epyx_fast_load.cpp index 4dced91c76a..7f398bf1963 100644 --- a/src/devices/bus/c64/epyx_fast_load.cpp +++ b/src/devices/bus/c64/epyx_fast_load.cpp @@ -70,7 +70,7 @@ void c64_epyx_fast_load_cartridge_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void c64_epyx_fast_load_cartridge_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void c64_epyx_fast_load_cartridge_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_exrom = 1; } diff --git a/src/devices/bus/c64/epyx_fast_load.h b/src/devices/bus/c64/epyx_fast_load.h index 64d23f6febb..1e825b89397 100644 --- a/src/devices/bus/c64/epyx_fast_load.h +++ b/src/devices/bus/c64/epyx_fast_load.h @@ -33,7 +33,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_c64_expansion_card_interface overrides virtual uint8_t c64_cd_r(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; diff --git a/src/devices/bus/c64/super_explode.cpp b/src/devices/bus/c64/super_explode.cpp index 4ed2456bd2a..8867845fa52 100644 --- a/src/devices/bus/c64/super_explode.cpp +++ b/src/devices/bus/c64/super_explode.cpp @@ -75,7 +75,7 @@ void c64_super_explode_cartridge_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void c64_super_explode_cartridge_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void c64_super_explode_cartridge_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_exrom = 1; } diff --git a/src/devices/bus/c64/super_explode.h b/src/devices/bus/c64/super_explode.h index ca3abdeebf5..a90a7a697ca 100644 --- a/src/devices/bus/c64/super_explode.h +++ b/src/devices/bus/c64/super_explode.h @@ -33,7 +33,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_c64_expansion_card_interface overrides virtual uint8_t c64_cd_r(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; diff --git a/src/devices/bus/c64/vw64.cpp b/src/devices/bus/c64/vw64.cpp index bf4d584d40d..266eb3c2017 100644 --- a/src/devices/bus/c64/vw64.cpp +++ b/src/devices/bus/c64/vw64.cpp @@ -101,7 +101,7 @@ void c64_vizawrite_cartridge_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void c64_vizawrite_cartridge_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void c64_vizawrite_cartridge_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_game = 1; } diff --git a/src/devices/bus/c64/vw64.h b/src/devices/bus/c64/vw64.h index 64287c0c785..805d40a975c 100644 --- a/src/devices/bus/c64/vw64.h +++ b/src/devices/bus/c64/vw64.h @@ -33,7 +33,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_c64_expansion_card_interface overrides virtual uint8_t c64_cd_r(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; diff --git a/src/devices/bus/cbus/pc9801_86.cpp b/src/devices/bus/cbus/pc9801_86.cpp index 6fcc789e27e..ab53d87cce2 100644 --- a/src/devices/bus/cbus/pc9801_86.cpp +++ b/src/devices/bus/cbus/pc9801_86.cpp @@ -382,7 +382,7 @@ u8 pc9801_86_device::queue_pop() return ret; } -void pc9801_86_device::device_timer(emu_timer& timer, device_timer_id id, int param, void* ptr) +void pc9801_86_device::device_timer(emu_timer& timer, device_timer_id id, int param) { int16_t lsample, rsample; diff --git a/src/devices/bus/cbus/pc9801_86.h b/src/devices/bus/cbus/pc9801_86.h index 5dda6681f6b..858a1193c75 100644 --- a/src/devices/bus/cbus/pc9801_86.h +++ b/src/devices/bus/cbus/pc9801_86.h @@ -41,7 +41,7 @@ protected: void opna_reset_routes_config(machine_config &config); virtual ioport_constructor device_input_ports() const override; virtual const tiny_rom_entry *device_rom_region() const 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 pc9801_86_config(machine_config &config); virtual u16 read_io_base() override; diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp index 2b75d83fece..a1b0891dbe0 100644 --- a/src/devices/bus/centronics/epson_lx810l.cpp +++ b/src/devices/bus/centronics/epson_lx810l.cpp @@ -347,7 +347,7 @@ void epson_lx810l_device::device_reset() // device_timer - device-specific timer //------------------------------------------------- -void epson_lx810l_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void epson_lx810l_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_CR: diff --git a/src/devices/bus/centronics/epson_lx810l.h b/src/devices/bus/centronics/epson_lx810l.h index 1ad845f0128..82ec40cc1c2 100644 --- a/src/devices/bus/centronics/epson_lx810l.h +++ b/src/devices/bus/centronics/epson_lx810l.h @@ -57,7 +57,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/bus/centronics/printer.cpp b/src/devices/bus/centronics/printer.cpp index 484e718d074..c954c85c95c 100644 --- a/src/devices/bus/centronics/printer.cpp +++ b/src/devices/bus/centronics/printer.cpp @@ -48,7 +48,7 @@ WRITE_LINE_MEMBER(centronics_printer_device::printer_online) output_perror(!state); } -void centronics_printer_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void centronics_printer_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/centronics/printer.h b/src/devices/bus/centronics/printer.h index eccfcb99d62..7d2e1623ae9 100644 --- a/src/devices/bus/centronics/printer.h +++ b/src/devices/bus/centronics/printer.h @@ -33,7 +33,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 bool supports_pin35_5v() override { return true; } private: diff --git a/src/devices/bus/coco/cococart.cpp b/src/devices/bus/coco/cococart.cpp index fb3937f6a16..d698d0dd87f 100644 --- a/src/devices/bus/coco/cococart.cpp +++ b/src/devices/bus/coco/cococart.cpp @@ -206,7 +206,7 @@ void cococart_slot_device::device_start() // device_timer - handle timer callbacks //------------------------------------------------- -void cococart_slot_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cococart_slot_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/bus/coco/cococart.h b/src/devices/bus/coco/cococart.h index e2b8529ab00..1918ba05c40 100644 --- a/src/devices/bus/coco/cococart.h +++ b/src/devices/bus/coco/cococart.h @@ -69,7 +69,7 @@ public: // 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; // image-level overrides virtual image_init_result call_load() override; diff --git a/src/devices/bus/compucolor/floppy.cpp b/src/devices/bus/compucolor/floppy.cpp index 166cc2d5bbb..99a89e4f543 100644 --- a/src/devices/bus/compucolor/floppy.cpp +++ b/src/devices/bus/compucolor/floppy.cpp @@ -141,7 +141,7 @@ void compucolor_floppy_device::device_start() // device_timer - handle timer events //------------------------------------------------- -void compucolor_floppy_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void compucolor_floppy_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (!m_sel && !m_rw) { diff --git a/src/devices/bus/compucolor/floppy.h b/src/devices/bus/compucolor/floppy.h index d2efe54ef80..8342a3668ed 100644 --- a/src/devices/bus/compucolor/floppy.h +++ b/src/devices/bus/compucolor/floppy.h @@ -75,7 +75,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; // optional information overrides virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp index 3ab9209d877..169ce2ed5f6 100644 --- a/src/devices/bus/dmv/k210.cpp +++ b/src/devices/bus/dmv/k210.cpp @@ -46,7 +46,7 @@ dmv_k210_device::dmv_k210_device(const machine_config &mconfig, const char *tag, void dmv_k210_device::device_start() { - m_clk1_timer = timer_alloc(0, nullptr); + m_clk1_timer = timer_alloc(0); // register for state saving save_item(NAME(m_portb)); @@ -68,7 +68,7 @@ void dmv_k210_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void dmv_k210_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void dmv_k210_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { m_centronics->write_strobe(CLEAR_LINE); } diff --git a/src/devices/bus/dmv/k210.h b/src/devices/bus/dmv/k210.h index 1755ee1a9f5..ea29bf31f08 100644 --- a/src/devices/bus/dmv/k210.h +++ b/src/devices/bus/dmv/k210.h @@ -28,7 +28,7 @@ protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; - void device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id tid, int param) override; // optional information overrides virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp index d5b53c31440..3b6d137ebf1 100644 --- a/src/devices/bus/econet/e01.cpp +++ b/src/devices/bus/econet/e01.cpp @@ -454,7 +454,7 @@ void econet_e01_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void econet_e01_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void econet_e01_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (m_clk_en) { diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h index efb4b548177..acffa76d13c 100644 --- a/src/devices/bus/econet/e01.h +++ b/src/devices/bus/econet/e01.h @@ -44,7 +44,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/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp index 418971e47d1..e77edae7b77 100644 --- a/src/devices/bus/epson_sio/pf10.cpp +++ b/src/devices/bus/epson_sio/pf10.cpp @@ -109,7 +109,7 @@ epson_pf10_device::epson_pf10_device(const machine_config &mconfig, const char * void epson_pf10_device::device_start() { - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); } //------------------------------------------------- @@ -125,7 +125,7 @@ void epson_pf10_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void epson_pf10_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void epson_pf10_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/epson_sio/pf10.h b/src/devices/bus/epson_sio/pf10.h index e85c033099f..266705ae924 100644 --- a/src/devices/bus/epson_sio/pf10.h +++ b/src/devices/bus/epson_sio/pf10.h @@ -34,7 +34,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/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp index 955763555ff..cd16fe2f9b1 100644 --- a/src/devices/bus/epson_sio/tf20.cpp +++ b/src/devices/bus/epson_sio/tf20.cpp @@ -149,8 +149,8 @@ void epson_tf20_device::device_start() if (!m_ram->started()) throw device_missing_dependencies(); - m_timer_serial = timer_alloc(0, nullptr); - m_timer_tc = timer_alloc(1, nullptr); + m_timer_serial = timer_alloc(0); + m_timer_tc = timer_alloc(1); // enable second half of ram m_cpu->space(AS_PROGRAM).install_ram(0x8000, 0xffff, m_ram->pointer() + 0x8000); @@ -178,7 +178,7 @@ void epson_tf20_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void epson_tf20_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void epson_tf20_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/epson_sio/tf20.h b/src/devices/bus/epson_sio/tf20.h index 6ce05bb2156..98602ec2562 100644 --- a/src/devices/bus/epson_sio/tf20.h +++ b/src/devices/bus/epson_sio/tf20.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; // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/gio64/newport.cpp b/src/devices/bus/gio64/newport.cpp index e017708a2c2..c5a071eb786 100644 --- a/src/devices/bus/gio64/newport.cpp +++ b/src/devices/bus/gio64/newport.cpp @@ -1282,7 +1282,7 @@ void newport_base_device::stop_logging() } #endif -void newport_base_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void newport_base_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == DCB_TIMEOUT) { diff --git a/src/devices/bus/gio64/newport.h b/src/devices/bus/gio64/newport.h index cd894510e05..3dd1a27ba40 100644 --- a/src/devices/bus/gio64/newport.h +++ b/src/devices/bus/gio64/newport.h @@ -311,7 +311,7 @@ public: protected: // device_t overrides - 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 void device_start() override; virtual void device_reset() override; diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp index c4516bdbc37..ff092246ab6 100644 --- a/src/devices/bus/hp9845_io/98035.cpp +++ b/src/devices/bus/hp9845_io/98035.cpp @@ -207,7 +207,7 @@ void hp98035_io_card_device::device_reset() half_init(); } -void hp98035_io_card_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hp98035_io_card_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == MSEC_TMR_ID) { // On real hw there's a full 4-bit decimal counter, but only the LSB is used to diff --git a/src/devices/bus/hp9845_io/98035.h b/src/devices/bus/hp9845_io/98035.h index 0d057f6ef53..48091cf24e3 100644 --- a/src/devices/bus/hp9845_io/98035.h +++ b/src/devices/bus/hp9845_io/98035.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; // device-level overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/hp9845_io/hp9885.cpp b/src/devices/bus/hp9845_io/hp9885.cpp index ed782054504..40692291cbe 100644 --- a/src/devices/bus/hp9845_io/hp9885.cpp +++ b/src/devices/bus/hp9845_io/hp9885.cpp @@ -359,7 +359,7 @@ void hp9885_device::device_reset() set_state(FSM_IDLE); } -void hp9885_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hp9885_device::device_timer(emu_timer &timer, device_timer_id id, int param) { LOG_TIMER("Tmr %.06f ID %d FSM %d HD %d\n" , machine().time().as_double() , id , m_fsm_state , m_head_state); diff --git a/src/devices/bus/hp9845_io/hp9885.h b/src/devices/bus/hp9845_io/hp9885.h index be3c56d3128..a782df5d7df 100644 --- a/src/devices/bus/hp9845_io/hp9885.h +++ b/src/devices/bus/hp9845_io/hp9885.h @@ -38,7 +38,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; private: // FSM states diff --git a/src/devices/bus/ieee488/c2040fdc.cpp b/src/devices/bus/ieee488/c2040fdc.cpp index b2b292b65fd..5998bb43435 100644 --- a/src/devices/bus/ieee488/c2040fdc.cpp +++ b/src/devices/bus/ieee488/c2040fdc.cpp @@ -152,7 +152,7 @@ void c2040_fdc_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void c2040_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void c2040_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { live_sync(); live_run(); diff --git a/src/devices/bus/ieee488/c2040fdc.h b/src/devices/bus/ieee488/c2040fdc.h index b2b78452b84..f7b045cc0b3 100644 --- a/src/devices/bus/ieee488/c2040fdc.h +++ b/src/devices/bus/ieee488/c2040fdc.h @@ -59,7 +59,7 @@ protected: virtual void device_start() override; virtual void device_clock_changed() 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/bus/ieee488/c8050fdc.cpp b/src/devices/bus/ieee488/c8050fdc.cpp index 3d365ab2304..f08e434ea20 100644 --- a/src/devices/bus/ieee488/c8050fdc.cpp +++ b/src/devices/bus/ieee488/c8050fdc.cpp @@ -144,7 +144,7 @@ void c8050_fdc_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void c8050_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void c8050_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { live_sync(); live_run(); diff --git a/src/devices/bus/ieee488/c8050fdc.h b/src/devices/bus/ieee488/c8050fdc.h index 601f9c98ea6..b4c8b96c52e 100644 --- a/src/devices/bus/ieee488/c8050fdc.h +++ b/src/devices/bus/ieee488/c8050fdc.h @@ -60,7 +60,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/bus/ieee488/grid2102.cpp b/src/devices/bus/ieee488/grid2102.cpp index 37301a2d774..9ef4fac6abf 100644 --- a/src/devices/bus/ieee488/grid2102.cpp +++ b/src/devices/bus/ieee488/grid2102.cpp @@ -89,7 +89,7 @@ void grid210x_device::device_start() { m_delay_timer = timer_alloc(0); } -void grid210x_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { +void grid210x_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (m_floppy_loop_state == GRID210X_STATE_READING_DATA) { std::unique_ptr<uint8_t[]> data(new uint8_t[io_size]); fseek(floppy_sector_number * 512, SEEK_SET); diff --git a/src/devices/bus/ieee488/grid2102.h b/src/devices/bus/ieee488/grid2102.h index b41dc8b4b0c..8bc475d6f84 100644 --- a/src/devices/bus/ieee488/grid2102.h +++ b/src/devices/bus/ieee488/grid2102.h @@ -33,7 +33,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; // device_ieee488_interface overrides virtual void ieee488_eoi(int state) override; diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp index ee23db8c6cb..b133c7fbf3e 100644 --- a/src/devices/bus/ieee488/hp9895.cpp +++ b/src/devices/bus/ieee488/hp9895.cpp @@ -236,7 +236,7 @@ void hp9895_device::device_reset() m_half_bit_timer->reset(); } -void hp9895_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hp9895_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMEOUT_TMR_ID: diff --git a/src/devices/bus/ieee488/hp9895.h b/src/devices/bus/ieee488/hp9895.h index 53858207609..69d939940d2 100644 --- a/src/devices/bus/ieee488/hp9895.h +++ b/src/devices/bus/ieee488/hp9895.h @@ -29,7 +29,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; // device-level overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/ieee488/remote488.cpp b/src/devices/bus/ieee488/remote488.cpp index e40e55765f0..4feaf3c0647 100644 --- a/src/devices/bus/ieee488/remote488.cpp +++ b/src/devices/bus/ieee488/remote488.cpp @@ -403,7 +403,7 @@ void remote488_device::process_input_msgs() } } -void remote488_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void remote488_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TMR_ID_POLL: diff --git a/src/devices/bus/ieee488/remote488.h b/src/devices/bus/ieee488/remote488.h index 312fc260f42..9832c7d1d76 100644 --- a/src/devices/bus/ieee488/remote488.h +++ b/src/devices/bus/ieee488/remote488.h @@ -42,7 +42,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) 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: // Position of signals in "S/R" msgs diff --git a/src/devices/bus/interpro/keyboard/hle.cpp b/src/devices/bus/interpro/keyboard/hle.cpp index 89217cc10ad..66be76a22ec 100644 --- a/src/devices/bus/interpro/keyboard/hle.cpp +++ b/src/devices/bus/interpro/keyboard/hle.cpp @@ -316,7 +316,7 @@ void hle_device_base::device_reset() start_processing(attotime::from_hz(1'200)); } -void hle_device_base::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hle_device_base::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/interpro/keyboard/hle.h b/src/devices/bus/interpro/keyboard/hle.h index 1f4e2066829..5cacaf80d86 100644 --- a/src/devices/bus/interpro/keyboard/hle.h +++ b/src/devices/bus/interpro/keyboard/hle.h @@ -31,7 +31,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; // device_buffered_serial_interface overrides virtual void tra_callback() override; diff --git a/src/devices/bus/iq151/staper.cpp b/src/devices/bus/iq151/staper.cpp index f11b431f343..1381bc63d24 100644 --- a/src/devices/bus/iq151/staper.cpp +++ b/src/devices/bus/iq151/staper.cpp @@ -74,7 +74,7 @@ void iq151_staper_device::device_add_mconfig(machine_config &config) // device_timer - handler timer events //------------------------------------------------- -void iq151_staper_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void iq151_staper_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_PRINTER) m_ppi->pc2_w(0); diff --git a/src/devices/bus/iq151/staper.h b/src/devices/bus/iq151/staper.h index d9b078061b8..83095ee2d48 100644 --- a/src/devices/bus/iq151/staper.h +++ b/src/devices/bus/iq151/staper.h @@ -26,7 +26,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; // optional information overrides virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp index 8fe8c9f71c5..b1af6dc12c6 100644 --- a/src/devices/bus/isa/gus.cpp +++ b/src/devices/bus/isa/gus.cpp @@ -207,7 +207,7 @@ void gf1_device::update_volume_ramps() } } -void gf1_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void gf1_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/bus/isa/gus.h b/src/devices/bus/isa/gus.h index be8dbbdbe2d..3e555dfa125 100644 --- a/src/devices/bus/isa/gus.h +++ b/src/devices/bus/isa/gus.h @@ -122,7 +122,7 @@ public: void eop_w(int state); // optional information overrides - 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 sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; protected: diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp index 3a890ebd93c..5f8cb8bcca0 100644 --- a/src/devices/bus/isa/hdc.cpp +++ b/src/devices/bus/isa/hdc.cpp @@ -686,7 +686,7 @@ void xt_hdc_device::command() } } -void xt_hdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void xt_hdc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { command(); } diff --git a/src/devices/bus/isa/hdc.h b/src/devices/bus/isa/hdc.h index 9df114bdcf6..64d02ee033d 100644 --- a/src/devices/bus/isa/hdc.h +++ b/src/devices/bus/isa/hdc.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; hard_disk_file *pc_hdc_file(int id); void pc_hdc_result(int set_error_info); int no_dma(void); diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp index bf3d2233bd2..a90df0ea019 100644 --- a/src/devices/bus/isa/omti8621.cpp +++ b/src/devices/bus/isa/omti8621.cpp @@ -289,7 +289,7 @@ void omti8621_device::device_start() sector_buffer.resize(OMTI_DISK_SECTOR_SIZE*OMTI_MAX_BLOCK_COUNT); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); our_disks[0] = subdevice<omti_disk_image_device>(OMTI_DISK0_TAG); our_disks[1] = subdevice<omti_disk_image_device>(OMTI_DISK1_TAG); @@ -410,7 +410,7 @@ void omti8621_device::set_interrupt(enum line_state line_state) m_isa->irq14_w(line_state); } -void omti8621_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void omti8621_device::device_timer(emu_timer &timer, device_timer_id id, int param) { set_interrupt(ASSERT_LINE); } diff --git a/src/devices/bus/isa/omti8621.h b/src/devices/bus/isa/omti8621.h index 6aabeb85780..ccc4ae0785b 100644 --- a/src/devices/bus/isa/omti8621.h +++ b/src/devices/bus/isa/omti8621.h @@ -50,7 +50,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual const tiny_rom_entry *device_rom_region() const 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 ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp index 125e848bc81..070bf320a42 100644 --- a/src/devices/bus/isa/s3virge.cpp +++ b/src/devices/bus/isa/s3virge.cpp @@ -1427,7 +1427,7 @@ void s3virge_vga_device::bitblt_monosrc_step() s3virge.s3d.bitblt_step_count++; } -void s3virge_vga_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void s3virge_vga_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // TODO: S3D state timing if(id == TIMER_DRAW_STEP) diff --git a/src/devices/bus/isa/s3virge.h b/src/devices/bus/isa/s3virge.h index 1070850ddc3..89023e3bafc 100644 --- a/src/devices/bus/isa/s3virge.h +++ b/src/devices/bus/isa/s3virge.h @@ -184,7 +184,7 @@ protected: } s3d; } s3virge; - 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 write_pixel32(uint32_t base, uint16_t x, uint16_t y, uint32_t val) { if(s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x00000002) diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp index 5bfacf2c196..25fbd3a51a5 100644 --- a/src/devices/bus/isa/sb16.cpp +++ b/src/devices/bus/isa/sb16.cpp @@ -742,7 +742,7 @@ void sb16_lle_device::device_reset() m_dma8_done = m_dma16_done = false; } -void sb16_lle_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void sb16_lle_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { uint16_t dacl = 0, dacr = 0, adcl = 0, adcr = 0; if(m_mode & 2) diff --git a/src/devices/bus/isa/sb16.h b/src/devices/bus/isa/sb16.h index 1ec0c722ca5..5e7325a2e1b 100644 --- a/src/devices/bus/isa/sb16.h +++ b/src/devices/bus/isa/sb16.h @@ -27,7 +27,7 @@ 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; // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp index 4e86448256a..53eadc6aa99 100644 --- a/src/devices/bus/isa/sblaster.cpp +++ b/src/devices/bus/isa/sblaster.cpp @@ -1341,7 +1341,7 @@ void isa16_sblaster16_device::device_start() void sb_device::device_start() { - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); save_item(NAME(m_dack_out)); save_item(NAME(m_onebyte_midi)); @@ -1559,7 +1559,7 @@ void sb_device::dack_w(int line, uint8_t data) } } -void sb_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void sb_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (tid) return; diff --git a/src/devices/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h index 1c216f0a859..7d5d5775f91 100644 --- a/src/devices/bus/isa/sblaster.h +++ b/src/devices/bus/isa/sblaster.h @@ -112,7 +112,7 @@ protected: virtual void device_reset() override; uint8_t dack_r(int line); void dack_w(int line, uint8_t data); - 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 drq16_w(int state) { } virtual void drq_w(int state) { } virtual void irq_w(int state, int source) { } diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp index 96a2914325e..77e3497c7f8 100644 --- a/src/devices/bus/isa/sc499.cpp +++ b/src/devices/bus/isa/sc499.cpp @@ -334,8 +334,8 @@ void sc499_device::device_start() LOG1(("start sc499")); - m_timer = timer_alloc(0, nullptr); - m_timer1 = timer_alloc(1, nullptr); + m_timer = timer_alloc(0); + m_timer1 = timer_alloc(1); m_installed = false; @@ -489,7 +489,7 @@ void sc499_device::check_tape() timer_func - handle timer interrupts -------------------------------------------------*/ -void sc499_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sc499_device::device_timer(emu_timer &timer, device_timer_id id, int param) { LOG2(("timer_func param=%d status=%x", param, m_status)); diff --git a/src/devices/bus/isa/sc499.h b/src/devices/bus/isa/sc499.h index 4cc0cbf7bf9..5d51d8cb7dd 100644 --- a/src/devices/bus/isa/sc499.h +++ b/src/devices/bus/isa/sc499.h @@ -66,7 +66,7 @@ private: // 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_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp index 5eeb17b0eeb..1380055572d 100644 --- a/src/devices/bus/isa/stereo_fx.cpp +++ b/src/devices/bus/isa/stereo_fx.cpp @@ -232,7 +232,7 @@ void stereo_fx_device::device_reset() m_t0 = CLEAR_LINE; } -void stereo_fx_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void stereo_fx_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { m_t0 = !m_t0; m_cpu->set_input_line(MCS51_T0_LINE, m_t0); diff --git a/src/devices/bus/isa/stereo_fx.h b/src/devices/bus/isa/stereo_fx.h index f61eedd4dd1..bd98ea82c85 100644 --- a/src/devices/bus/isa/stereo_fx.h +++ b/src/devices/bus/isa/stereo_fx.h @@ -28,7 +28,7 @@ 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; // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp index 183130b78c6..a2018c5867a 100644 --- a/src/devices/bus/kc/d004.cpp +++ b/src/devices/bus/kc/d004.cpp @@ -188,7 +188,7 @@ const tiny_rom_entry *kc_d004_device::device_rom_region() const // device_timer - handler timer events //------------------------------------------------- -void kc_d004_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void kc_d004_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/bus/kc/d004.h b/src/devices/bus/kc/d004.h index 83829250e99..3e47cfaf4d9 100644 --- a/src/devices/bus/kc/d004.h +++ b/src/devices/bus/kc/d004.h @@ -34,7 +34,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/macpds/pds_tpdfpd.cpp b/src/devices/bus/macpds/pds_tpdfpd.cpp index 2b0ca60c281..84c2383ac49 100644 --- a/src/devices/bus/macpds/pds_tpdfpd.cpp +++ b/src/devices/bus/macpds/pds_tpdfpd.cpp @@ -114,7 +114,7 @@ void macpds_sedisplay_device::device_start() m_macpds->install_device(0x770000, 0x77000f, read16s_delegate(*this, FUNC(macpds_sedisplay_device::ramdac_r)), write16s_delegate(*this, FUNC(macpds_sedisplay_device::ramdac_w))); m_macpds->install_device(0xc10000, 0xc2ffff, read16sm_delegate(*this, FUNC(macpds_sedisplay_device::sedisplay_r)), write16sm_delegate(*this, FUNC(macpds_sedisplay_device::sedisplay_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(screen().time_until_pos(879, 0), 0); } @@ -135,7 +135,7 @@ void macpds_sedisplay_device::device_reset() } -void macpds_sedisplay_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void macpds_sedisplay_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_vbl_disable) { diff --git a/src/devices/bus/macpds/pds_tpdfpd.h b/src/devices/bus/macpds/pds_tpdfpd.h index 8999c569d34..a46bfefcf7b 100644 --- a/src/devices/bus/macpds/pds_tpdfpd.h +++ b/src/devices/bus/macpds/pds_tpdfpd.h @@ -28,7 +28,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/multibus/isbc202.cpp b/src/devices/bus/multibus/isbc202.cpp index 56c3871191d..e8846d1ab5a 100644 --- a/src/devices/bus/multibus/isbc202.cpp +++ b/src/devices/bus/multibus/isbc202.cpp @@ -445,7 +445,7 @@ void isbc202_device::device_reset() m_f_timer->reset(); } -void isbc202_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void isbc202_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMEOUT_TMR_ID: diff --git a/src/devices/bus/multibus/isbc202.h b/src/devices/bus/multibus/isbc202.h index ae5e6ce8fe9..56c6fbb3d2a 100644 --- a/src/devices/bus/multibus/isbc202.h +++ b/src/devices/bus/multibus/isbc202.h @@ -43,7 +43,7 @@ protected: // device_t 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 void device_add_mconfig(machine_config &config) override; // device_execute_interface overrides diff --git a/src/devices/bus/nes/bandai.cpp b/src/devices/bus/nes/bandai.cpp index 1dd82f1747d..933ea5da251 100644 --- a/src/devices/bus/nes/bandai.cpp +++ b/src/devices/bus/nes/bandai.cpp @@ -285,7 +285,7 @@ void nes_oekakids_device::write_h(offs_t offset, uint8_t data) -------------------------------------------------*/ -void nes_fcg_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_fcg_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/bandai.h b/src/devices/bus/nes/bandai.h index e7cb0a1d0cd..9c0390593db 100644 --- a/src/devices/bus/nes/bandai.h +++ b/src/devices/bus/nes/bandai.h @@ -45,7 +45,7 @@ public: // construction/destruction nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - 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 fcg_write(offs_t offset, uint8_t data); virtual void write_m(offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/nes/bootleg.cpp b/src/devices/bus/nes/bootleg.cpp index 36a2481d1dc..51d7a239855 100644 --- a/src/devices/bus/nes/bootleg.cpp +++ b/src/devices/bus/nes/bootleg.cpp @@ -793,7 +793,7 @@ void nes_sc127_device::write_h(offs_t offset, uint8_t data) -------------------------------------------------*/ -void nes_mbaby_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_mbaby_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { @@ -880,7 +880,7 @@ uint8_t nes_asn_device::read_m(offs_t offset) -------------------------------------------------*/ -void nes_smb3p_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_smb3p_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { @@ -1097,7 +1097,7 @@ void nes_lh31_device::write_h(offs_t offset, u8 data) // submapper 2 -------------------------------------------------*/ -void nes_smb2j_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_smb2j_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { @@ -1184,7 +1184,7 @@ u8 nes_smb2j_device::read_m(offs_t offset) -------------------------------------------------*/ -void nes_smb2ja_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_smb2ja_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { @@ -1239,7 +1239,7 @@ u8 nes_smb2ja_device::read_m(offs_t offset) -------------------------------------------------*/ -void nes_smb2jb_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_smb2jb_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { @@ -1388,7 +1388,7 @@ void nes_0353_device::write_h(offs_t offset, u8 data) -------------------------------------------------*/ -void nes_09034a_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_09034a_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { @@ -1460,7 +1460,7 @@ u8 nes_09034a_device::read_m(offs_t offset) -------------------------------------------------*/ -void nes_l001_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_l001_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { @@ -1511,7 +1511,7 @@ void nes_l001_device::write_h(offs_t offset, u8 data) -------------------------------------------------*/ -void nes_batmanfs_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_batmanfs_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { @@ -1892,7 +1892,7 @@ void nes_lh51_device::write_h(offs_t offset, u8 data) -------------------------------------------------*/ -void nes_lh53_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_lh53_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { @@ -2128,7 +2128,7 @@ uint8_t nes_rt01_device::read_h(offs_t offset) -------------------------------------------------*/ -void nes_yung08_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_yung08_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/bootleg.h b/src/devices/bus/nes/bootleg.h index 112f6a3b392..78c9f78327b 100644 --- a/src/devices/bus/nes/bootleg.h +++ b/src/devices/bus/nes/bootleg.h @@ -44,7 +44,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: u16 m_irq_count; @@ -94,7 +94,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: u16 m_irq_count; @@ -158,7 +158,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: void update_irq(u8 data); @@ -187,7 +187,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: u16 m_irq_count; @@ -217,7 +217,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; u16 m_irq_count; int m_irq_enable; @@ -285,7 +285,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: u16 m_irq_count; @@ -312,7 +312,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: u16 m_irq_count; @@ -337,7 +337,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: u16 m_irq_count; @@ -584,7 +584,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: uint16_t m_irq_count; @@ -699,7 +699,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: void write_45(offs_t offset, u8 data); diff --git a/src/devices/bus/nes/cony.cpp b/src/devices/bus/nes/cony.cpp index b0ccf6b06e9..01d83837497 100644 --- a/src/devices/bus/nes/cony.cpp +++ b/src/devices/bus/nes/cony.cpp @@ -119,7 +119,7 @@ void nes_cony_device::pcb_reset() -------------------------------------------------*/ -void nes_cony_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_cony_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/cony.h b/src/devices/bus/nes/cony.h index 6843689db7f..13c6ee134e1 100644 --- a/src/devices/bus/nes/cony.h +++ b/src/devices/bus/nes/cony.h @@ -30,7 +30,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_prg(); virtual void set_chr(); diff --git a/src/devices/bus/nes/datach.cpp b/src/devices/bus/nes/datach.cpp index a7e769f570f..2a8ebbc0e37 100644 --- a/src/devices/bus/nes/datach.cpp +++ b/src/devices/bus/nes/datach.cpp @@ -381,7 +381,7 @@ void nes_datach_device::device_add_mconfig(machine_config &config) // device_timer - handler timer events //------------------------------------------------- -void nes_datach_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_datach_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/datach.h b/src/devices/bus/nes/datach.h index 9c34ada2163..abdbf36bdaa 100644 --- a/src/devices/bus/nes/datach.h +++ b/src/devices/bus/nes/datach.h @@ -155,7 +155,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 void device_add_mconfig(machine_config &config) override; uint8_t m_datach_latch; diff --git a/src/devices/bus/nes/disksys.cpp b/src/devices/bus/nes/disksys.cpp index 9b90c4ba43e..35cf0906ec8 100644 --- a/src/devices/bus/nes/disksys.cpp +++ b/src/devices/bus/nes/disksys.cpp @@ -406,7 +406,7 @@ uint8_t nes_disksys_device::read_ex(offs_t offset) // device_timer - handler timer events //------------------------------------------------- -void nes_disksys_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_disksys_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/disksys.h b/src/devices/bus/nes/disksys.h index a8b3b3e5725..61bd9dd2048 100644 --- a/src/devices/bus/nes/disksys.h +++ b/src/devices/bus/nes/disksys.h @@ -33,7 +33,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 void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/nes/event.cpp b/src/devices/bus/nes/event.cpp index 9b12055723f..182a4e76a86 100644 --- a/src/devices/bus/nes/event.cpp +++ b/src/devices/bus/nes/event.cpp @@ -173,7 +173,7 @@ ioport_constructor nes_event_device::device_input_ports() const // device_timer - handler timer events //------------------------------------------------- -void nes_event_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_event_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_EVENT && m_timer_on) { diff --git a/src/devices/bus/nes/event.h b/src/devices/bus/nes/event.h index 1e7112e4046..5fdd6b88303 100644 --- a/src/devices/bus/nes/event.h +++ b/src/devices/bus/nes/event.h @@ -21,7 +21,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 ioport_constructor device_input_ports() const override; virtual void set_prg() override; diff --git a/src/devices/bus/nes/irem.cpp b/src/devices/bus/nes/irem.cpp index c55cb588506..0d6f7bd6f63 100644 --- a/src/devices/bus/nes/irem.cpp +++ b/src/devices/bus/nes/irem.cpp @@ -279,7 +279,7 @@ void nes_g101_device::write_h(offs_t offset, uint8_t data) -------------------------------------------------*/ -void nes_h3001_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_h3001_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/irem.h b/src/devices/bus/nes/irem.h index 82fd0815c38..9ff4abfb830 100644 --- a/src/devices/bus/nes/irem.h +++ b/src/devices/bus/nes/irem.h @@ -97,7 +97,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; uint16_t m_irq_count, m_irq_count_latch; int m_irq_enable; diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp index 740c3c799b8..fbddd8415e0 100644 --- a/src/devices/bus/nes/jaleco.cpp +++ b/src/devices/bus/nes/jaleco.cpp @@ -424,7 +424,7 @@ void nes_jf19_adpcm_device::write_h(offs_t offset, uint8_t data) -------------------------------------------------*/ -void nes_ss88006_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_ss88006_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/jaleco.h b/src/devices/bus/nes/jaleco.h index 53cc5716ce3..81f4fbc65d8 100644 --- a/src/devices/bus/nes/jaleco.h +++ b/src/devices/bus/nes/jaleco.h @@ -164,7 +164,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; uint16_t m_irq_count, m_irq_count_latch; uint8_t m_irq_mode; diff --git a/src/devices/bus/nes/jy.cpp b/src/devices/bus/nes/jy.cpp index 8a54624cd5a..8010fd70a1c 100644 --- a/src/devices/bus/nes/jy.cpp +++ b/src/devices/bus/nes/jy.cpp @@ -225,7 +225,7 @@ void nes_jy_typea_device::irq_clock(int mode, int blanked) } } -void nes_jy_typea_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_jy_typea_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/jy.h b/src/devices/bus/nes/jy.h index d318bfae60a..ac4cf8e397e 100644 --- a/src/devices/bus/nes/jy.h +++ b/src/devices/bus/nes/jy.h @@ -32,7 +32,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; void irq_clock(int blanked, int mode); void update_banks(int reg); diff --git a/src/devices/bus/nes/kaiser.cpp b/src/devices/bus/nes/kaiser.cpp index ebe7d02972c..11c48d533a1 100644 --- a/src/devices/bus/nes/kaiser.cpp +++ b/src/devices/bus/nes/kaiser.cpp @@ -492,7 +492,7 @@ uint8_t nes_ks7022_device::read_h(offs_t offset) -------------------------------------------------*/ -void nes_ks7032_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_ks7032_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { @@ -661,7 +661,7 @@ void nes_ks7016_device::write_h(offs_t offset, u8 data) -------------------------------------------------*/ -void nes_ks7017_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_ks7017_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/kaiser.h b/src/devices/bus/nes/kaiser.h index 690201233d0..7ecc4d8b7e2 100644 --- a/src/devices/bus/nes/kaiser.h +++ b/src/devices/bus/nes/kaiser.h @@ -86,7 +86,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; u8 m_reg[8]; @@ -167,7 +167,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: uint8_t m_latch; diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp index a22a1afec35..6416d7d06b5 100644 --- a/src/devices/bus/nes/konami.cpp +++ b/src/devices/bus/nes/konami.cpp @@ -354,7 +354,7 @@ void nes_konami_vrc2_device::write_h(offs_t offset, uint8_t data) -------------------------------------------------*/ -void nes_konami_vrc3_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_konami_vrc3_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { @@ -442,7 +442,7 @@ void nes_konami_vrc4_device::irq_tick() m_irq_count++; } -void nes_konami_vrc4_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_konami_vrc4_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/konami.h b/src/devices/bus/nes/konami.h index 88f477cc4ea..7018446a163 100644 --- a/src/devices/bus/nes/konami.h +++ b/src/devices/bus/nes/konami.h @@ -73,7 +73,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: static constexpr device_timer_id TIMER_IRQ = 0; @@ -106,7 +106,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; void set_mirror(u8 data); void set_prg(int prg_base, int prg_mask); virtual void set_prg() { set_prg(0x00, 0x1f); } diff --git a/src/devices/bus/nes/legacy.cpp b/src/devices/bus/nes/legacy.cpp index a3ab9377082..1aa5266e764 100644 --- a/src/devices/bus/nes/legacy.cpp +++ b/src/devices/bus/nes/legacy.cpp @@ -156,7 +156,7 @@ void nes_ffe3_device::write_h(offs_t offset, uint8_t data) -------------------------------------------------*/ -void nes_ffe4_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_ffe4_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/legacy.h b/src/devices/bus/nes/legacy.h index 92722c0591c..271bf338dff 100644 --- a/src/devices/bus/nes/legacy.h +++ b/src/devices/bus/nes/legacy.h @@ -48,7 +48,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; uint16_t m_irq_count; int m_irq_enable; diff --git a/src/devices/bus/nes/namcot.cpp b/src/devices/bus/nes/namcot.cpp index 1e6b96f058e..4bb1d6ce235 100644 --- a/src/devices/bus/nes/namcot.cpp +++ b/src/devices/bus/nes/namcot.cpp @@ -403,7 +403,7 @@ void nes_namcot3425_device::write_h(offs_t offset, uint8_t data) -------------------------------------------------*/ -void nes_namcot340_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_namcot340_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/namcot.h b/src/devices/bus/nes/namcot.h index 1dcf237fa90..e8fb0430fee 100644 --- a/src/devices/bus/nes/namcot.h +++ b/src/devices/bus/nes/namcot.h @@ -100,7 +100,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; uint16_t m_irq_count; int m_irq_enable; diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp index 9e8bbe5555d..8de91c95f99 100644 --- a/src/devices/bus/nes/sunsoft.cpp +++ b/src/devices/bus/nes/sunsoft.cpp @@ -261,7 +261,7 @@ void nes_sunsoft_2_device::write_h(offs_t offset, uint8_t data) -------------------------------------------------*/ -void nes_sunsoft_3_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_sunsoft_3_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { @@ -439,7 +439,7 @@ uint8_t nes_sunsoft_4_device::read_m(offs_t offset) -------------------------------------------------*/ -void nes_sunsoft_fme7_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_sunsoft_fme7_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/sunsoft.h b/src/devices/bus/nes/sunsoft.h index 6eb3f6b7af4..23d486d7562 100644 --- a/src/devices/bus/nes/sunsoft.h +++ b/src/devices/bus/nes/sunsoft.h @@ -60,7 +60,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: uint16_t m_irq_count; @@ -118,7 +118,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; private: uint16_t m_irq_count; diff --git a/src/devices/bus/nes/sunsoft_dcs.cpp b/src/devices/bus/nes/sunsoft_dcs.cpp index 564c115c84a..73827474ed8 100644 --- a/src/devices/bus/nes/sunsoft_dcs.cpp +++ b/src/devices/bus/nes/sunsoft_dcs.cpp @@ -295,7 +295,7 @@ void nes_sunsoft_dcs_device::device_add_mconfig(machine_config &config) // device_timer - handler timer events //------------------------------------------------- -void nes_sunsoft_dcs_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_sunsoft_dcs_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_PROTECT) { diff --git a/src/devices/bus/nes/sunsoft_dcs.h b/src/devices/bus/nes/sunsoft_dcs.h index 491bc5d95ab..983b5a97b06 100644 --- a/src/devices/bus/nes/sunsoft_dcs.h +++ b/src/devices/bus/nes/sunsoft_dcs.h @@ -137,7 +137,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nes/tengen.cpp b/src/devices/bus/nes/tengen.cpp index f6228685796..4f43cb8d010 100644 --- a/src/devices/bus/nes/tengen.cpp +++ b/src/devices/bus/nes/tengen.cpp @@ -181,7 +181,7 @@ inline void nes_tengen032_device::irq_clock(int blanked) // we use the HBLANK IRQ latch from PPU for the scanline based IRQ mode // and a timer for the cycle based IRQ mode, which both call irq_clock -void nes_tengen032_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_tengen032_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/tengen.h b/src/devices/bus/nes/tengen.h index 6d651339f86..a8e21ce9966 100644 --- a/src/devices/bus/nes/tengen.h +++ b/src/devices/bus/nes/tengen.h @@ -43,7 +43,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 chr_cb(int start, int bank, int source); diff --git a/src/devices/bus/nes/vrc_clones.cpp b/src/devices/bus/nes/vrc_clones.cpp index 92f818e55d7..cde4a50c711 100644 --- a/src/devices/bus/nes/vrc_clones.cpp +++ b/src/devices/bus/nes/vrc_clones.cpp @@ -250,7 +250,7 @@ void nes_th21311_device::pcb_reset() -------------------------------------------------*/ -void nes_900218_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_900218_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { @@ -508,7 +508,7 @@ void nes_tf1201_device::irq_ack_w() -------------------------------------------------*/ -void nes_th21311_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_th21311_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_IRQ) { diff --git a/src/devices/bus/nes/vrc_clones.h b/src/devices/bus/nes/vrc_clones.h index c339ae4fad1..921d9cd72b5 100644 --- a/src/devices/bus/nes/vrc_clones.h +++ b/src/devices/bus/nes/vrc_clones.h @@ -46,7 +46,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: u16 m_irq_count; @@ -199,7 +199,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: u16 m_irq_count; diff --git a/src/devices/bus/nes_ctrl/bcbattle.cpp b/src/devices/bus/nes_ctrl/bcbattle.cpp index b8c4ed57e6d..7d97236b6e4 100644 --- a/src/devices/bus/nes_ctrl/bcbattle.cpp +++ b/src/devices/bus/nes_ctrl/bcbattle.cpp @@ -33,7 +33,7 @@ void nes_bcbattle_device::device_add_mconfig(machine_config &config) // This part is the hacky replacement for the real Barcode unit [shared with SNES implementation]: // code periodically checks whether a new code has been scanned and it moves it to the // m_current_barcode array -void nes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_BATTLER) { diff --git a/src/devices/bus/nes_ctrl/bcbattle.h b/src/devices/bus/nes_ctrl/bcbattle.h index 9fc75b0f9fc..c20e00c852c 100644 --- a/src/devices/bus/nes_ctrl/bcbattle.h +++ b/src/devices/bus/nes_ctrl/bcbattle.h @@ -34,7 +34,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_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nes_ctrl/miracle.cpp b/src/devices/bus/nes_ctrl/miracle.cpp index d9f445f58ef..ae5aa437de3 100644 --- a/src/devices/bus/nes_ctrl/miracle.cpp +++ b/src/devices/bus/nes_ctrl/miracle.cpp @@ -34,7 +34,7 @@ void nes_miracle_device::device_add_mconfig(machine_config &config) // device_timer - handler timer events //------------------------------------------------- -void nes_miracle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nes_miracle_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_STROBE_ON) { diff --git a/src/devices/bus/nes_ctrl/miracle.h b/src/devices/bus/nes_ctrl/miracle.h index 16cc1c57cd1..e4bd660d7a5 100644 --- a/src/devices/bus/nes_ctrl/miracle.h +++ b/src/devices/bus/nes_ctrl/miracle.h @@ -41,7 +41,7 @@ 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 void device_add_mconfig(machine_config &config) override; private: diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp index 58875e591b6..a79350687df 100644 --- a/src/devices/bus/nubus/nubus_48gc.cpp +++ b/src/devices/bus/nubus/nubus_48gc.cpp @@ -114,7 +114,7 @@ void jmfb_device::device_start() nubus().install_device(slotspace+0x200000, slotspace+0x2003ff, read32s_delegate(*this, FUNC(jmfb_device::mac_48gc_r)), write32s_delegate(*this, FUNC(jmfb_device::mac_48gc_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_screen = nullptr; // can we look this up now? } @@ -143,7 +143,7 @@ void jmfb_device::device_reset() ***************************************************************************/ -void jmfb_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void jmfb_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_vbl_disable) { diff --git a/src/devices/bus/nubus/nubus_48gc.h b/src/devices/bus/nubus/nubus_48gc.h index f18df117f84..f25c89af939 100644 --- a/src/devices/bus/nubus/nubus_48gc.h +++ b/src/devices/bus/nubus/nubus_48gc.h @@ -25,7 +25,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nubus/nubus_m2hires.cpp b/src/devices/bus/nubus/nubus_m2hires.cpp index e913c0cb0cb..033d443610a 100644 --- a/src/devices/bus/nubus/nubus_m2hires.cpp +++ b/src/devices/bus/nubus/nubus_m2hires.cpp @@ -97,7 +97,7 @@ void nubus_m2hires_device::device_start() nubus().install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32s_delegate(*this, FUNC(nubus_m2hires_device::vram_r)), write32s_delegate(*this, FUNC(nubus_m2hires_device::vram_w))); nubus().install_device(slotspace+0x80000, slotspace+0xeffff, read32s_delegate(*this, FUNC(nubus_m2hires_device::m2hires_r)), write32s_delegate(*this, FUNC(nubus_m2hires_device::m2hires_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(screen().time_until_pos(479, 0), 0); } @@ -119,7 +119,7 @@ void nubus_m2hires_device::device_reset() } -void nubus_m2hires_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void nubus_m2hires_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_vbl_disable) { diff --git a/src/devices/bus/nubus/nubus_m2hires.h b/src/devices/bus/nubus/nubus_m2hires.h index 0837634a9ae..773ccccbe35 100644 --- a/src/devices/bus/nubus/nubus_m2hires.h +++ b/src/devices/bus/nubus/nubus_m2hires.h @@ -28,7 +28,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nubus/nubus_m2video.cpp b/src/devices/bus/nubus/nubus_m2video.cpp index 60728d7dd15..2ca21d0baee 100644 --- a/src/devices/bus/nubus/nubus_m2video.cpp +++ b/src/devices/bus/nubus/nubus_m2video.cpp @@ -99,7 +99,7 @@ void nubus_m2video_device::device_start() nubus().install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32s_delegate(*this, FUNC(nubus_m2video_device::vram_r)), write32s_delegate(*this, FUNC(nubus_m2video_device::vram_w))); nubus().install_device(slotspace+0x80000, slotspace+0xeffff, read32s_delegate(*this, FUNC(nubus_m2video_device::m2video_r)), write32s_delegate(*this, FUNC(nubus_m2video_device::m2video_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(screen().time_until_pos(479, 0), 0); } @@ -121,7 +121,7 @@ void nubus_m2video_device::device_reset() } -void nubus_m2video_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void nubus_m2video_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_vbl_disable) { diff --git a/src/devices/bus/nubus/nubus_m2video.h b/src/devices/bus/nubus/nubus_m2video.h index 9eab1258734..65dfd42ed54 100644 --- a/src/devices/bus/nubus/nubus_m2video.h +++ b/src/devices/bus/nubus/nubus_m2video.h @@ -28,7 +28,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nubus/nubus_radiustpd.cpp b/src/devices/bus/nubus/nubus_radiustpd.cpp index 89518f0d223..0017a33e2f5 100644 --- a/src/devices/bus/nubus/nubus_radiustpd.cpp +++ b/src/devices/bus/nubus/nubus_radiustpd.cpp @@ -99,7 +99,7 @@ void nubus_radiustpd_device::device_start() nubus().install_device(slotspace+0x80000, slotspace+0xeffff, read32s_delegate(*this, FUNC(nubus_radiustpd_device::radiustpd_r)), write32s_delegate(*this, FUNC(nubus_radiustpd_device::radiustpd_w))); nubus().install_device(slotspace+0x980000, slotspace+0x9effff, read32s_delegate(*this, FUNC(nubus_radiustpd_device::radiustpd_r)), write32s_delegate(*this, FUNC(nubus_radiustpd_device::radiustpd_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(screen().time_until_pos(479, 0), 0); } @@ -121,7 +121,7 @@ void nubus_radiustpd_device::device_reset() } -void nubus_radiustpd_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void nubus_radiustpd_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_vbl_disable) { diff --git a/src/devices/bus/nubus/nubus_radiustpd.h b/src/devices/bus/nubus/nubus_radiustpd.h index 97ddb25f29a..a1f0b0e9723 100644 --- a/src/devices/bus/nubus/nubus_radiustpd.h +++ b/src/devices/bus/nubus/nubus_radiustpd.h @@ -28,7 +28,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nubus/nubus_spec8.cpp b/src/devices/bus/nubus/nubus_spec8.cpp index 6ca1f9f4489..0a71dd847f7 100644 --- a/src/devices/bus/nubus/nubus_spec8.cpp +++ b/src/devices/bus/nubus/nubus_spec8.cpp @@ -101,7 +101,7 @@ void nubus_spec8s3_device::device_start() nubus().install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32s_delegate(*this, FUNC(nubus_spec8s3_device::vram_r)), write32s_delegate(*this, FUNC(nubus_spec8s3_device::vram_w))); nubus().install_device(slotspace+0xd0000, slotspace+0xfffff, read32s_delegate(*this, FUNC(nubus_spec8s3_device::spec8s3_r)), write32s_delegate(*this, FUNC(nubus_spec8s3_device::spec8s3_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(screen().time_until_pos(767, 0), 0); } @@ -125,7 +125,7 @@ void nubus_spec8s3_device::device_reset() } -void nubus_spec8s3_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void nubus_spec8s3_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_vbl_disable) { diff --git a/src/devices/bus/nubus/nubus_spec8.h b/src/devices/bus/nubus/nubus_spec8.h index a7085c60f05..88da09528e4 100644 --- a/src/devices/bus/nubus/nubus_spec8.h +++ b/src/devices/bus/nubus/nubus_spec8.h @@ -32,7 +32,7 @@ protected: // optional information overrides virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const 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: uint32_t spec8s3_r(offs_t offset, uint32_t mem_mask = ~0); diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp index c00938c6102..cd3977022be 100644 --- a/src/devices/bus/nubus/nubus_specpdq.cpp +++ b/src/devices/bus/nubus/nubus_specpdq.cpp @@ -117,7 +117,7 @@ void nubus_specpdq_device::device_start() nubus().install_device(slotspace, slotspace+VRAM_SIZE-1, read32s_delegate(*this, FUNC(nubus_specpdq_device::vram_r)), write32s_delegate(*this, FUNC(nubus_specpdq_device::vram_w))); nubus().install_device(slotspace+0x400000, slotspace+0xfbffff, read32s_delegate(*this, FUNC(nubus_specpdq_device::specpdq_r)), write32s_delegate(*this, FUNC(nubus_specpdq_device::specpdq_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(screen().time_until_pos(843, 0), 0); } @@ -139,7 +139,7 @@ void nubus_specpdq_device::device_reset() } -void nubus_specpdq_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void nubus_specpdq_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_vbl_disable) { diff --git a/src/devices/bus/nubus/nubus_specpdq.h b/src/devices/bus/nubus/nubus_specpdq.h index 372e4beab08..fd30e112525 100644 --- a/src/devices/bus/nubus/nubus_specpdq.h +++ b/src/devices/bus/nubus/nubus_specpdq.h @@ -33,7 +33,7 @@ protected: // optional information overrides virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const 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: uint32_t specpdq_r(offs_t offset, uint32_t mem_mask = ~0); diff --git a/src/devices/bus/nubus/nubus_wsportrait.cpp b/src/devices/bus/nubus/nubus_wsportrait.cpp index 9894e0d7906..960db9199ae 100644 --- a/src/devices/bus/nubus/nubus_wsportrait.cpp +++ b/src/devices/bus/nubus/nubus_wsportrait.cpp @@ -100,7 +100,7 @@ void nubus_wsportrait_device::device_start() nubus().install_device(slotspace+0x900000, slotspace+0x900000+VRAM_SIZE-1, read32s_delegate(*this, FUNC(nubus_wsportrait_device::vram_r)), write32s_delegate(*this, FUNC(nubus_wsportrait_device::vram_w))); nubus().install_device(slotspace+0x80000, slotspace+0xeffff, read32s_delegate(*this, FUNC(nubus_wsportrait_device::wsportrait_r)), write32s_delegate(*this, FUNC(nubus_wsportrait_device::wsportrait_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(screen().time_until_pos(869, 0), 0); } @@ -119,7 +119,7 @@ void nubus_wsportrait_device::device_reset() } -void nubus_wsportrait_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void nubus_wsportrait_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_vbl_disable) { diff --git a/src/devices/bus/nubus/nubus_wsportrait.h b/src/devices/bus/nubus/nubus_wsportrait.h index e9f81b982bc..0aa0aa67072 100644 --- a/src/devices/bus/nubus/nubus_wsportrait.h +++ b/src/devices/bus/nubus/nubus_wsportrait.h @@ -28,7 +28,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nubus/pds30_30hr.cpp b/src/devices/bus/nubus/pds30_30hr.cpp index dde2348abc6..f2439b56152 100644 --- a/src/devices/bus/nubus/pds30_30hr.cpp +++ b/src/devices/bus/nubus/pds30_30hr.cpp @@ -99,7 +99,7 @@ void nubus_xceed30hr_device::device_start() nubus().install_device(slotspace, slotspace+VRAM_SIZE-1, read32s_delegate(*this, FUNC(nubus_xceed30hr_device::vram_r)), write32s_delegate(*this, FUNC(nubus_xceed30hr_device::vram_w))); nubus().install_device(slotspace+0x800000, slotspace+0xefffff, read32s_delegate(*this, FUNC(nubus_xceed30hr_device::xceed30hr_r)), write32s_delegate(*this, FUNC(nubus_xceed30hr_device::xceed30hr_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(screen().time_until_pos(479, 0), 0); } @@ -121,7 +121,7 @@ void nubus_xceed30hr_device::device_reset() } -void nubus_xceed30hr_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void nubus_xceed30hr_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_vbl_disable) { diff --git a/src/devices/bus/nubus/pds30_30hr.h b/src/devices/bus/nubus/pds30_30hr.h index 331f8898df4..39d47215d5c 100644 --- a/src/devices/bus/nubus/pds30_30hr.h +++ b/src/devices/bus/nubus/pds30_30hr.h @@ -28,7 +28,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nubus/pds30_cb264.cpp b/src/devices/bus/nubus/pds30_cb264.cpp index 388aa5f54d5..b3f09219093 100644 --- a/src/devices/bus/nubus/pds30_cb264.cpp +++ b/src/devices/bus/nubus/pds30_cb264.cpp @@ -96,7 +96,7 @@ void nubus_cb264se30_device::device_start() nubus().install_device(slotspace, slotspace+VRAM_SIZE-1, read32s_delegate(*this, FUNC(nubus_cb264se30_device::vram_r)), write32s_delegate(*this, FUNC(nubus_cb264se30_device::vram_w))); nubus().install_device(slotspace+0xf00000, slotspace+0xfeffff, read32s_delegate(*this, FUNC(nubus_cb264se30_device::cb264se30_r)), write32s_delegate(*this, FUNC(nubus_cb264se30_device::cb264se30_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(screen().time_until_pos(479, 0), 0); } @@ -118,7 +118,7 @@ void nubus_cb264se30_device::device_reset() } -void nubus_cb264se30_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void nubus_cb264se30_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_vbl_disable) { diff --git a/src/devices/bus/nubus/pds30_cb264.h b/src/devices/bus/nubus/pds30_cb264.h index 0892e23a2de..275c652562f 100644 --- a/src/devices/bus/nubus/pds30_cb264.h +++ b/src/devices/bus/nubus/pds30_cb264.h @@ -28,7 +28,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nubus/pds30_mc30.cpp b/src/devices/bus/nubus/pds30_mc30.cpp index 87992723319..b0d36996a09 100644 --- a/src/devices/bus/nubus/pds30_mc30.cpp +++ b/src/devices/bus/nubus/pds30_mc30.cpp @@ -98,7 +98,7 @@ void nubus_xceedmc30_device::device_start() nubus().install_device(slotspace, slotspace+VRAM_SIZE-1, read32s_delegate(*this, FUNC(nubus_xceedmc30_device::vram_r)), write32s_delegate(*this, FUNC(nubus_xceedmc30_device::vram_w))); nubus().install_device(slotspace+0x800000, slotspace+0xefffff, read32s_delegate(*this, FUNC(nubus_xceedmc30_device::xceedmc30_r)), write32s_delegate(*this, FUNC(nubus_xceedmc30_device::xceedmc30_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(screen().time_until_pos(479, 0), 0); } @@ -120,7 +120,7 @@ void nubus_xceedmc30_device::device_reset() } -void nubus_xceedmc30_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void nubus_xceedmc30_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_vbl_disable) { diff --git a/src/devices/bus/nubus/pds30_mc30.h b/src/devices/bus/nubus/pds30_mc30.h index 2691b8d728c..29d13b5e671 100644 --- a/src/devices/bus/nubus/pds30_mc30.h +++ b/src/devices/bus/nubus/pds30_mc30.h @@ -28,7 +28,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nubus/pds30_procolor816.cpp b/src/devices/bus/nubus/pds30_procolor816.cpp index 83fd8512704..bfa655c9dbd 100644 --- a/src/devices/bus/nubus/pds30_procolor816.cpp +++ b/src/devices/bus/nubus/pds30_procolor816.cpp @@ -99,7 +99,7 @@ void nubus_procolor816_device::device_start() nubus().install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32s_delegate(*this, FUNC(nubus_procolor816_device::vram_r)), write32s_delegate(*this, FUNC(nubus_procolor816_device::vram_w))); nubus().install_device(slotspace+0xf00000, slotspace+0xff7fff, read32s_delegate(*this, FUNC(nubus_procolor816_device::procolor816_r)), write32s_delegate(*this, FUNC(nubus_procolor816_device::procolor816_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(screen().time_until_pos(479, 0), 0); } @@ -121,7 +121,7 @@ void nubus_procolor816_device::device_reset() } -void nubus_procolor816_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void nubus_procolor816_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_vbl_disable) { diff --git a/src/devices/bus/nubus/pds30_procolor816.h b/src/devices/bus/nubus/pds30_procolor816.h index 2fc0474798d..631b92957f2 100644 --- a/src/devices/bus/nubus/pds30_procolor816.h +++ b/src/devices/bus/nubus/pds30_procolor816.h @@ -28,7 +28,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nubus/pds30_sigmalview.cpp b/src/devices/bus/nubus/pds30_sigmalview.cpp index e04e4b2e297..d13c164df1a 100644 --- a/src/devices/bus/nubus/pds30_sigmalview.cpp +++ b/src/devices/bus/nubus/pds30_sigmalview.cpp @@ -94,7 +94,7 @@ void nubus_lview_device::device_start() nubus().install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32s_delegate(*this, FUNC(nubus_lview_device::vram_r)), write32s_delegate(*this, FUNC(nubus_lview_device::vram_w))); nubus().install_device(slotspace+0xb0000, slotspace+0xbffff, read32s_delegate(*this, FUNC(nubus_lview_device::lview_r)), write32s_delegate(*this, FUNC(nubus_lview_device::lview_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(screen().time_until_pos(599, 0), 0); } @@ -114,7 +114,7 @@ void nubus_lview_device::device_reset() } -void nubus_lview_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void nubus_lview_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_vbl_disable) { diff --git a/src/devices/bus/nubus/pds30_sigmalview.h b/src/devices/bus/nubus/pds30_sigmalview.h index b890a31654f..ca08a9d118a 100644 --- a/src/devices/bus/nubus/pds30_sigmalview.h +++ b/src/devices/bus/nubus/pds30_sigmalview.h @@ -28,7 +28,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/pc_joy/pc_joy_sw.cpp b/src/devices/bus/pc_joy/pc_joy_sw.cpp index 0fbe1e67e45..813f6972241 100644 --- a/src/devices/bus/pc_joy/pc_joy_sw.cpp +++ b/src/devices/bus/pc_joy/pc_joy_sw.cpp @@ -35,7 +35,7 @@ void pc_mssw_pad_device::device_reset() m_timer->adjust(attotime::never, 0); } -void pc_mssw_pad_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void pc_mssw_pad_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { uint16_t pad_state = 0; // only multibit mode for now diff --git a/src/devices/bus/pc_joy/pc_joy_sw.h b/src/devices/bus/pc_joy/pc_joy_sw.h index cb76b268a36..0d7aaa55605 100644 --- a/src/devices/bus/pc_joy/pc_joy_sw.h +++ b/src/devices/bus/pc_joy/pc_joy_sw.h @@ -19,7 +19,7 @@ public: protected: virtual void device_start() override; virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id tid, int param) override; private: required_ioport m_btn1; diff --git a/src/devices/bus/pc_kbd/hle_mouse.cpp b/src/devices/bus/pc_kbd/hle_mouse.cpp index 9cb96f94983..d56cfb3c92f 100644 --- a/src/devices/bus/pc_kbd/hle_mouse.cpp +++ b/src/devices/bus/pc_kbd/hle_mouse.cpp @@ -155,7 +155,7 @@ void hle_ps2_mouse_device::resume() } } -void hle_ps2_mouse_device::serial(void *ptr, s32 param) +void hle_ps2_mouse_device::serial(s32 param) { // host may inhibit device communication by holding the clock low for 100µs if (!clock_signal() && clock_held(100)) @@ -474,7 +474,7 @@ void hle_ps2_mouse_device::command(u8 const command) } } -void hle_ps2_mouse_device::sample(void *ptr, s32 param) +void hle_ps2_mouse_device::sample(s32 param) { // read mouse state s16 const x = m_port_x_axis->read(); diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp index e7ac6e27c28..b89d42d9996 100644 --- a/src/devices/bus/pet/c2n.cpp +++ b/src/devices/bus/pet/c2n.cpp @@ -93,7 +93,7 @@ void c2n_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void c2n_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void c2n_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (m_motor) { diff --git a/src/devices/bus/pet/c2n.h b/src/devices/bus/pet/c2n.h index 6430d1b01a0..8a8b04b4a42 100644 --- a/src/devices/bus/pet/c2n.h +++ b/src/devices/bus/pet/c2n.h @@ -35,7 +35,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; // optional information overrides virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp index b8ecd0b7642..859912a5563 100644 --- a/src/devices/bus/plus4/c1551.cpp +++ b/src/devices/bus/plus4/c1551.cpp @@ -478,7 +478,7 @@ void c1551_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void c1551_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void c1551_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_maincpu->set_input_line(M6502_IRQ_LINE, param); diff --git a/src/devices/bus/plus4/c1551.h b/src/devices/bus/plus4/c1551.h index acf933a4b5a..a8f65a36cfa 100644 --- a/src/devices/bus/plus4/c1551.h +++ b/src/devices/bus/plus4/c1551.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; // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp index c043ac1bab0..1e6158ff614 100644 --- a/src/devices/bus/psx/ctlrport.cpp +++ b/src/devices/bus/psx/ctlrport.cpp @@ -134,7 +134,7 @@ void device_psx_controller_interface::interface_post_stop() m_ack_timer = nullptr; } -void device_psx_controller_interface::ack_timer(void *ptr, int param) +void device_psx_controller_interface::ack_timer(int32_t param) { m_ack = param; m_owner->ack(); diff --git a/src/devices/bus/psx/ctlrport.h b/src/devices/bus/psx/ctlrport.h index d3578eb9b3a..5c8fc82dd22 100644 --- a/src/devices/bus/psx/ctlrport.h +++ b/src/devices/bus/psx/ctlrport.h @@ -44,7 +44,7 @@ protected: private: virtual bool get_pad(int count, uint8_t *odata, uint8_t idata) = 0; virtual void do_pad(); - void ack_timer(void *ptr, int param); + void ack_timer(int32_t param); uint8_t m_odata; uint8_t m_idata; diff --git a/src/devices/bus/psx/memcard.cpp b/src/devices/bus/psx/memcard.cpp index ea282337746..b5b193931e5 100644 --- a/src/devices/bus/psx/memcard.cpp +++ b/src/devices/bus/psx/memcard.cpp @@ -360,7 +360,7 @@ void psxcard_device::do_card() } } -void psxcard_device::ack_timer(void *ptr, int param) +void psxcard_device::ack_timer(int32_t param) { m_ack = param; m_owner->ack(); diff --git a/src/devices/bus/psx/memcard.h b/src/devices/bus/psx/memcard.h index 8a4b461cd6b..a558f07164c 100644 --- a/src/devices/bus/psx/memcard.h +++ b/src/devices/bus/psx/memcard.h @@ -40,7 +40,7 @@ private: unsigned char checksum_data(const unsigned char *buf, const unsigned int sz); void do_card(); bool transfer(uint8_t to, uint8_t *from); - void ack_timer(void *ptr, int param); + void ack_timer(int32_t param); unsigned char pkt[0x8b], pkt_ptr, pkt_sz, cmd; unsigned short addr; diff --git a/src/devices/bus/qbus/pc11.cpp b/src/devices/bus/qbus/pc11.cpp index a5538162b9a..f62f8ce0073 100644 --- a/src/devices/bus/qbus/pc11.cpp +++ b/src/devices/bus/qbus/pc11.cpp @@ -214,7 +214,7 @@ void pc11_device::write(offs_t offset, uint16_t data) } } -void pc11_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pc11_device::device_timer(emu_timer &timer, device_timer_id id, int param) { uint8_t reply; diff --git a/src/devices/bus/qbus/pc11.h b/src/devices/bus/qbus/pc11.h index 46dc60c0b7e..8d32925f459 100644 --- a/src/devices/bus/qbus/pc11.h +++ b/src/devices/bus/qbus/pc11.h @@ -50,7 +50,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_z80daisy_interface overrides virtual int z80daisy_irq_state() override; diff --git a/src/devices/bus/rs232/null_modem.cpp b/src/devices/bus/rs232/null_modem.cpp index 86cac00a12a..2c5ff25b0c3 100644 --- a/src/devices/bus/rs232/null_modem.cpp +++ b/src/devices/bus/rs232/null_modem.cpp @@ -86,7 +86,7 @@ void null_modem_device::device_reset() queue(); } -void null_modem_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void null_modem_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/rs232/null_modem.h b/src/devices/bus/rs232/null_modem.h index cc63ac96231..03e05019baa 100644 --- a/src/devices/bus/rs232/null_modem.h +++ b/src/devices/bus/rs232/null_modem.h @@ -24,7 +24,7 @@ protected: virtual ioport_constructor device_input_ports() 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; virtual void device_add_mconfig(machine_config &config) override; virtual void tra_callback() override; diff --git a/src/devices/bus/rs232/pty.cpp b/src/devices/bus/rs232/pty.cpp index db002447621..107846896e6 100644 --- a/src/devices/bus/rs232/pty.cpp +++ b/src/devices/bus/rs232/pty.cpp @@ -79,7 +79,7 @@ void pseudo_terminal_device::device_reset() queue(); } -void pseudo_terminal_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pseudo_terminal_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/rs232/pty.h b/src/devices/bus/rs232/pty.h index a5accaaf83b..2037d43885d 100644 --- a/src/devices/bus/rs232/pty.h +++ b/src/devices/bus/rs232/pty.h @@ -26,7 +26,7 @@ protected: virtual void device_start() override; virtual void device_stop() 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 tra_callback() override; virtual void tra_complete() override; diff --git a/src/devices/bus/rs232/rs232_sync_io.cpp b/src/devices/bus/rs232/rs232_sync_io.cpp index 8977ece64b6..acca54df979 100644 --- a/src/devices/bus/rs232/rs232_sync_io.cpp +++ b/src/devices/bus/rs232/rs232_sync_io.cpp @@ -141,7 +141,7 @@ void rs232_sync_io_device::device_reset() output_rxc(1); } -void rs232_sync_io_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void rs232_sync_io_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TMR_ID_CLK: diff --git a/src/devices/bus/rs232/rs232_sync_io.h b/src/devices/bus/rs232/rs232_sync_io.h index de43eda5ece..dce3aa4297f 100644 --- a/src/devices/bus/rs232/rs232_sync_io.h +++ b/src/devices/bus/rs232/rs232_sync_io.h @@ -34,7 +34,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; private: required_device<bitbanger_device> m_stream; diff --git a/src/devices/bus/rs232/xvd701.cpp b/src/devices/bus/rs232/xvd701.cpp index b2635d21c02..c94a676b545 100644 --- a/src/devices/bus/rs232/xvd701.cpp +++ b/src/devices/bus/rs232/xvd701.cpp @@ -57,7 +57,7 @@ void jvc_xvd701_device::device_reset() m_response_index = sizeof(m_response); } -void jvc_xvd701_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void jvc_xvd701_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/rs232/xvd701.h b/src/devices/bus/rs232/xvd701.h index b018659210e..3e4bc782972 100644 --- a/src/devices/bus/rs232/xvd701.h +++ b/src/devices/bus/rs232/xvd701.h @@ -18,7 +18,7 @@ protected: virtual ioport_constructor device_input_ports() 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; virtual void device_add_mconfig(machine_config &config) override; virtual void tra_callback() override; diff --git a/src/devices/bus/samcoupe/mouse/mouse.cpp b/src/devices/bus/samcoupe/mouse/mouse.cpp index e023d404997..02f80626e79 100644 --- a/src/devices/bus/samcoupe/mouse/mouse.cpp +++ b/src/devices/bus/samcoupe/mouse/mouse.cpp @@ -88,7 +88,7 @@ void sam_mouse_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void sam_mouse_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sam_mouse_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_mouse_index = 0; } diff --git a/src/devices/bus/samcoupe/mouse/mouse.h b/src/devices/bus/samcoupe/mouse/mouse.h index 1e0f6936a1b..008b1f9b750 100644 --- a/src/devices/bus/samcoupe/mouse/mouse.h +++ b/src/devices/bus/samcoupe/mouse/mouse.h @@ -33,7 +33,7 @@ protected: virtual ioport_constructor device_input_ports() 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; private: required_ioport m_io_buttons; diff --git a/src/devices/bus/scsi/scsihle.cpp b/src/devices/bus/scsi/scsihle.cpp index ed63dae450e..a177d25ddb3 100644 --- a/src/devices/bus/scsi/scsihle.cpp +++ b/src/devices/bus/scsi/scsihle.cpp @@ -206,7 +206,7 @@ void scsihle_device::scsibus_write_data() data_idx=0; } -void scsihle_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void scsihle_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { switch (tid) { diff --git a/src/devices/bus/scsi/scsihle.h b/src/devices/bus/scsi/scsihle.h index e98e38122e7..d810be70dcc 100644 --- a/src/devices/bus/scsi/scsihle.h +++ b/src/devices/bus/scsi/scsihle.h @@ -43,7 +43,7 @@ protected: virtual ioport_constructor device_input_ports() 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; private: required_ioport m_scsi_id; diff --git a/src/devices/bus/sg1000_exp/kblink.cpp b/src/devices/bus/sg1000_exp/kblink.cpp index 039c7f91196..4a2cd10786a 100644 --- a/src/devices/bus/sg1000_exp/kblink.cpp +++ b/src/devices/bus/sg1000_exp/kblink.cpp @@ -117,7 +117,7 @@ void sk1100_link_cable_device::device_add_mconfig(machine_config &config) } -void sk1100_link_cable_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sk1100_link_cable_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/sg1000_exp/kblink.h b/src/devices/bus/sg1000_exp/kblink.h index 65e5782f4a2..2c64dd312bf 100644 --- a/src/devices/bus/sg1000_exp/kblink.h +++ b/src/devices/bus/sg1000_exp/kblink.h @@ -37,7 +37,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_add_mconfig(machine_config &config) override; // device_sk1100_link_cable_interface overrides diff --git a/src/devices/bus/sgikbd/hlekbd.cpp b/src/devices/bus/sgikbd/hlekbd.cpp index dc3c5f39ec3..68883f37d7d 100644 --- a/src/devices/bus/sgikbd/hlekbd.cpp +++ b/src/devices/bus/sgikbd/hlekbd.cpp @@ -247,7 +247,7 @@ void hle_device::device_reset() start_processing(attotime::from_hz(600)); } -void hle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hle_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/sgikbd/hlekbd.h b/src/devices/bus/sgikbd/hlekbd.h index b2c21889d58..afa9fb03949 100644 --- a/src/devices/bus/sgikbd/hlekbd.h +++ b/src/devices/bus/sgikbd/hlekbd.h @@ -31,7 +31,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 ioport_constructor device_input_ports() const override; // device_buffered_serial_interface overrides diff --git a/src/devices/bus/sms_ctrl/lphaser.cpp b/src/devices/bus/sms_ctrl/lphaser.cpp index 2dead793887..d9fb0443ec8 100644 --- a/src/devices/bus/sms_ctrl/lphaser.cpp +++ b/src/devices/bus/sms_ctrl/lphaser.cpp @@ -289,7 +289,7 @@ void sms_light_phaser_device::sensor_check() } -void sms_light_phaser_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sms_light_phaser_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/sms_ctrl/lphaser.h b/src/devices/bus/sms_ctrl/lphaser.h index 123241e2663..3e1a4d41960 100644 --- a/src/devices/bus/sms_ctrl/lphaser.h +++ b/src/devices/bus/sms_ctrl/lphaser.h @@ -39,6 +39,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) override; // device_sms_control_port_interface overrides virtual uint8_t peripheral_r() override; @@ -52,7 +53,6 @@ private: emu_timer *m_lphaser_timer; static const device_timer_id TIMER_LPHASER = 0; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; void sensor_check(); int bright_aim_area( emu_timer *timer, int lgun_x, int lgun_y ); uint16_t screen_hpos_nonscaled(int scaled_hpos); diff --git a/src/devices/bus/sms_ctrl/sports.cpp b/src/devices/bus/sms_ctrl/sports.cpp index dee6af4eb63..0995af24f5c 100644 --- a/src/devices/bus/sms_ctrl/sports.cpp +++ b/src/devices/bus/sms_ctrl/sports.cpp @@ -53,7 +53,7 @@ DEFINE_DEVICE_TYPE(SMS_SPORTS_PAD, sms_sports_pad_device, "sms_sports_pad", "Seg #define SPORTS_PAD_INTERVAL attotime::from_hz(XTAL(10'738'635)/3/512) -void sms_sports_pad_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sms_sports_pad_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/sms_ctrl/sports.h b/src/devices/bus/sms_ctrl/sports.h index 6644541f36a..ed7c8a97eef 100644 --- a/src/devices/bus/sms_ctrl/sports.h +++ b/src/devices/bus/sms_ctrl/sports.h @@ -58,7 +58,7 @@ private: emu_timer *m_sportspad_timer; static const device_timer_id TIMER_SPORTSPAD = 0; - 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; }; diff --git a/src/devices/bus/snes/event.cpp b/src/devices/bus/snes/event.cpp index d6e8000eab3..26a66971e67 100644 --- a/src/devices/bus/snes/event.cpp +++ b/src/devices/bus/snes/event.cpp @@ -267,7 +267,7 @@ ioport_constructor sns_pfest94_device::device_input_ports() const // device_timer - handler timer events //------------------------------------------------- -void sns_pfest94_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sns_pfest94_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_EVENT) { diff --git a/src/devices/bus/snes/event.h b/src/devices/bus/snes/event.h index dedd18f921a..1885b3fa328 100644 --- a/src/devices/bus/snes/event.h +++ b/src/devices/bus/snes/event.h @@ -25,7 +25,7 @@ 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 void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/snes/sa1.cpp b/src/devices/bus/snes/sa1.cpp index dc2307d7a14..39b2bd080e3 100644 --- a/src/devices/bus/snes/sa1.cpp +++ b/src/devices/bus/snes/sa1.cpp @@ -226,7 +226,7 @@ void sns_sa1_device::device_reset() m_sa1_timer->adjust(m_sa1->clocks_to_attotime(2), 0, m_sa1->clocks_to_attotime(2)); } -void sns_sa1_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sns_sa1_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/snes/sa1.h b/src/devices/bus/snes/sa1.h index ccb6affc2fa..fcc9bbd9dc1 100644 --- a/src/devices/bus/snes/sa1.h +++ b/src/devices/bus/snes/sa1.h @@ -27,7 +27,7 @@ protected: virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) 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; // reading and writing virtual u8 read_l(offs_t offset) override; diff --git a/src/devices/bus/snes_ctrl/bcbattle.cpp b/src/devices/bus/snes_ctrl/bcbattle.cpp index 4c0b17ef6ce..3b8f6e8542d 100644 --- a/src/devices/bus/snes_ctrl/bcbattle.cpp +++ b/src/devices/bus/snes_ctrl/bcbattle.cpp @@ -33,7 +33,7 @@ void snes_bcbattle_device::device_add_mconfig(machine_config &config) // This part is the hacky replacement for the real Barcode unit [shared with NES implementation]: // code periodically checks whether a new code has been scanned and it moves it to the // m_current_barcode array -void snes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void snes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_BATTLER) { diff --git a/src/devices/bus/snes_ctrl/bcbattle.h b/src/devices/bus/snes_ctrl/bcbattle.h index 808a5332f68..13c53dd9b38 100644 --- a/src/devices/bus/snes_ctrl/bcbattle.h +++ b/src/devices/bus/snes_ctrl/bcbattle.h @@ -32,7 +32,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_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/snes_ctrl/miracle.cpp b/src/devices/bus/snes_ctrl/miracle.cpp index a0d9c70874c..ec84ef3dc3c 100644 --- a/src/devices/bus/snes_ctrl/miracle.cpp +++ b/src/devices/bus/snes_ctrl/miracle.cpp @@ -35,7 +35,7 @@ void snes_miracle_device::device_add_mconfig(machine_config &config) // device_timer - handler timer events //------------------------------------------------- -void snes_miracle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void snes_miracle_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_STROBE_ON) { diff --git a/src/devices/bus/snes_ctrl/miracle.h b/src/devices/bus/snes_ctrl/miracle.h index cb1b89a6eda..53306d36496 100644 --- a/src/devices/bus/snes_ctrl/miracle.h +++ b/src/devices/bus/snes_ctrl/miracle.h @@ -39,7 +39,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_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/spectrum/mgt.cpp b/src/devices/bus/spectrum/mgt.cpp index 62f36c7a315..a264dfb03be 100644 --- a/src/devices/bus/spectrum/mgt.cpp +++ b/src/devices/bus/spectrum/mgt.cpp @@ -716,7 +716,7 @@ void spectrum_disciple_device::mreq_w(offs_t offset, uint8_t data) m_exp->mreq_w(offset, data); } -void spectrum_disciple_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void spectrum_disciple_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/spectrum/mgt.h b/src/devices/bus/spectrum/mgt.h index f75b8dc540a..13654adccc9 100644 --- a/src/devices/bus/spectrum/mgt.h +++ b/src/devices/bus/spectrum/mgt.h @@ -82,7 +82,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/sunkbd/hlekbd.cpp b/src/devices/bus/sunkbd/hlekbd.cpp index d20c0040d5d..94ff16a5fce 100644 --- a/src/devices/bus/sunkbd/hlekbd.cpp +++ b/src/devices/bus/sunkbd/hlekbd.cpp @@ -1058,7 +1058,7 @@ void hle_device_base::device_reset() handle timed events --------------------------------------------------*/ -void hle_device_base::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hle_device_base::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/sunkbd/hlekbd.h b/src/devices/bus/sunkbd/hlekbd.h index 2600175dc8c..b57ebec9ae5 100644 --- a/src/devices/bus/sunkbd/hlekbd.h +++ b/src/devices/bus/sunkbd/hlekbd.h @@ -38,7 +38,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; // device_buffered_serial_interface overrides virtual void tra_callback() override; diff --git a/src/devices/bus/thomson/cd90_015.cpp b/src/devices/bus/thomson/cd90_015.cpp index d62b0c0e338..976fb6a8884 100644 --- a/src/devices/bus/thomson/cd90_015.cpp +++ b/src/devices/bus/thomson/cd90_015.cpp @@ -61,7 +61,7 @@ void cd90_015_device::device_add_mconfig(machine_config &config) FLOPPY_CONNECTOR(config, m_floppy[3], floppy_drives, nullptr, floppy_formats).enable_sound(true); } -void cd90_015_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cd90_015_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_floppy[id]->get_device()->mon_w(1); } diff --git a/src/devices/bus/thomson/cd90_015.h b/src/devices/bus/thomson/cd90_015.h index 7d2c963f7f6..b8e1ff17a83 100644 --- a/src/devices/bus/thomson/cd90_015.h +++ b/src/devices/bus/thomson/cd90_015.h @@ -26,7 +26,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; private: required_device<mc6843_device> m_fdc; diff --git a/src/devices/bus/thomson/cd90_351.cpp b/src/devices/bus/thomson/cd90_351.cpp index ca543d2b596..c43880dbc70 100644 --- a/src/devices/bus/thomson/cd90_351.cpp +++ b/src/devices/bus/thomson/cd90_351.cpp @@ -122,7 +122,7 @@ void cd90_351_device::device_reset() m_cur_floppy = nullptr; } -void cd90_351_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cd90_351_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { case ID_MOTOROFF: diff --git a/src/devices/bus/thomson/cd90_351.h b/src/devices/bus/thomson/cd90_351.h index 2afba932b49..78d0bda9033 100644 --- a/src/devices/bus/thomson/cd90_351.h +++ b/src/devices/bus/thomson/cd90_351.h @@ -26,7 +26,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 device_post_load() override; private: diff --git a/src/devices/bus/thomson/nanoreseau.cpp b/src/devices/bus/thomson/nanoreseau.cpp index 51f11c65761..579400aab01 100644 --- a/src/devices/bus/thomson/nanoreseau.cpp +++ b/src/devices/bus/thomson/nanoreseau.cpp @@ -166,7 +166,7 @@ ioport_constructor nanoreseau_device::device_input_ports() const */ -void nanoreseau_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nanoreseau_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_answer_step ++; m_mc6854->set_cts(m_answer_step & 1); diff --git a/src/devices/bus/thomson/nanoreseau.h b/src/devices/bus/thomson/nanoreseau.h index b50f8618556..85b48e02f6c 100644 --- a/src/devices/bus/thomson/nanoreseau.h +++ b/src/devices/bus/thomson/nanoreseau.h @@ -25,7 +25,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual ioport_constructor device_input_ports() const 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<mc6854_device> m_mc6854; diff --git a/src/devices/bus/ti8x/bitsocket.cpp b/src/devices/bus/ti8x/bitsocket.cpp index 46c832ffecd..d824bf35331 100644 --- a/src/devices/bus/ti8x/bitsocket.cpp +++ b/src/devices/bus/ti8x/bitsocket.cpp @@ -33,7 +33,7 @@ protected: virtual void device_add_mconfig(machine_config &config) 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 DECLARE_WRITE_LINE_MEMBER(input_tip) override; virtual DECLARE_WRITE_LINE_MEMBER(input_ring) override; @@ -79,7 +79,7 @@ void bit_socket_device::device_start() } -void bit_socket_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void bit_socket_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/bus/ti99/internal/992board.cpp b/src/devices/bus/ti99/internal/992board.cpp index bb13a379475..bb1c9be5a78 100644 --- a/src/devices/bus/ti99/internal/992board.cpp +++ b/src/devices/bus/ti99/internal/992board.cpp @@ -175,7 +175,7 @@ std::string video992_device::tts(attotime t) } -void video992_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void video992_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int raw_vpos = screen().vpos(); diff --git a/src/devices/bus/ti99/internal/992board.h b/src/devices/bus/ti99/internal/992board.h index 4269632688c..1a88622f62c 100644 --- a/src/devices/bus/ti99/internal/992board.h +++ b/src/devices/bus/ti99/internal/992board.h @@ -57,13 +57,14 @@ protected: video992_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); int m_beol; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; + private: static const device_timer_id HOLD_TIME = 0; static const device_timer_id FREE_TIME = 1; - void device_start() override; - void device_reset() override; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; std::string tts(attotime t); devcb_read8 m_mem_read_cb; // Callback to read memory devcb_write_line m_hold_cb; @@ -109,14 +110,15 @@ public: uint8_t cruread(offs_t offset); void cruwrite(offs_t offset, uint8_t data); - void device_start() override; - ioport_constructor device_input_ports() const override; auto rombank_cb() { return m_set_rom_bank.bind(); } protected: io992_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); bool m_have_banked_rom; + virtual void device_start() override; + virtual ioport_constructor device_input_ports() const override; + void hexbus_value_changed(uint8_t data) override; private: @@ -197,8 +199,8 @@ public: void write(offs_t offset, uint8_t data); protected: - void device_start() override { }; - void device_config_complete() override; + virtual void device_start() override { }; + virtual void device_config_complete() override; private: ti992_expport_attached_device* m_connected; @@ -210,12 +212,14 @@ class ti992_expram_device : public ti992_expport_attached_device { public: ti992_expram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void readz(offs_t offset, uint8_t *value) override; - void write(offs_t offset, uint8_t data) override; + virtual void readz(offs_t offset, uint8_t *value) override; + virtual void write(offs_t offset, uint8_t data) override; + +protected: + virtual void device_start() override {} + virtual void device_add_mconfig(machine_config &config) override; private: - void device_start() override {}; - void device_add_mconfig(machine_config &config) override; required_device<ram_device> m_ram; }; diff --git a/src/devices/bus/ti99/internal/genkbd.cpp b/src/devices/bus/ti99/internal/genkbd.cpp index 92f0e34b66b..fa65058d7c8 100644 --- a/src/devices/bus/ti99/internal/genkbd.cpp +++ b/src/devices/bus/ti99/internal/genkbd.cpp @@ -206,7 +206,7 @@ geneve_xt_101_hle_keyboard_device::geneve_xt_101_hle_keyboard_device(const machi /* Called by the poll timer */ -void geneve_xt_101_hle_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void geneve_xt_101_hle_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id==0) { diff --git a/src/devices/bus/ti99/internal/genkbd.h b/src/devices/bus/ti99/internal/genkbd.h index 78d985a6160..a54951e2134 100644 --- a/src/devices/bus/ti99/internal/genkbd.h +++ b/src/devices/bus/ti99/internal/genkbd.h @@ -30,20 +30,19 @@ public: protected: // device-level overrides - void device_start() override; - void device_reset() override; - ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual ioport_constructor device_input_ports() const override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; // device_pc_kbd_interface overrides - DECLARE_WRITE_LINE_MEMBER( clock_write ) override; - DECLARE_WRITE_LINE_MEMBER( data_write ) override; + virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override; + virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override; private: emu_timer *m_poll_timer; emu_timer *m_send_timer; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - static constexpr unsigned KEYQUEUESIZE = 256; static constexpr unsigned MAXKEYMSGLENGTH = 10; static constexpr unsigned KEYAUTOREPEATDELAY = 30; diff --git a/src/devices/bus/ti99/joyport/handset.cpp b/src/devices/bus/ti99/joyport/handset.cpp index 8805d460200..ab55d84f277 100644 --- a/src/devices/bus/ti99/joyport/handset.cpp +++ b/src/devices/bus/ti99/joyport/handset.cpp @@ -100,7 +100,7 @@ void ti99_handset_device::write_dev(uint8_t data) of P0 is changed, because, in one occasion, the ISR asserts the line before it reads the data, so we need to delay the acknowledge process. */ -void ti99_handset_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ti99_handset_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_clock_high = !m_clock_high; m_buf >>= 4; diff --git a/src/devices/bus/ti99/joyport/handset.h b/src/devices/bus/ti99/joyport/handset.h index a1726cd8d80..ca64889ec43 100644 --- a/src/devices/bus/ti99/joyport/handset.h +++ b/src/devices/bus/ti99/joyport/handset.h @@ -38,7 +38,7 @@ protected: virtual void device_reset() override; virtual ioport_constructor device_input_ports() const 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: static constexpr unsigned MAX_HANDSETS = 4; diff --git a/src/devices/bus/ti99/joyport/mecmouse.cpp b/src/devices/bus/ti99/joyport/mecmouse.cpp index 76a5a24c413..a95162f44ea 100644 --- a/src/devices/bus/ti99/joyport/mecmouse.cpp +++ b/src/devices/bus/ti99/joyport/mecmouse.cpp @@ -132,7 +132,7 @@ void mecmouse_device::write_dev(uint8_t data) } } -void mecmouse_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mecmouse_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // Poll the movement int new_mx, new_my; diff --git a/src/devices/bus/ti99/joyport/mecmouse.h b/src/devices/bus/ti99/joyport/mecmouse.h index cd0320b0750..8bbecc7d78d 100644 --- a/src/devices/bus/ti99/joyport/mecmouse.h +++ b/src/devices/bus/ti99/joyport/mecmouse.h @@ -30,7 +30,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual ioport_constructor device_input_ports() const 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: int m_last_select; diff --git a/src/devices/bus/ti99/peb/hfdc.cpp b/src/devices/bus/ti99/peb/hfdc.cpp index 2e5d7173c44..98b42c5afbb 100644 --- a/src/devices/bus/ti99/peb/hfdc.cpp +++ b/src/devices/bus/ti99/peb/hfdc.cpp @@ -507,7 +507,7 @@ void myarc_hfdc_device::cruwrite(offs_t offset, uint8_t data) /* Monoflop has gone back to the OFF state. */ -void myarc_hfdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void myarc_hfdc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { set_floppy_motors_running(false); } diff --git a/src/devices/bus/ti99/peb/hfdc.h b/src/devices/bus/ti99/peb/hfdc.h index 370fb0289dd..c7c17834b79 100644 --- a/src/devices/bus/ti99/peb/hfdc.h +++ b/src/devices/bus/ti99/peb/hfdc.h @@ -37,24 +37,24 @@ class myarc_hfdc_device : public device_t, public device_ti99_peribox_card_inter public: myarc_hfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void readz(offs_t offset, uint8_t *value) override; - void write(offs_t offset, uint8_t data) override; - void setaddress_dbin(offs_t offset, int state) override; - void crureadz(offs_t offset, uint8_t *value) override; - void cruwrite(offs_t offset, uint8_t data) override; + virtual void readz(offs_t offset, uint8_t *value) override; + virtual void write(offs_t offset, uint8_t data) override; + virtual void setaddress_dbin(offs_t offset, int state) override; + virtual void crureadz(offs_t offset, uint8_t *value) override; + virtual void cruwrite(offs_t offset, uint8_t data) override; protected: - void device_config_complete() override; + virtual void device_config_complete() override; -private: - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - void device_start() override; - void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; + virtual void device_start() override; + virtual void device_reset() override; - const tiny_rom_entry *device_rom_region() const override; + virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; - ioport_constructor device_input_ports() const override; + virtual ioport_constructor device_input_ports() const override; +private: DECLARE_WRITE_LINE_MEMBER( dmarq_w ); DECLARE_WRITE_LINE_MEMBER( intrq_w ); DECLARE_WRITE_LINE_MEMBER( dip_w ); diff --git a/src/devices/bus/vcs/dpc.cpp b/src/devices/bus/vcs/dpc.cpp index 7709fe44e5a..26f790e754b 100644 --- a/src/devices/bus/vcs/dpc.cpp +++ b/src/devices/bus/vcs/dpc.cpp @@ -91,7 +91,7 @@ void dpc_device::decrement_counter(uint8_t data_fetcher) // device_timer - handler timer events //------------------------------------------------- -void dpc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void dpc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_OSC) { diff --git a/src/devices/bus/vcs/dpc.h b/src/devices/bus/vcs/dpc.h index 19dc7f34dd2..40dd844e800 100644 --- a/src/devices/bus/vcs/dpc.h +++ b/src/devices/bus/vcs/dpc.h @@ -42,7 +42,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; df_t m_df[8]; uint8_t m_movamt; diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp index 8df76ac92d5..66a00dbfebd 100644 --- a/src/devices/bus/vip/vp550.cpp +++ b/src/devices/bus/vip/vp550.cpp @@ -100,7 +100,7 @@ void vp550_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void vp550_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void vp550_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (LOG) logerror("VP550 '%s' Interrupt\n", tag()); diff --git a/src/devices/bus/vip/vp550.h b/src/devices/bus/vip/vp550.h index d881063ba2c..1a777ebebbb 100644 --- a/src/devices/bus/vip/vp550.h +++ b/src/devices/bus/vip/vp550.h @@ -32,7 +32,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 void device_add_mconfig(machine_config &config) override; // device_vip_expansion_card_interface overrides diff --git a/src/devices/bus/vme/vme_cp31.cpp b/src/devices/bus/vme/vme_cp31.cpp index 2f960bbcd3c..130065fb57d 100644 --- a/src/devices/bus/vme/vme_cp31.cpp +++ b/src/devices/bus/vme/vme_cp31.cpp @@ -312,7 +312,7 @@ void vme_cp31_card_device::device_reset() }); } -void vme_cp31_card_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void vme_cp31_card_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_bus_error = false; } diff --git a/src/devices/bus/vme/vme_cp31.h b/src/devices/bus/vme/vme_cp31.h index f3ca8898d78..f451e002c0e 100644 --- a/src/devices/bus/vme/vme_cp31.h +++ b/src/devices/bus/vme/vme_cp31.h @@ -31,7 +31,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; virtual ioport_constructor device_input_ports() const 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<m68000_base_device> m_maincpu; diff --git a/src/devices/bus/vme/vme_fccpu20.cpp b/src/devices/bus/vme/vme_fccpu20.cpp index ee07b86e1be..4720a08e6d6 100644 --- a/src/devices/bus/vme/vme_fccpu20.cpp +++ b/src/devices/bus/vme/vme_fccpu20.cpp @@ -479,7 +479,7 @@ void vme_fccpu20_device::device_reset() //------------------------------------------------- // device_timer - handler timer events //------------------------------------------------- -void vme_fccpu20_device::device_timer (emu_timer &timer, device_timer_id id, int32_t param, void *ptr) +void vme_fccpu20_device::device_timer (emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/bus/vme/vme_fccpu20.h b/src/devices/bus/vme/vme_fccpu20.h index ede5e886f46..ae26d07eccc 100644 --- a/src/devices/bus/vme/vme_fccpu20.h +++ b/src/devices/bus/vme/vme_fccpu20.h @@ -43,7 +43,7 @@ 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; // optional information overrides virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/vme/vme_hcpu30.cpp b/src/devices/bus/vme/vme_hcpu30.cpp index 8c90410b21c..93ae2c35daa 100644 --- a/src/devices/bus/vme/vme_hcpu30.cpp +++ b/src/devices/bus/vme/vme_hcpu30.cpp @@ -598,7 +598,7 @@ void vme_hcpu30_card_device::device_reset() }); } -void vme_hcpu30_card_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void vme_hcpu30_card_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_bus_error = false; } diff --git a/src/devices/bus/vme/vme_hcpu30.h b/src/devices/bus/vme/vme_hcpu30.h index 268fe8109cf..851961b0e60 100644 --- a/src/devices/bus/vme/vme_hcpu30.h +++ b/src/devices/bus/vme/vme_hcpu30.h @@ -35,7 +35,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; virtual ioport_constructor device_input_ports() const 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<m68000_base_device> m_maincpu; diff --git a/src/devices/bus/wswan/rom.cpp b/src/devices/bus/wswan/rom.cpp index 034ec926dc4..3f015fbc8e1 100644 --- a/src/devices/bus/wswan/rom.cpp +++ b/src/devices/bus/wswan/rom.cpp @@ -199,7 +199,7 @@ void ws_rom_eeprom_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void ws_rom_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ws_rom_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_RTC) { diff --git a/src/devices/bus/wswan/rom.h b/src/devices/bus/wswan/rom.h index e61efd904de..6a99f98e3a4 100644 --- a/src/devices/bus/wswan/rom.h +++ b/src/devices/bus/wswan/rom.h @@ -30,7 +30,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; u16 m_io_regs[8]; u32 m_base20, m_base30, m_base40; diff --git a/src/devices/bus/z88/z88.cpp b/src/devices/bus/z88/z88.cpp index 6030ac2d1bc..ba4cc9632fa 100644 --- a/src/devices/bus/z88/z88.cpp +++ b/src/devices/bus/z88/z88.cpp @@ -85,7 +85,7 @@ void z88cart_slot_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void z88cart_slot_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void z88cart_slot_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_FLP_CLEAR) { diff --git a/src/devices/bus/z88/z88.h b/src/devices/bus/z88/z88.h index 93d516cc071..04c9b35fcf4 100644 --- a/src/devices/bus/z88/z88.h +++ b/src/devices/bus/z88/z88.h @@ -122,7 +122,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: static constexpr device_timer_id TIMER_FLP_CLEAR = 0; diff --git a/src/devices/cpu/alto2/a2disk.cpp b/src/devices/cpu/alto2/a2disk.cpp index fa9392695dc..5000095ff7e 100644 --- a/src/devices/cpu/alto2/a2disk.cpp +++ b/src/devices/cpu/alto2/a2disk.cpp @@ -792,12 +792,10 @@ void alto2_cpu_device::kwd_timing(int bitclk, int datin, int block) /** * @brief timer callback to take away the SECLATE pulse (monoflop) - * @param ptr some unused pointer * @param arg contains the seclate value */ -void alto2_cpu_device::disk_seclate(void* ptr, int32_t arg) +void alto2_cpu_device::disk_seclate(int32_t arg) { - (void)ptr; LOG((this,LOG_DISK,2," SECLATE -> %d\n", arg)); m_dsk.seclate = arg; m_dsk.seclate_timer->enable(false); @@ -805,12 +803,10 @@ void alto2_cpu_device::disk_seclate(void* ptr, int32_t arg) /** * @brief timer callback to take away the OK TO RUN pulse (reset) - * @param ptr some unused pointer * @param arg contains the ok_to_run value */ -void alto2_cpu_device::disk_ok_to_run(void* ptr, int32_t arg) +void alto2_cpu_device::disk_ok_to_run(int32_t arg) { - (void)ptr; LOG((this,LOG_DISK,2," OK TO RUN -> %d\n", arg)); m_dsk.ok_to_run = arg; m_dsk.ok_to_run_timer->enable(false); @@ -833,12 +829,10 @@ void alto2_cpu_device::disk_ok_to_run(void* ptr, int32_t arg) * flag 0 (SKINC, active low). If the seek would go beyond the last cylinder, * the drive deasserts seek_incomplete, but does not assert the addx_acknowledge. * - * @param ptr some unused pointer * @param arg contains the drive, cylinder, and restore flag */ -void alto2_cpu_device::disk_strobon(void* ptr, int32_t arg) +void alto2_cpu_device::disk_strobon(int32_t arg) { - (void)ptr; int unit = arg % 2; int restore = (arg / 2) % 2; int cylinder = arg / 4; @@ -904,7 +898,7 @@ void alto2_cpu_device::disk_strobon(void* ptr, int32_t arg) } /** @brief timer callback to change the READY monoflop 31a */ -void alto2_cpu_device::disk_ready_mf31a(void* ptr, int32_t arg) +void alto2_cpu_device::disk_ready_mf31a(int32_t arg) { diablo_hd_device* dhd = m_drive[m_dsk.drive]; m_dsk.ready_mf31a = arg & dhd->get_ready_0(); @@ -1005,7 +999,7 @@ void alto2_cpu_device::f1_late_strobe() LOG((this,LOG_DISK,1," STROBE (SENDADR:1)\n")); /* Set the STROBON flag and start the STROBON monoflop */ m_dsk.strobe = 1; - disk_strobon(nullptr, + disk_strobon( 4 * GET_KADDR_CYLINDER(m_dsk.kaddr) + 2 * GET_KADDR_RESTORE(m_dsk.kaddr) + m_dsk.drive); @@ -1570,12 +1564,10 @@ void alto2_cpu_device::f2_late_strobon() /** * @brief update the disk controller with a new bitclk * - * @param id timer id * @param arg bit number */ -void alto2_cpu_device::disk_bitclk(void* ptr, int32_t arg) +void alto2_cpu_device::disk_bitclk(int32_t arg) { - (void)ptr; diablo_hd_device* dhd = m_drive[m_dsk.drive]; int clk = arg & 1; int bit; diff --git a/src/devices/cpu/alto2/a2disk.h b/src/devices/cpu/alto2/a2disk.h index 2bb7f98ce80..167e336d4af 100644 --- a/src/devices/cpu/alto2/a2disk.h +++ b/src/devices/cpu/alto2/a2disk.h @@ -74,7 +74,7 @@ TIMER_CALLBACK_MEMBER( disk_seclate ); //!< timer callback to take away TIMER_CALLBACK_MEMBER( disk_ok_to_run ); //!< timer callback to take away the OK TO RUN pulse (reset) TIMER_CALLBACK_MEMBER( disk_strobon ); //!< timer callback to pulse the STROBE' signal to the drive TIMER_CALLBACK_MEMBER( disk_ready_mf31a ); //!< timer callback to change the READY monoflop 31a -void disk_bitclk(void *ptr, int arg); //!< function to update the disk controller with a new bitclk +void disk_bitclk(int arg); //!< function to update the disk controller with a new bitclk void disk_block(int task); //!< called if one of the disk tasks (task_kwd or task_ksec) blocks void bs_early_read_kstat(); //!< bus source: bus driven by disk status register KSTAT void bs_early_read_kdata(); //!< bus source: bus driven by disk data register KDATA input diff --git a/src/devices/cpu/alto2/a2ether.cpp b/src/devices/cpu/alto2/a2ether.cpp index 5ed7f9b9107..883259d7445 100644 --- a/src/devices/cpu/alto2/a2ether.cpp +++ b/src/devices/cpu/alto2/a2ether.cpp @@ -483,7 +483,7 @@ uint32_t f9401_7(uint32_t crc, uint32_t data) * This is probably lacking the updates to one or more of * the status flip flops. */ -void alto2_cpu_device::rx_breath_of_life(void* ptr, int32_t arg) +void alto2_cpu_device::rx_breath_of_life(int32_t arg) { uint32_t data; @@ -533,7 +533,7 @@ void alto2_cpu_device::rx_breath_of_life(void* ptr, int32_t arg) * @param ptr unused pointer * @param arg word count if >= 0, -1 if CRC is to be transmitted (last word) */ -void alto2_cpu_device::tx_packet(void* ptr, int32_t arg) +void alto2_cpu_device::tx_packet(int32_t arg) { uint32_t data; diff --git a/src/devices/cpu/alto2/alto2cpu.cpp b/src/devices/cpu/alto2/alto2cpu.cpp index 98cba1502d1..5d093a96966 100644 --- a/src/devices/cpu/alto2/alto2cpu.cpp +++ b/src/devices/cpu/alto2/alto2cpu.cpp @@ -2286,7 +2286,7 @@ void alto2_cpu_device::execute_run() * the bitclk sequence by leaving m_bitclk_time at -1. */ m_bitclk_time -= ucycle; - disk_bitclk(nullptr, m_bitclk_index); + disk_bitclk(m_bitclk_index); } m_mpc = m_next; // next instruction's micro program counter diff --git a/src/devices/cpu/arm7/upd800468.cpp b/src/devices/cpu/arm7/upd800468.cpp index 6a3869c4bd3..edf483eef6e 100644 --- a/src/devices/cpu/arm7/upd800468.cpp +++ b/src/devices/cpu/arm7/upd800468.cpp @@ -74,7 +74,7 @@ void upd800468_timer_device::device_reset() m_rate = m_control = 0; } -void upd800468_timer_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void upd800468_timer_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (BIT(m_control, 0)) m_irq_cb(1); diff --git a/src/devices/cpu/arm7/upd800468.h b/src/devices/cpu/arm7/upd800468.h index 3d78560ab9b..6e9a5db4ae3 100644 --- a/src/devices/cpu/arm7/upd800468.h +++ b/src/devices/cpu/arm7/upd800468.h @@ -32,7 +32,7 @@ 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; private: devcb_write_line m_irq_cb; diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp index 10b5ec73dd4..b4af929eca7 100644 --- a/src/devices/cpu/cop400/cop400.cpp +++ b/src/devices/cpu/cop400/cop400.cpp @@ -1062,7 +1062,7 @@ void cop400_cpu_device::inil_tick() INITIALIZATION ***************************************************************************/ -void cop400_cpu_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cop400_cpu_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/cpu/cop400/cop400.h b/src/devices/cpu/cop400/cop400.h index 72bbf4ce5c9..982acadb199 100644 --- a/src/devices/cpu/cop400/cop400.h +++ b/src/devices/cpu/cop400/cop400.h @@ -73,7 +73,7 @@ enum cop400_cko_bond { class cop400_cpu_device : public cpu_device { public: - 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; // L pins: 8-bit bi-directional auto read_l() { return m_read_l.bind(); } diff --git a/src/devices/cpu/h8/h8_sci.cpp b/src/devices/cpu/h8/h8_sci.cpp index 0d73b82bf81..9faaefa08d8 100644 --- a/src/devices/cpu/h8/h8_sci.cpp +++ b/src/devices/cpu/h8/h8_sci.cpp @@ -309,7 +309,7 @@ void h8_sci_device::device_reset() cur_sync_time = attotime::never; } -void h8_sci_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void h8_sci_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // Used only to force system-wide syncs } diff --git a/src/devices/cpu/h8/h8_sci.h b/src/devices/cpu/h8/h8_sci.h index bf3d5b8bcbb..b2a2e575738 100644 --- a/src/devices/cpu/h8/h8_sci.h +++ b/src/devices/cpu/h8/h8_sci.h @@ -122,7 +122,7 @@ 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; void clock_start(int mode); void clock_stop(int mode); diff --git a/src/devices/cpu/hd61700/hd61700.cpp b/src/devices/cpu/hd61700/hd61700.cpp index 95f61dc6e84..b00356e404a 100644 --- a/src/devices/cpu/hd61700/hd61700.cpp +++ b/src/devices/cpu/hd61700/hd61700.cpp @@ -230,7 +230,7 @@ void hd61700_cpu_device::device_reset() //------------------------------------------------- // device_timer - handler timer events //------------------------------------------------- -void hd61700_cpu_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hd61700_cpu_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/cpu/hd61700/hd61700.h b/src/devices/cpu/hd61700/hd61700.h index f11da04a4bd..d51247e7c13 100644 --- a/src/devices/cpu/hd61700/hd61700.h +++ b/src/devices/cpu/hd61700/hd61700.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) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; // device_execute_interface overrides virtual uint32_t execute_min_cycles() const noexcept override { return 1; } diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp index 0c15e41cbbc..388b08d938e 100644 --- a/src/devices/cpu/i86/i186.cpp +++ b/src/devices/cpu/i86/i186.cpp @@ -1199,7 +1199,7 @@ void i80186_cpu_device::external_int(uint16_t intno, int state) * *************************************/ -void i80186_cpu_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void i80186_cpu_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { @@ -1303,10 +1303,10 @@ void i80186_cpu_device::inc_timer(int which) if (t->control & 2) { if (t->count == ((t->control & 0x1000) ? t->maxB : t->maxA)) - device_timer(*t->int_timer, which, which, nullptr); + device_timer(*t->int_timer, which, which); } else if (t->count == t->maxA) - device_timer(*t->int_timer, which, which, nullptr); + device_timer(*t->int_timer, which, which); } void i80186_cpu_device::internal_timer_update(int which, int new_count, int new_maxA, int new_maxB, int new_control) diff --git a/src/devices/cpu/i86/i186.h b/src/devices/cpu/i86/i186.h index 1ef28afca6e..5d43d2a660e 100644 --- a/src/devices/cpu/i86/i186.h +++ b/src/devices/cpu/i86/i186.h @@ -65,7 +65,7 @@ protected: virtual void execute_run() 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 uint32_t execute_input_lines() const noexcept override { return 1; } virtual uint8_t fetch() override; uint32_t update_pc() { return m_pc = (m_sregs[CS] << 4) + m_ip; } diff --git a/src/devices/cpu/lc8670/lc8670.cpp b/src/devices/cpu/lc8670/lc8670.cpp index 4d03d6c5c0e..d4eea0572a6 100644 --- a/src/devices/cpu/lc8670/lc8670.cpp +++ b/src/devices/cpu/lc8670/lc8670.cpp @@ -332,7 +332,7 @@ void lc8670_cpu_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void lc8670_cpu_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void lc8670_cpu_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/cpu/lc8670/lc8670.h b/src/devices/cpu/lc8670/lc8670.h index 890472d689f..37904e6ebe9 100644 --- a/src/devices/cpu/lc8670/lc8670.h +++ b/src/devices/cpu/lc8670/lc8670.h @@ -93,7 +93,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_execute_interface overrides virtual uint32_t execute_min_cycles() const noexcept override { return 1; } diff --git a/src/devices/cpu/m6502/m3745x.cpp b/src/devices/cpu/m6502/m3745x.cpp index 2532e25d8ab..b591fdfcc1f 100644 --- a/src/devices/cpu/m6502/m3745x.cpp +++ b/src/devices/cpu/m6502/m3745x.cpp @@ -64,7 +64,7 @@ void m3745x_device::device_start() for (int i = 0; i < NUM_TIMERS; i++) { - m_timers[i] = timer_alloc(i, nullptr); + m_timers[i] = timer_alloc(i); } m740_device::device_start(); @@ -116,7 +116,7 @@ void m3745x_device::device_reset() m_last_all_ints = 0; } -void m3745x_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void m3745x_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/cpu/m6502/m3745x.h b/src/devices/cpu/m6502/m3745x.h index 73e16cb0117..6036362765b 100644 --- a/src/devices/cpu/m6502/m3745x.h +++ b/src/devices/cpu/m6502/m3745x.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; virtual space_config_vector memory_space_config() const override; // device_execute_interface overrides diff --git a/src/devices/cpu/m6502/m5074x.cpp b/src/devices/cpu/m6502/m5074x.cpp index deb79eb0585..251902f3f0f 100644 --- a/src/devices/cpu/m6502/m5074x.cpp +++ b/src/devices/cpu/m6502/m5074x.cpp @@ -71,7 +71,7 @@ void m5074x_device::device_start() for (int i = 0; i < NUM_TIMERS; i++) { - m_timers[i] = timer_alloc(i, nullptr); + m_timers[i] = timer_alloc(i); } m740_device::device_start(); @@ -122,7 +122,7 @@ void m5074x_device::device_reset() m_tmr1 = m_tmr2 = m_tmrx = 0; } -void m5074x_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void m5074x_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -607,7 +607,7 @@ void m50753_device::execute_set_input(int inputnum, int state) recalc_irqs(); } -void m50753_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void m50753_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -623,7 +623,7 @@ void m50753_device::device_timer(emu_timer &timer, device_timer_id id, int param break; default: - m5074x_device::device_timer(timer, id, param, ptr); + m5074x_device::device_timer(timer, id, param); break; } } diff --git a/src/devices/cpu/m6502/m5074x.h b/src/devices/cpu/m6502/m5074x.h index b7ce310bd6e..72b7f918e3f 100644 --- a/src/devices/cpu/m6502/m5074x.h +++ b/src/devices/cpu/m6502/m5074x.h @@ -56,7 +56,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 space_config_vector memory_space_config() const override; // device_execute_interface overrides (TODO: /8 in M50740A/41/52/57/58 SLW mode) @@ -128,7 +128,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 execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/melps4/m58846.cpp b/src/devices/cpu/melps4/m58846.cpp index 436dd312512..8cfe8f1deed 100644 --- a/src/devices/cpu/melps4/m58846.cpp +++ b/src/devices/cpu/melps4/m58846.cpp @@ -66,7 +66,7 @@ void m58846_device::reset_timer() m_timer->adjust(base); } -void m58846_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void m58846_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id != 0) return; diff --git a/src/devices/cpu/melps4/m58846.h b/src/devices/cpu/melps4/m58846.h index 63ead8d7a60..157f0ea99b0 100644 --- a/src/devices/cpu/melps4/m58846.h +++ b/src/devices/cpu/melps4/m58846.h @@ -30,7 +30,7 @@ protected: virtual void execute_one() override; // timers - 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 write_v(uint8_t data) override; void data_128x4(address_map &map); diff --git a/src/devices/cpu/powerpc/ppccom.cpp b/src/devices/cpu/powerpc/ppccom.cpp index f94240490d7..450b89ae643 100644 --- a/src/devices/cpu/powerpc/ppccom.cpp +++ b/src/devices/cpu/powerpc/ppccom.cpp @@ -1150,7 +1150,7 @@ void ppc_device::device_reset() m_dec_zero_cycles = total_cycles(); if (m_tb_divisor) { - decrementer_int_callback(nullptr, 0); + decrementer_int_callback(0); } } @@ -1834,9 +1834,9 @@ void ppc_device::ppccom_execute_mtspr() case SPR4XX_TCR: m_core->spr[SPR4XX_TCR] = m_core->param1 | (oldval & PPC4XX_TCR_WRC_MASK); if ((oldval ^ m_core->spr[SPR4XX_TCR]) & PPC4XX_TCR_FIE) - ppc4xx_fit_callback(nullptr, false); + ppc4xx_fit_callback(false); if ((oldval ^ m_core->spr[SPR4XX_TCR]) & PPC4XX_TCR_PIE) - ppc4xx_pit_callback(nullptr, false); + ppc4xx_pit_callback(false); return; /* timer status register */ @@ -1849,7 +1849,7 @@ void ppc_device::ppccom_execute_mtspr() case SPR4XX_PIT: m_core->spr[SPR4XX_PIT] = m_core->param1; m_pit_reload = m_core->param1; - ppc4xx_pit_callback(nullptr, false); + ppc4xx_pit_callback(false); return; /* timebase */ diff --git a/src/devices/cpu/psx/dma.cpp b/src/devices/cpu/psx/dma.cpp index 36078c5b499..0b69e01df37 100644 --- a/src/devices/cpu/psx/dma.cpp +++ b/src/devices/cpu/psx/dma.cpp @@ -196,7 +196,7 @@ void psxdma_device::dma_finished( int index ) dma_stop_timer( index ); } -void psxdma_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void psxdma_device::device_timer(emu_timer &timer, device_timer_id id, int param) { dma_finished(id); } diff --git a/src/devices/cpu/psx/dma.h b/src/devices/cpu/psx/dma.h index 1bd743614b2..96c6aebf46b 100644 --- a/src/devices/cpu/psx/dma.h +++ b/src/devices/cpu/psx/dma.h @@ -39,7 +39,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: struct psx_dma_channel diff --git a/src/devices/cpu/psx/rcnt.cpp b/src/devices/cpu/psx/rcnt.cpp index 37932db2d8d..590cb49bde0 100644 --- a/src/devices/cpu/psx/rcnt.cpp +++ b/src/devices/cpu/psx/rcnt.cpp @@ -227,7 +227,7 @@ void psxrcnt_device::root_timer_adjust( int n_counter ) } } -void psxrcnt_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void psxrcnt_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int n_counter = id; psx_root *root = &root_counter[ n_counter ]; diff --git a/src/devices/cpu/psx/rcnt.h b/src/devices/cpu/psx/rcnt.h index 4e44e365466..dd9b1a3cc89 100644 --- a/src/devices/cpu/psx/rcnt.h +++ b/src/devices/cpu/psx/rcnt.h @@ -41,7 +41,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: struct psx_root diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp index 2fac592bb59..fe3fef083f6 100644 --- a/src/devices/cpu/psx/sio.cpp +++ b/src/devices/cpu/psx/sio.cpp @@ -138,7 +138,7 @@ void psxsio_device::sio_timer_adjust() m_timer->adjust( n_time ); } -void psxsio_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void psxsio_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { verboselog( *this, 2, "sio tick\n" ); diff --git a/src/devices/cpu/psx/sio.h b/src/devices/cpu/psx/sio.h index 3662ea01a53..940b7737c46 100644 --- a/src/devices/cpu/psx/sio.h +++ b/src/devices/cpu/psx/sio.h @@ -54,7 +54,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_post_load() override; private: diff --git a/src/devices/cpu/tlcs90/tlcs90.cpp b/src/devices/cpu/tlcs90/tlcs90.cpp index a8392f698b0..f81f94ea5e5 100644 --- a/src/devices/cpu/tlcs90/tlcs90.cpp +++ b/src/devices/cpu/tlcs90/tlcs90.cpp @@ -2806,7 +2806,7 @@ TIMER_CALLBACK_MEMBER( tlcs90_device::t90_timer_callback ) if(i & 1) break; if ( (m_tclk & (0x0C << (i * 2))) == 0 ) // T0/T1 match signal clocks T1/T3 - t90_timer_callback(ptr, i+1); + t90_timer_callback(i+1); break; case 0x01: // 16bit, only can happen for i=0,2 m_timer_value[i+1] = 0; diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp index 3d9d1a20a30..7f88768552d 100644 --- a/src/devices/cpu/tms34010/tms34010.cpp +++ b/src/devices/cpu/tms34010/tms34010.cpp @@ -1023,7 +1023,7 @@ TIMER_CALLBACK_MEMBER( tms340x0_device::scanline_callback ) if (enabled && vcount == SMART_IOREG(DPYINT)) { /* generate the display interrupt signal */ - internal_interrupt_callback(nullptr, TMS34010_DI); + internal_interrupt_callback(TMS34010_DI); } /* at the start of VBLANK, load the starting display address */ diff --git a/src/devices/imagedev/avivideo.cpp b/src/devices/imagedev/avivideo.cpp index 0c3559a127a..5c6742d8a6e 100644 --- a/src/devices/imagedev/avivideo.cpp +++ b/src/devices/imagedev/avivideo.cpp @@ -58,7 +58,7 @@ void avivideo_image_device::device_reset() m_frame_num = 0; } -void avivideo_image_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void avivideo_image_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_FRAME) { diff --git a/src/devices/imagedev/avivideo.h b/src/devices/imagedev/avivideo.h index 0d1c4a26f2d..b32a32d8bbe 100644 --- a/src/devices/imagedev/avivideo.h +++ b/src/devices/imagedev/avivideo.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) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; private: static constexpr device_timer_id TIMER_FRAME = 0; diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index 180e736fea6..9dc6c765e93 100644 --- a/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp @@ -534,7 +534,7 @@ void floppy_image_device::device_reset() cache_clear(); } -void floppy_image_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void floppy_image_device::device_timer(emu_timer &timer, device_timer_id id, int param) { index_resync(); } diff --git a/src/devices/imagedev/floppy.h b/src/devices/imagedev/floppy.h index b68c7327f1d..9aaf9c6020e 100644 --- a/src/devices/imagedev/floppy.h +++ b/src/devices/imagedev/floppy.h @@ -170,7 +170,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_config_complete() override; virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/imagedev/mfmhd.cpp b/src/devices/imagedev/mfmhd.cpp index f309b8f0d0f..a766aafdca7 100644 --- a/src/devices/imagedev/mfmhd.cpp +++ b/src/devices/imagedev/mfmhd.cpp @@ -620,7 +620,7 @@ attotime mfm_harddisk_device::track_end_time() return endtime; } -void mfm_harddisk_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mfm_harddisk_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/imagedev/mfmhd.h b/src/devices/imagedev/mfmhd.h index bb5d8493f97..50327f48372 100644 --- a/src/devices/imagedev/mfmhd.h +++ b/src/devices/imagedev/mfmhd.h @@ -107,10 +107,10 @@ public: protected: mfm_harddisk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - void device_start() override; - void device_stop() override; - void device_reset() override; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_start() override; + virtual void device_stop() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; std::string tts(const attotime &t); diff --git a/src/devices/imagedev/microdrv.cpp b/src/devices/imagedev/microdrv.cpp index 000cca82b78..aecaee95f81 100644 --- a/src/devices/imagedev/microdrv.cpp +++ b/src/devices/imagedev/microdrv.cpp @@ -106,7 +106,7 @@ void microdrive_image_device::call_unload() memset(m_right.get(), 0, MDV_IMAGE_LENGTH / 2); } -void microdrive_image_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void microdrive_image_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_bit_offset++; diff --git a/src/devices/imagedev/microdrv.h b/src/devices/imagedev/microdrv.h index 09b0cd193fd..92432051411 100644 --- a/src/devices/imagedev/microdrv.h +++ b/src/devices/imagedev/microdrv.h @@ -60,7 +60,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: devcb_write_line m_write_comms_out; diff --git a/src/devices/imagedev/midiin.cpp b/src/devices/imagedev/midiin.cpp index 84b9bfbfd0a..7ee14882a2d 100644 --- a/src/devices/imagedev/midiin.cpp +++ b/src/devices/imagedev/midiin.cpp @@ -94,7 +94,7 @@ void midiin_device::device_reset() device_timer -------------------------------------------------*/ -void midiin_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void midiin_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == 0) { diff --git a/src/devices/imagedev/midiin.h b/src/devices/imagedev/midiin.h index 40fe70b3ef6..4d65f8750fe 100644 --- a/src/devices/imagedev/midiin.h +++ b/src/devices/imagedev/midiin.h @@ -50,7 +50,7 @@ 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; // serial overrides virtual void tra_complete() override; // Tx completed sending byte diff --git a/src/devices/machine/53c7xx.cpp b/src/devices/machine/53c7xx.cpp index 40c481a448f..7c15d1edee8 100644 --- a/src/devices/machine/53c7xx.cpp +++ b/src/devices/machine/53c7xx.cpp @@ -760,7 +760,7 @@ void ncr53c7xx_device::recv_byte() // state machine //------------------------------------------------- -void ncr53c7xx_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ncr53c7xx_device::device_timer(emu_timer &timer, device_timer_id id, int param) { step(true); } diff --git a/src/devices/machine/53c7xx.h b/src/devices/machine/53c7xx.h index 5adae84d790..91999bf7b75 100644 --- a/src/devices/machine/53c7xx.h +++ b/src/devices/machine/53c7xx.h @@ -35,7 +35,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 execute_run() override; int m_icount; diff --git a/src/devices/machine/64h156.cpp b/src/devices/machine/64h156.cpp index 2e9d70b2c5f..29e343521c1 100644 --- a/src/devices/machine/64h156.cpp +++ b/src/devices/machine/64h156.cpp @@ -133,7 +133,7 @@ void c64h156_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void c64h156_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void c64h156_device::device_timer(emu_timer &timer, device_timer_id id, int param) { live_sync(); live_run(); diff --git a/src/devices/machine/64h156.h b/src/devices/machine/64h156.h index c8ef50cc3ea..b5ee42035d1 100644 --- a/src/devices/machine/64h156.h +++ b/src/devices/machine/64h156.h @@ -108,7 +108,7 @@ protected: virtual void device_start() override; virtual void device_clock_changed() 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/machine/6522via.cpp b/src/devices/machine/6522via.cpp index f37666b519a..4484cb86490 100644 --- a/src/devices/machine/6522via.cpp +++ b/src/devices/machine/6522via.cpp @@ -480,7 +480,7 @@ void via6522_device::shift_in() m_shift_counter = (m_shift_counter - 1) & 0x0f; // Count all edges } -void via6522_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void via6522_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/6522via.h b/src/devices/machine/6522via.h index 013438f3ca7..c31c8fbbff2 100644 --- a/src/devices/machine/6522via.h +++ b/src/devices/machine/6522via.h @@ -123,7 +123,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: static constexpr device_timer_id TIMER_SHIFT = 0; diff --git a/src/devices/machine/6532riot.cpp b/src/devices/machine/6532riot.cpp index 1d4e4845e68..4afac5fcd2a 100644 --- a/src/devices/machine/6532riot.cpp +++ b/src/devices/machine/6532riot.cpp @@ -502,7 +502,7 @@ void riot6532_device::device_reset() m_timer->adjust(attotime::from_ticks(256 << m_timershift, clock())); } -void riot6532_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void riot6532_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/6532riot.h b/src/devices/machine/6532riot.h index e551247d7fa..a14de90483a 100644 --- a/src/devices/machine/6532riot.h +++ b/src/devices/machine/6532riot.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; virtual void device_post_load() override { } virtual void device_clock_changed() override { } diff --git a/src/devices/machine/68230pit.cpp b/src/devices/machine/68230pit.cpp index b6979d5942a..0512464a3ab 100644 --- a/src/devices/machine/68230pit.cpp +++ b/src/devices/machine/68230pit.cpp @@ -241,7 +241,7 @@ void pit68230_device::tick_clock() //------------------------------------------------- // device_timer - handler timer events //------------------------------------------------- -void pit68230_device::device_timer (emu_timer &timer, device_timer_id id, int32_t param, void *ptr) +void pit68230_device::device_timer (emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/machine/68230pit.h b/src/devices/machine/68230pit.h index 72f6e94d373..560006e3b18 100644 --- a/src/devices/machine/68230pit.h +++ b/src/devices/machine/68230pit.h @@ -279,7 +279,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; // Interrupt methods void trigger_interrupt(int source); diff --git a/src/devices/machine/68307tmu.cpp b/src/devices/machine/68307tmu.cpp index 06d9f57234d..474dd2ef19b 100644 --- a/src/devices/machine/68307tmu.cpp +++ b/src/devices/machine/68307tmu.cpp @@ -99,26 +99,24 @@ void m68307_cpu_device::m68307_internal_timer_w(offs_t offset, uint16_t data, ui TIMER_CALLBACK_MEMBER(m68307_cpu_device::m68307_timer::timer0_callback ) { - m68307_cpu_device* m68k = (m68307_cpu_device *)ptr; - single_timer* tptr = &m68k->m_m68307TIMER->singletimer[0]; + single_timer* tptr = &parent->m_m68307TIMER->singletimer[0]; tptr->regs[m68307TIMER_TER] |= 0x2; if (BIT(tptr->regs[m68307TIMER_TMR], 4)) - m68k->timer0_interrupt(1); + parent->timer0_interrupt(1); - tptr->mametimer->adjust(m68k->cycles_to_attotime(20000)); + tptr->mametimer->adjust(parent->cycles_to_attotime(20000)); } TIMER_CALLBACK_MEMBER(m68307_cpu_device::m68307_timer::timer1_callback ) { - m68307_cpu_device* m68k = (m68307_cpu_device *)ptr; - single_timer* tptr = &m68k->m_m68307TIMER->singletimer[1]; + single_timer* tptr = &parent->m_m68307TIMER->singletimer[1]; tptr->regs[m68307TIMER_TER] |= 0x2; if (BIT(tptr->regs[m68307TIMER_TMR], 4)) - m68k->timer1_interrupt(1); + parent->timer1_interrupt(1); - tptr->mametimer->adjust(m68k->cycles_to_attotime(20000)); + tptr->mametimer->adjust(parent->cycles_to_attotime(20000)); } @@ -134,12 +132,12 @@ void m68307_cpu_device::m68307_timer::init(m68307_cpu_device *device) single_timer* tptr; tptr = &singletimer[0]; - tptr->mametimer = device->machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(m68307_timer::timer0_callback),this), parent); + tptr->mametimer = device->machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(m68307_timer::timer0_callback),this)); tptr = &singletimer[1]; - tptr->mametimer = device->machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(m68307_timer::timer1_callback),this), parent); + tptr->mametimer = device->machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(m68307_timer::timer1_callback),this)); - wd_mametimer = device->machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(m68307_timer::wd_timer_callback),this), parent); + wd_mametimer = device->machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(m68307_timer::wd_timer_callback),this)); } uint16_t m68307_cpu_device::m68307_timer::read_tcn(uint16_t mem_mask, int which) diff --git a/src/devices/machine/6840ptm.cpp b/src/devices/machine/6840ptm.cpp index 21d8c0d80e9..9d37533917a 100644 --- a/src/devices/machine/6840ptm.cpp +++ b/src/devices/machine/6840ptm.cpp @@ -166,7 +166,7 @@ void ptm6840_device::device_resolve_objects() // device_timer - handle timer callbacks //------------------------------------------------- -void ptm6840_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ptm6840_device::device_timer(emu_timer &timer, device_timer_id id, int param) { timeout(id); } diff --git a/src/devices/machine/6840ptm.h b/src/devices/machine/6840ptm.h index 6836aa5d317..249b71f0bba 100644 --- a/src/devices/machine/6840ptm.h +++ b/src/devices/machine/6840ptm.h @@ -59,7 +59,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_resolve_objects() 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: void subtract_from_counter(int counter, int count); diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp index c86a44a1f0a..cfc2a0f6e0f 100644 --- a/src/devices/machine/8042kbdc.cpp +++ b/src/devices/machine/8042kbdc.cpp @@ -223,7 +223,7 @@ void kbdc8042_device::at_8042_clear_keyboard_received() m_mouse.received = 0; } -void kbdc8042_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void kbdc8042_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_UPDATE) { diff --git a/src/devices/machine/8042kbdc.h b/src/devices/machine/8042kbdc.h index d28c17c9cf8..698a521a9f0 100644 --- a/src/devices/machine/8042kbdc.h +++ b/src/devices/machine/8042kbdc.h @@ -64,7 +64,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) 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 ioport_constructor device_input_ports() const override; void mouse_enqueue(uint8_t value); diff --git a/src/devices/machine/8364_paula.cpp b/src/devices/machine/8364_paula.cpp index 83c4f033661..33b80a78714 100644 --- a/src/devices/machine/8364_paula.cpp +++ b/src/devices/machine/8364_paula.cpp @@ -199,7 +199,7 @@ void paula_8364_device::dma_reload(audio_channel *chan, bool startup) if (startup) chan->irq_timer->adjust(attotime::from_hz(15750), chan->index); // clock() / 227 else - signal_irq(nullptr, chan->index); + signal_irq(chan->index); LOG("dma_reload(%d): offs=%06X len=%04X\n", chan->index, chan->curlocation, chan->curlength); } @@ -357,7 +357,7 @@ void paula_8364_device::sound_stream_update(sound_stream &stream, std::vector<re // if we're in manual mode, signal an interrupt once we latch the low byte if (!chan->dma_enabled && chan->manualmode && (chan->curlocation & 1)) { - signal_irq(nullptr, channum); + signal_irq(channum); chan->manualmode = false; } } diff --git a/src/devices/machine/8530scc.cpp b/src/devices/machine/8530scc.cpp index c331037d0a1..0bdff03073e 100644 --- a/src/devices/machine/8530scc.cpp +++ b/src/devices/machine/8530scc.cpp @@ -114,7 +114,7 @@ void scc8530_legacy_device::resetchannel(int ch) scc8530_baud_expire - baud rate timer expiry -------------------------------------------------*/ -void scc8530_legacy_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void scc8530_legacy_device::device_timer(emu_timer &timer, device_timer_id id, int param) { Chan *pChan = &channel[id]; int brconst = pChan->reg_val[13]<<8 | pChan->reg_val[14]; diff --git a/src/devices/machine/8530scc.h b/src/devices/machine/8530scc.h index 4a706df22a0..29b7c138226 100644 --- a/src/devices/machine/8530scc.h +++ b/src/devices/machine/8530scc.h @@ -46,7 +46,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; private: struct Chan { diff --git a/src/devices/machine/acorn_vidc.cpp b/src/devices/machine/acorn_vidc.cpp index 2179c64d787..df95dba9079 100644 --- a/src/devices/machine/acorn_vidc.cpp +++ b/src/devices/machine/acorn_vidc.cpp @@ -218,7 +218,7 @@ void acorn_vidc10_device::device_reset() // device_timer - device-specific timer //------------------------------------------------- -void acorn_vidc10_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void acorn_vidc10_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -625,9 +625,9 @@ void arm_vidc20_device::device_reset() m_vco_v_modulo = 1; } -void arm_vidc20_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void arm_vidc20_device::device_timer(emu_timer &timer, device_timer_id id, int param) { - acorn_vidc10_device::device_timer(timer, id, param, ptr); + acorn_vidc10_device::device_timer(timer, id, param); } inline void arm_vidc20_device::update_8bpp_palette(u16 index, u32 paldata) diff --git a/src/devices/machine/acorn_vidc.h b/src/devices/machine/acorn_vidc.h index 682e4d58a1c..5b68aefc559 100644 --- a/src/devices/machine/acorn_vidc.h +++ b/src/devices/machine/acorn_vidc.h @@ -56,7 +56,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 space_config_vector memory_space_config() const override; u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); virtual u32 get_pixel_clock(); @@ -163,7 +163,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_config_complete() 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; u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); virtual u32 get_pixel_clock() override; diff --git a/src/devices/machine/adc0808.cpp b/src/devices/machine/adc0808.cpp index 3988254dc71..eb8c62435b7 100644 --- a/src/devices/machine/adc0808.cpp +++ b/src/devices/machine/adc0808.cpp @@ -99,7 +99,7 @@ void adc0808_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void adc0808_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void adc0808_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (m_state) { diff --git a/src/devices/machine/adc0808.h b/src/devices/machine/adc0808.h index 296921c1271..5fd14efdf3e 100644 --- a/src/devices/machine/adc0808.h +++ b/src/devices/machine/adc0808.h @@ -65,7 +65,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; private: // callbacks diff --git a/src/devices/machine/adc0844.cpp b/src/devices/machine/adc0844.cpp index c3616035927..a4e3ce04809 100644 --- a/src/devices/machine/adc0844.cpp +++ b/src/devices/machine/adc0844.cpp @@ -103,7 +103,7 @@ uint8_t adc0844_device::clamp(int value) // device_timer - handler timer events //------------------------------------------------- -void adc0844_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void adc0844_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (m_channel) { @@ -132,7 +132,7 @@ void adc0844_device::device_timer(emu_timer &timer, device_timer_id id, int para m_intr_cb(ASSERT_LINE); } -void adc0848_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void adc0848_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (m_channel) { diff --git a/src/devices/machine/adc0844.h b/src/devices/machine/adc0844.h index 51dff681f16..b8080e73d8d 100644 --- a/src/devices/machine/adc0844.h +++ b/src/devices/machine/adc0844.h @@ -51,7 +51,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; uint8_t clamp(int value); @@ -83,7 +83,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: devcb_read8 m_ch5_cb, m_ch6_cb, m_ch7_cb, m_ch8_cb; diff --git a/src/devices/machine/aicartc.cpp b/src/devices/machine/aicartc.cpp index 0f8ad30c283..bd5f4c198d8 100644 --- a/src/devices/machine/aicartc.cpp +++ b/src/devices/machine/aicartc.cpp @@ -111,7 +111,7 @@ void aicartc_device::device_reset() //------------------------------------------------- -void aicartc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void aicartc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_rtc_tick++; if(m_rtc_tick & 0x8000) diff --git a/src/devices/machine/aicartc.h b/src/devices/machine/aicartc.h index 6af901ac363..512d567f13b 100644 --- a/src/devices/machine/aicartc.h +++ b/src/devices/machine/aicartc.h @@ -33,7 +33,7 @@ protected: virtual void device_validity_check(validity_checker &valid) 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_rtc_interface overrides virtual bool rtc_feature_y2k() const override { return true; } diff --git a/src/devices/machine/am2910.cpp b/src/devices/machine/am2910.cpp index f3b425d86cb..eaca32a34d8 100644 --- a/src/devices/machine/am2910.cpp +++ b/src/devices/machine/am2910.cpp @@ -86,7 +86,7 @@ void am2910_device::device_reset() m_execute_timer->adjust(attotime::from_hz(clock()), 0, attotime::from_hz(clock())); } -void am2910_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void am2910_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_CLOCK) { diff --git a/src/devices/machine/am2910.h b/src/devices/machine/am2910.h index b304d7a09a9..6ff5047014c 100644 --- a/src/devices/machine/am2910.h +++ b/src/devices/machine/am2910.h @@ -42,7 +42,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; static constexpr device_timer_id TIMER_CLOCK = 0; diff --git a/src/devices/machine/am53cf96.cpp b/src/devices/machine/am53cf96.cpp index 891f43f680b..9d1171c3f66 100644 --- a/src/devices/machine/am53cf96.cpp +++ b/src/devices/machine/am53cf96.cpp @@ -47,7 +47,7 @@ uint8_t am53cf96_device::read(offs_t offset) return rv; } -void am53cf96_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void am53cf96_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { scsi_regs[REG_IRQSTATE] = 8; // indicate success scsi_regs[REG_STATUS] |= 0x80; // indicate IRQ diff --git a/src/devices/machine/am53cf96.h b/src/devices/machine/am53cf96.h index d9b2ce1aab4..989da69d4c6 100644 --- a/src/devices/machine/am53cf96.h +++ b/src/devices/machine/am53cf96.h @@ -51,7 +51,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; private: static constexpr device_timer_id TIMER_TRANSFER = 0; diff --git a/src/devices/machine/am79c90.cpp b/src/devices/machine/am79c90.cpp index bfa1aad78e5..38da531a2cd 100644 --- a/src/devices/machine/am79c90.cpp +++ b/src/devices/machine/am79c90.cpp @@ -302,7 +302,7 @@ void am7990_device_base::recv_complete_cb(int result) update_interrupts(); } -void am7990_device_base::transmit_poll(void *ptr, s32 param) +void am7990_device_base::transmit_poll(s32 param) { // check transmitter enabled if (m_csr[0] & CSR0_TXON) diff --git a/src/devices/machine/am9513.cpp b/src/devices/machine/am9513.cpp index 9e6a661b18b..c22eb0fc735 100644 --- a/src/devices/machine/am9513.cpp +++ b/src/devices/machine/am9513.cpp @@ -232,7 +232,7 @@ void am9513_device::device_clock_changed() // fires //------------------------------------------------- -void am9513_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void am9513_device::device_timer(emu_timer &timer, device_timer_id id, int param) { assert(id >= TIMER_F1 && id <= TIMER_F5); diff --git a/src/devices/machine/am9513.h b/src/devices/machine/am9513.h index 0ea22285b4e..78e54799363 100644 --- a/src/devices/machine/am9513.h +++ b/src/devices/machine/am9513.h @@ -93,7 +93,7 @@ protected: // device-level overrides virtual void device_start() 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: // internal helpers diff --git a/src/devices/machine/am9519.cpp b/src/devices/machine/am9519.cpp index be0b8c3da10..64d36a8acaa 100644 --- a/src/devices/machine/am9519.cpp +++ b/src/devices/machine/am9519.cpp @@ -11,7 +11,7 @@ //#define VERBOSE (LOG_GENERAL) #include "logmacro.h" -void am9519_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void am9519_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(!BIT(m_mode, 7)) // chip disabled return; diff --git a/src/devices/machine/am9519.h b/src/devices/machine/am9519.h index ec84cd50e52..9de7746b4c7 100644 --- a/src/devices/machine/am9519.h +++ b/src/devices/machine/am9519.h @@ -57,7 +57,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: static constexpr device_timer_id TIMER_CHECK_IRQ = 0; diff --git a/src/devices/machine/amigafdc.cpp b/src/devices/machine/amigafdc.cpp index ad83a268039..dc288d1d191 100644 --- a/src/devices/machine/amigafdc.cpp +++ b/src/devices/machine/amigafdc.cpp @@ -474,7 +474,7 @@ uint16_t amiga_fdc_device::dskbytr_r() return res; } -void amiga_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void amiga_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { live_sync(); live_run(); diff --git a/src/devices/machine/amigafdc.h b/src/devices/machine/amigafdc.h index 2bb7b1aa628..b6623fca16f 100644 --- a/src/devices/machine/amigafdc.h +++ b/src/devices/machine/amigafdc.h @@ -37,7 +37,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; private: // Running states diff --git a/src/devices/machine/applefdc.cpp b/src/devices/machine/applefdc.cpp index da817ccb1d8..bd052d18263 100644 --- a/src/devices/machine/applefdc.cpp +++ b/src/devices/machine/applefdc.cpp @@ -158,7 +158,7 @@ void applefdc_base_device::device_reset(void) // device_timer - device-specific timer callbacks //------------------------------------------------- -void applefdc_base_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void applefdc_base_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/machine/applefdc.h b/src/devices/machine/applefdc.h index cf8f06f4cb9..30a2bb50fc2 100644 --- a/src/devices/machine/applefdc.h +++ b/src/devices/machine/applefdc.h @@ -83,7 +83,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; // other protecteds virtual void iwm_modereg_w(uint8_t data); diff --git a/src/devices/machine/arm_iomd.cpp b/src/devices/machine/arm_iomd.cpp index d6ce9557716..af71ab3f53a 100644 --- a/src/devices/machine/arm_iomd.cpp +++ b/src/devices/machine/arm_iomd.cpp @@ -326,7 +326,7 @@ void arm7500fe_iomd_device::device_reset() m_iolines_ddr = 0xff; } -void arm_iomd_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void arm_iomd_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/machine/arm_iomd.h b/src/devices/machine/arm_iomd.h index 482c06b8cbc..c7c98035e85 100644 --- a/src/devices/machine/arm_iomd.h +++ b/src/devices/machine/arm_iomd.h @@ -62,7 +62,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; void base_map(address_map &map); u16 m_id; diff --git a/src/devices/machine/at28c16.cpp b/src/devices/machine/at28c16.cpp index acbee4613eb..fdc7d5c93ec 100644 --- a/src/devices/machine/at28c16.cpp +++ b/src/devices/machine/at28c16.cpp @@ -224,7 +224,7 @@ WRITE_LINE_MEMBER( at28c16_device::set_oe_12v ) } -void at28c16_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void at28c16_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch( id ) { diff --git a/src/devices/machine/at28c16.h b/src/devices/machine/at28c16.h index 54c87fccb4f..bdb51c3a4d3 100644 --- a/src/devices/machine/at28c16.h +++ b/src/devices/machine/at28c16.h @@ -35,7 +35,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; // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/machine/at28c64b.cpp b/src/devices/machine/at28c64b.cpp index 5abd3e3485f..96302285f0c 100644 --- a/src/devices/machine/at28c64b.cpp +++ b/src/devices/machine/at28c64b.cpp @@ -268,7 +268,7 @@ WRITE_LINE_MEMBER( at28c64b_device::set_oe_12v ) } -void at28c64b_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void at28c64b_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch( id ) { diff --git a/src/devices/machine/at28c64b.h b/src/devices/machine/at28c64b.h index 994625bf42d..9a449d0510b 100644 --- a/src/devices/machine/at28c64b.h +++ b/src/devices/machine/at28c64b.h @@ -35,7 +35,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; // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/machine/at29x.cpp b/src/devices/machine/at29x.cpp index 3f31e44c0a8..7cc435d7033 100644 --- a/src/devices/machine/at29x.cpp +++ b/src/devices/machine/at29x.cpp @@ -135,7 +135,7 @@ void at29x_device::nvram_write(emu_file &file) /* Programming timer callback */ -void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (m_pgm) { diff --git a/src/devices/machine/at29x.h b/src/devices/machine/at29x.h index 265ef1587c2..a0188437c1f 100644 --- a/src/devices/machine/at29x.h +++ b/src/devices/machine/at29x.h @@ -29,7 +29,7 @@ protected: virtual void device_start(void) override; virtual void device_reset(void) override; virtual void device_stop(void) 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 nvram_default() override; void nvram_read(emu_file &file) override; diff --git a/src/devices/machine/busmouse.cpp b/src/devices/machine/busmouse.cpp index 2c06045d127..6734661b301 100644 --- a/src/devices/machine/busmouse.cpp +++ b/src/devices/machine/busmouse.cpp @@ -165,7 +165,7 @@ void bus_mouse_device::device_reset() LOG("irq rate: %d Hz\n", hz); } -void bus_mouse_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void bus_mouse_device::device_timer(emu_timer &timer, device_timer_id id, int param) { irq = !irq; diff --git a/src/devices/machine/busmouse.h b/src/devices/machine/busmouse.h index 787c80e399b..3f523946358 100644 --- a/src/devices/machine/busmouse.h +++ b/src/devices/machine/busmouse.h @@ -28,7 +28,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_add_mconfig(machine_config &config) override; // optional information overrides diff --git a/src/devices/machine/cdp1871.cpp b/src/devices/machine/cdp1871.cpp index 36ce4b77892..fe1980fe004 100644 --- a/src/devices/machine/cdp1871.cpp +++ b/src/devices/machine/cdp1871.cpp @@ -175,7 +175,7 @@ void cdp1871_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void cdp1871_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cdp1871_device::device_timer(emu_timer &timer, device_timer_id id, int param) { change_output_lines(); clock_scan_counters(); diff --git a/src/devices/machine/cdp1871.h b/src/devices/machine/cdp1871.h index 50c0aaefdc9..b6529479491 100644 --- a/src/devices/machine/cdp1871.h +++ b/src/devices/machine/cdp1871.h @@ -66,7 +66,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; void change_output_lines(); void clock_scan_counters(); diff --git a/src/devices/machine/cdp1879.cpp b/src/devices/machine/cdp1879.cpp index 1ecf168b3d5..8f9b8f6081c 100644 --- a/src/devices/machine/cdp1879.cpp +++ b/src/devices/machine/cdp1879.cpp @@ -64,7 +64,7 @@ void cdp1879_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void cdp1879_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cdp1879_device::device_timer(emu_timer &timer, device_timer_id id, int param) { advance_seconds(); diff --git a/src/devices/machine/cdp1879.h b/src/devices/machine/cdp1879.h index 2f2740df32a..7b839cc8d44 100644 --- a/src/devices/machine/cdp1879.h +++ b/src/devices/machine/cdp1879.h @@ -29,7 +29,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_rtc_interface overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; diff --git a/src/devices/machine/chessmachine.cpp b/src/devices/machine/chessmachine.cpp index cd80fce19e5..fa201f9b11e 100644 --- a/src/devices/machine/chessmachine.cpp +++ b/src/devices/machine/chessmachine.cpp @@ -73,7 +73,7 @@ void chessmachine_device::device_start() // external handlers //------------------------------------------------- -void chessmachine_device::sync0_callback(void *ptr, s32 param) +void chessmachine_device::sync0_callback(s32 param) { m_latch[0] = (m_latch[0] & 0x80) | param; } @@ -83,7 +83,7 @@ void chessmachine_device::data0_w(int state) machine().scheduler().synchronize(timer_expired_delegate(FUNC(chessmachine_device::sync0_callback), this), state ? 1 : 0); } -void chessmachine_device::sync1_callback(void *ptr, s32 param) +void chessmachine_device::sync1_callback(s32 param) { m_latch[0] = (m_latch[0] & 1) | param; diff --git a/src/devices/machine/chessmachine.h b/src/devices/machine/chessmachine.h index b1a11b459f1..561e95459a7 100644 --- a/src/devices/machine/chessmachine.h +++ b/src/devices/machine/chessmachine.h @@ -47,8 +47,8 @@ private: devcb_write_line m_data_out; u8 m_latch[2] = { 0, 0 }; - void sync0_callback(void *ptr, s32 param); - void sync1_callback(void *ptr, s32 param); + void sync0_callback(s32 param); + void sync1_callback(s32 param); bool m_bootrom_enabled = false; void install_bootrom(bool enable); diff --git a/src/devices/machine/clock.cpp b/src/devices/machine/clock.cpp index 4bd89fe791a..9c0fd67a3ef 100644 --- a/src/devices/machine/clock.cpp +++ b/src/devices/machine/clock.cpp @@ -67,7 +67,7 @@ void clock_device::output() } } -void clock_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void clock_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/clock.h b/src/devices/machine/clock.h index 176f823d738..27270653a32 100644 --- a/src/devices/machine/clock.h +++ b/src/devices/machine/clock.h @@ -26,7 +26,7 @@ public: protected: virtual void device_start() override; virtual void device_reset() override { output(); } - 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_clock_changed() override { reinit(); } private: diff --git a/src/devices/machine/com8116.cpp b/src/devices/machine/com8116.cpp index 9942234a640..5ad58710e85 100644 --- a/src/devices/machine/com8116.cpp +++ b/src/devices/machine/com8116.cpp @@ -174,7 +174,7 @@ void com8116_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void com8116_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void com8116_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/com8116.h b/src/devices/machine/com8116.h index c881d08312d..13131b85f41 100644 --- a/src/devices/machine/com8116.h +++ b/src/devices/machine/com8116.h @@ -63,7 +63,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 m_param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int m_param) override; private: enum diff --git a/src/devices/machine/cop452.cpp b/src/devices/machine/cop452.cpp index 09e31df2c82..7d1da25efe3 100644 --- a/src/devices/machine/cop452.cpp +++ b/src/devices/machine/cop452.cpp @@ -178,7 +178,7 @@ void cop452_device::device_reset() m_timers[ 1 ]->reset(); } -void cop452_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cop452_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (m_mode) { case MODE_DUAL_FREQ: diff --git a/src/devices/machine/cop452.h b/src/devices/machine/cop452.h index f4981be72f3..048c8c7d5cd 100644 --- a/src/devices/machine/cop452.h +++ b/src/devices/machine/cop452.h @@ -42,7 +42,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: // Index 0 is for "A" side, 1 is for "B" side diff --git a/src/devices/machine/corvushd.cpp b/src/devices/machine/corvushd.cpp index 07b959d9fba..190ece9e662 100644 --- a/src/devices/machine/corvushd.cpp +++ b/src/devices/machine/corvushd.cpp @@ -1317,7 +1317,7 @@ void corvus_hdc_device::corvus_process_command_packet(bool invalid_command_flag) // Returns: // Nothing // -void corvus_hdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void corvus_hdc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int function = param; diff --git a/src/devices/machine/corvushd.h b/src/devices/machine/corvushd.h index fddffa0e432..01af8f2bd52 100644 --- a/src/devices/machine/corvushd.h +++ b/src/devices/machine/corvushd.h @@ -37,7 +37,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: static constexpr unsigned MAX_COMMAND_SIZE = 4096; // The maximum size of a command packet (the controller only has 5K of RAM...) diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp index 5ff2decd5d5..9199ca5389e 100644 --- a/src/devices/machine/cr511b.cpp +++ b/src/devices/machine/cr511b.cpp @@ -71,7 +71,7 @@ void cr511b_device::device_start() m_scor_handler.resolve_safe(); m_xaen_handler.resolve_safe(); - m_frame_timer = timer_alloc(0, nullptr); + m_frame_timer = timer_alloc(0); m_frame_timer->adjust(attotime::never); } @@ -87,7 +87,7 @@ void cr511b_device::device_reset() // device_timer - device-specific timer events //------------------------------------------------- -void cr511b_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void cr511b_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { } diff --git a/src/devices/machine/cr511b.h b/src/devices/machine/cr511b.h index ab70be1eb9c..a2e4d7d1858 100644 --- a/src/devices/machine/cr511b.h +++ b/src/devices/machine/cr511b.h @@ -63,7 +63,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) 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/machine/cxd1185.cpp b/src/devices/machine/cxd1185.cpp index b599d307783..02602aeb527 100644 --- a/src/devices/machine/cxd1185.cpp +++ b/src/devices/machine/cxd1185.cpp @@ -482,7 +482,7 @@ void cxd1185_device::ioport_w(u8 data) m_port_out_cb(0, m_ioport & mask, mask); } -void cxd1185_device::state_timer(void *ptr, s32 param) +void cxd1185_device::state_timer(s32 param) { // step state machine int delay = state_step(); diff --git a/src/devices/machine/cxd1185.h b/src/devices/machine/cxd1185.h index a064c9e5c23..f1d6732b26d 100644 --- a/src/devices/machine/cxd1185.h +++ b/src/devices/machine/cxd1185.h @@ -62,7 +62,7 @@ protected: void ioport_w(u8 data); // state machine - void state_timer(void *ptr, s32 param); + void state_timer(s32 param); int state_step(); // other logic diff --git a/src/devices/machine/diablo_hd.cpp b/src/devices/machine/diablo_hd.cpp index 938173a945b..d0b71d58432 100644 --- a/src/devices/machine/diablo_hd.cpp +++ b/src/devices/machine/diablo_hd.cpp @@ -1317,7 +1317,7 @@ void diablo_hd_device::device_start() m_packs = 1; // FIXME: get from configuration? m_unit = strstr(m_image->tag(), "diablo0") ? 0 : 1; - m_timer = timer_alloc(1, nullptr); + m_timer = timer_alloc(1); } void diablo_hd_device::device_reset() @@ -1404,9 +1404,9 @@ void diablo_hd_device::device_reset() * @param id timer id * @param arg argument supplied to timer_insert (unused) */ -void diablo_hd_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void diablo_hd_device::device_timer(emu_timer &timer, device_timer_id id, int param) { - LOG_DRIVE(9,"[DHD%u] TIMER id=%d param=%d ptr=%p @%.0fns\n", m_unit, id, param, ptr, timer.elapsed().as_double() * ATTOSECONDS_PER_NANOSECOND); + LOG_DRIVE(9,"[DHD%u] TIMER id=%d param=%d @%.0fns\n", m_unit, id, param, timer.elapsed().as_double() * ATTOSECONDS_PER_NANOSECOND); if (!m_disk) return; diff --git a/src/devices/machine/diablo_hd.h b/src/devices/machine/diablo_hd.h index ea96d2c4c70..60809d3cf1a 100644 --- a/src/devices/machine/diablo_hd.h +++ b/src/devices/machine/diablo_hd.h @@ -67,7 +67,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 void device_add_mconfig(machine_config &config) override; private: diff --git a/src/devices/machine/dp83932c.cpp b/src/devices/machine/dp83932c.cpp index 092b3949ac2..ef50d8ed4e0 100644 --- a/src/devices/machine/dp83932c.cpp +++ b/src/devices/machine/dp83932c.cpp @@ -284,7 +284,7 @@ void dp83932c_device::reg_w(offs_t offset, u16 data) } } -void dp83932c_device::command(void *ptr, s32 param) +void dp83932c_device::command(s32 param) { if (param & CR_HTX) { diff --git a/src/devices/machine/dp83932c.h b/src/devices/machine/dp83932c.h index 054bb9e28cd..1b379bcceeb 100644 --- a/src/devices/machine/dp83932c.h +++ b/src/devices/machine/dp83932c.h @@ -33,7 +33,7 @@ protected: virtual void recv_complete_cb(int result) override; // command helpers - void command(void *ptr, s32 param); + void command(s32 param); void transmit(); void read_rra(bool command = false); void load_cam(); diff --git a/src/devices/machine/dp8573.cpp b/src/devices/machine/dp8573.cpp index d110ffa0656..529ed3d90fe 100644 --- a/src/devices/machine/dp8573.cpp +++ b/src/devices/machine/dp8573.cpp @@ -79,7 +79,7 @@ void dp8573_device::save_registers() m_ram[REG_SAVE_MONTH] = m_ram[REG_MONTH]; } -void dp8573_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void dp8573_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if ((m_pfr & PFR_OSF) || !(m_ram[REG_RTMR] & RTMR_CSS)) { diff --git a/src/devices/machine/dp8573.h b/src/devices/machine/dp8573.h index 1cb1300dedf..d86c6d2c63b 100644 --- a/src/devices/machine/dp8573.h +++ b/src/devices/machine/dp8573.h @@ -31,7 +31,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; // device_nvram_interface overrides virtual void nvram_default() override; diff --git a/src/devices/machine/ds1302.cpp b/src/devices/machine/ds1302.cpp index 0cdb5ea5242..e284e359e12 100644 --- a/src/devices/machine/ds1302.cpp +++ b/src/devices/machine/ds1302.cpp @@ -132,7 +132,7 @@ void ds1302_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void ds1302_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ds1302_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (!CLOCK_HALT) { diff --git a/src/devices/machine/ds1302.h b/src/devices/machine/ds1302.h index 5adc919cae9..8325e7bd21b 100644 --- a/src/devices/machine/ds1302.h +++ b/src/devices/machine/ds1302.h @@ -46,7 +46,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; // device_nvram_interface overrides virtual void nvram_default() override; diff --git a/src/devices/machine/ds1386.cpp b/src/devices/machine/ds1386.cpp index 4333a6bcc5c..cd3f601b0ea 100644 --- a/src/devices/machine/ds1386.cpp +++ b/src/devices/machine/ds1386.cpp @@ -199,7 +199,7 @@ void ds1386_device::watchdog_alarm() } } -void ds1386_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ds1386_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/ds1386.h b/src/devices/machine/ds1386.h index 0e994e436c9..3c28782a351 100644 --- a/src/devices/machine/ds1386.h +++ b/src/devices/machine/ds1386.h @@ -125,7 +125,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; // device_nvram_interface overrides virtual void nvram_default() override; diff --git a/src/devices/machine/ds1994.cpp b/src/devices/machine/ds1994.cpp index c63fdd0da15..3b9e9f0ebe9 100644 --- a/src/devices/machine/ds1994.cpp +++ b/src/devices/machine/ds1994.cpp @@ -353,7 +353,7 @@ void ds1994_device::ds1994_writemem(uint8_t value) /* */ /*************************************************/ -void ds1994_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ds1994_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/ds1994.h b/src/devices/machine/ds1994.h index a65f1b7d688..d624bef7dee 100644 --- a/src/devices/machine/ds1994.h +++ b/src/devices/machine/ds1994.h @@ -37,7 +37,7 @@ class ds1994_device : public device_t, public device_nvram_interface // 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_nvram_interface overrides virtual void nvram_default() override; diff --git a/src/devices/machine/ds2401.cpp b/src/devices/machine/ds2401.cpp index a5fea5b189b..4da3b923bbe 100644 --- a/src/devices/machine/ds2401.cpp +++ b/src/devices/machine/ds2401.cpp @@ -92,7 +92,7 @@ void ds2401_device::device_reset() memset(m_data, 0, SIZE_DATA); } -void ds2401_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ds2401_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/machine/ds2401.h b/src/devices/machine/ds2401.h index 8b74c603cf9..a78b7471a03 100644 --- a/src/devices/machine/ds2401.h +++ b/src/devices/machine/ds2401.h @@ -53,7 +53,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; // internal state int m_state, m_bit, m_shift; diff --git a/src/devices/machine/ds2404.cpp b/src/devices/machine/ds2404.cpp index 0b62e2dbbcf..7c5876ee9d0 100644 --- a/src/devices/machine/ds2404.cpp +++ b/src/devices/machine/ds2404.cpp @@ -317,7 +317,7 @@ void ds2404_device::clk_w(uint8_t data) } } -void ds2404_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ds2404_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/machine/ds2404.h b/src/devices/machine/ds2404.h index 3e31b5b14cc..b4cc69134c5 100644 --- a/src/devices/machine/ds2404.h +++ b/src/devices/machine/ds2404.h @@ -46,7 +46,7 @@ protected: virtual void nvram_read(emu_file &file) override; virtual void nvram_write(emu_file &file) 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: void rom_cmd(uint8_t cmd); diff --git a/src/devices/machine/e0516.cpp b/src/devices/machine/e0516.cpp index a5d029afe27..baa2751cb91 100644 --- a/src/devices/machine/e0516.cpp +++ b/src/devices/machine/e0516.cpp @@ -73,7 +73,7 @@ void e0516_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void e0516_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void e0516_device::device_timer(emu_timer &timer, device_timer_id id, int param) { advance_seconds(); } diff --git a/src/devices/machine/e0516.h b/src/devices/machine/e0516.h index 6e5d1b55779..8246974130d 100644 --- a/src/devices/machine/e0516.h +++ b/src/devices/machine/e0516.h @@ -38,7 +38,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; // device_rtc_interface overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; diff --git a/src/devices/machine/edlc.cpp b/src/devices/machine/edlc.cpp index 9fcc3be5fb5..87f42602828 100644 --- a/src/devices/machine/edlc.cpp +++ b/src/devices/machine/edlc.cpp @@ -258,7 +258,7 @@ void seeq8003_device::tx_command_w(u8 data) m_tx_command = data; } -void seeq8003_device::transmit(void *ptr, int param) +void seeq8003_device::transmit(int param) { if (m_tx_fifo.queue_length()) { @@ -333,7 +333,7 @@ int seeq8003_device::receive(u8 *buf, int length) return length; } -void seeq8003_device::interrupt(void *ptr, int param) +void seeq8003_device::interrupt(int param) { int const state = (!(m_tx_status & TXS_O) && (m_tx_status & m_tx_command & TXS_M)) || diff --git a/src/devices/machine/edlc.h b/src/devices/machine/edlc.h index 6b7d468f475..1a57841212a 100644 --- a/src/devices/machine/edlc.h +++ b/src/devices/machine/edlc.h @@ -55,9 +55,9 @@ protected: virtual void tx_command_w(u8 data); // helpers - void transmit(void *ptr, int param); + void transmit(int param); int receive(u8 *buf, int length); - void interrupt(void *ptr = nullptr, int param = 0); + void interrupt(int param = 0); virtual bool address_filter(u8 *address); void dump_bytes(u8 *buf, int length); diff --git a/src/devices/machine/er1400.cpp b/src/devices/machine/er1400.cpp index f42a9f58f9c..e239f621e5d 100644 --- a/src/devices/machine/er1400.cpp +++ b/src/devices/machine/er1400.cpp @@ -295,7 +295,7 @@ WRITE_LINE_MEMBER(er1400_device::c3_w) // fires //------------------------------------------------- -void er1400_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void er1400_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/er1400.h b/src/devices/machine/er1400.h index 984a6c9eea0..6d9a4685980 100644 --- a/src/devices/machine/er1400.h +++ b/src/devices/machine/er1400.h @@ -45,7 +45,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; // device_nvram_interface overrides virtual void nvram_default() override; diff --git a/src/devices/machine/fga002.cpp b/src/devices/machine/fga002.cpp index 59a40777aa9..3aa117736ec 100644 --- a/src/devices/machine/fga002.cpp +++ b/src/devices/machine/fga002.cpp @@ -145,7 +145,7 @@ void fga002_device::device_reset() //------------------------------------------------- // device_timer - handler timer events //------------------------------------------------- -void fga002_device::device_timer (emu_timer &timer, device_timer_id id, int32_t param, void *ptr) +void fga002_device::device_timer (emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/machine/fga002.h b/src/devices/machine/fga002.h index be72206eb76..efea2f54a23 100644 --- a/src/devices/machine/fga002.h +++ b/src/devices/machine/fga002.h @@ -57,7 +57,7 @@ class fga002_device : public device_t virtual int z80daisy_irq_ack() override; virtual void z80daisy_irq_reti() override; #endif - 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; devcb_write_line m_out_int_cb; devcb_read8 m_liack4_cb; diff --git a/src/devices/machine/gen_fifo.cpp b/src/devices/machine/gen_fifo.cpp index 10fcf37429c..56eba309f92 100644 --- a/src/devices/machine/gen_fifo.cpp +++ b/src/devices/machine/gen_fifo.cpp @@ -60,7 +60,7 @@ template<typename T> void generic_fifo_device_base<T>::device_start() save_item(NAME(m_full_triggered)); } -template<typename T> void generic_fifo_device_base<T>::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +template<typename T> void generic_fifo_device_base<T>::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { case T_FULL: { diff --git a/src/devices/machine/gen_fifo.h b/src/devices/machine/gen_fifo.h index a33f4d4880f..0b9cc36244c 100644 --- a/src/devices/machine/gen_fifo.h +++ b/src/devices/machine/gen_fifo.h @@ -197,7 +197,7 @@ private: bool m_empty_triggered, m_full_triggered; 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; }; class generic_fifo_u32_device : public generic_fifo_device_base<u32> diff --git a/src/devices/machine/gen_latch.cpp b/src/devices/machine/gen_latch.cpp index 2e3929b108a..10caccd4c7c 100644 --- a/src/devices/machine/gen_latch.cpp +++ b/src/devices/machine/gen_latch.cpp @@ -56,7 +56,7 @@ void generic_latch_base_device::device_start() // init_callback - set initial state //------------------------------------------------- -void generic_latch_base_device::init_callback(void *ptr, s32 param) +void generic_latch_base_device::init_callback(s32 param) { m_data_pending_cb(m_latch_written ? 1 : 0); } @@ -153,7 +153,7 @@ WRITE_LINE_MEMBER( generic_latch_8_device::clear ) // callback to set a latch value //------------------------------------------------- -void generic_latch_8_device::sync_callback(void *ptr, s32 param) +void generic_latch_8_device::sync_callback(s32 param) { u8 value = param; @@ -224,7 +224,7 @@ WRITE_LINE_MEMBER( generic_latch_16_device::clear ) // callback to set a latch value //------------------------------------------------- -void generic_latch_16_device::sync_callback(void *ptr, s32 param) +void generic_latch_16_device::sync_callback(s32 param) { u16 value = param; diff --git a/src/devices/machine/gen_latch.h b/src/devices/machine/gen_latch.h index 4080cbebe8d..fc217410d06 100644 --- a/src/devices/machine/gen_latch.h +++ b/src/devices/machine/gen_latch.h @@ -51,7 +51,7 @@ protected: void set_latch_written(bool latch_written); private: - void init_callback(void *ptr, s32 param); + void init_callback(s32 param); bool m_separate_acknowledge; bool m_latch_written; @@ -78,7 +78,7 @@ public: protected: virtual void device_start() override; - void sync_callback(void *ptr, s32 param); + void sync_callback(s32 param); private: u8 m_latched_value; @@ -104,7 +104,7 @@ public: protected: virtual void device_start() override; - void sync_callback(void *ptr, s32 param); + void sync_callback(s32 param); private: u16 m_latched_value; diff --git a/src/devices/machine/generalplus_gpl16250soc.cpp b/src/devices/machine/generalplus_gpl16250soc.cpp index 0fe737064d7..2c2f7062d91 100644 --- a/src/devices/machine/generalplus_gpl16250soc.cpp +++ b/src/devices/machine/generalplus_gpl16250soc.cpp @@ -1785,7 +1785,7 @@ void sunplus_gcm394_base_device::checkirq6() */ -void sunplus_gcm394_base_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sunplus_gcm394_base_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/generalplus_gpl16250soc.h b/src/devices/machine/generalplus_gpl16250soc.h index 44b58cd52f9..e3dfd6aeb20 100644 --- a/src/devices/machine/generalplus_gpl16250soc.h +++ b/src/devices/machine/generalplus_gpl16250soc.h @@ -360,7 +360,7 @@ private: void checkirq6(); emu_timer *m_unk_timer; - 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; inline uint16_t read_space(uint32_t offset); inline void write_space(uint32_t offset, uint16_t data); diff --git a/src/devices/machine/generalplus_gpl16250soc_video.cpp b/src/devices/machine/generalplus_gpl16250soc_video.cpp index 4f3a754e43c..52668a71d17 100644 --- a/src/devices/machine/generalplus_gpl16250soc_video.cpp +++ b/src/devices/machine/generalplus_gpl16250soc_video.cpp @@ -1132,7 +1132,7 @@ WRITE_LINE_MEMBER(gcm394_base_video_device::vblank) } } -void gcm394_base_video_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void gcm394_base_video_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/generalplus_gpl16250soc_video.h b/src/devices/machine/generalplus_gpl16250soc_video.h index 429e3246e04..068e26b5f77 100644 --- a/src/devices/machine/generalplus_gpl16250soc_video.h +++ b/src/devices/machine/generalplus_gpl16250soc_video.h @@ -141,7 +141,7 @@ public: protected: static const device_timer_id TIMER_SCREENPOS = 2; - 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; inline void check_video_irq(); diff --git a/src/devices/machine/gt913_io.cpp b/src/devices/machine/gt913_io.cpp index 8c1cef4e556..2853a50ec98 100644 --- a/src/devices/machine/gt913_io.cpp +++ b/src/devices/machine/gt913_io.cpp @@ -54,7 +54,7 @@ void gt913_io_hle_device::device_reset() m_adc_data[0] = m_adc_data[1] = 0; } -void gt913_io_hle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void gt913_io_hle_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_timer_irq_pending[id] = true; timer_check_irq(id); diff --git a/src/devices/machine/gt913_io.h b/src/devices/machine/gt913_io.h index 0db4037642f..5bfed441c64 100644 --- a/src/devices/machine/gt913_io.h +++ b/src/devices/machine/gt913_io.h @@ -47,7 +47,7 @@ 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; private: required_device<cpu_device> m_cpu; diff --git a/src/devices/machine/hd64610.cpp b/src/devices/machine/hd64610.cpp index 3b8393b9a11..beedbeea73d 100644 --- a/src/devices/machine/hd64610.cpp +++ b/src/devices/machine/hd64610.cpp @@ -188,7 +188,7 @@ void hd64610_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void hd64610_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hd64610_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/hd64610.h b/src/devices/machine/hd64610.h index 517ff11284f..a082a0175d2 100644 --- a/src/devices/machine/hd64610.h +++ b/src/devices/machine/hd64610.h @@ -48,7 +48,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; // device_rtc_interface overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; diff --git a/src/devices/machine/hdc92x4.cpp b/src/devices/machine/hdc92x4.cpp index 967c6289a6c..51661ef5e2d 100644 --- a/src/devices/machine/hdc92x4.cpp +++ b/src/devices/machine/hdc92x4.cpp @@ -4766,7 +4766,7 @@ void hdc92x4_device::set_clock_divider(int line, int value) /* This is reached when a timer has expired */ -void hdc92x4_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hdc92x4_device::device_timer(emu_timer &timer, device_timer_id id, int param) { live_sync(); m_timed_wait = false; diff --git a/src/devices/machine/hdc92x4.h b/src/devices/machine/hdc92x4.h index dea7717d2b3..6021a69173b 100644 --- a/src/devices/machine/hdc92x4.h +++ b/src/devices/machine/hdc92x4.h @@ -138,7 +138,7 @@ protected: // emu_timer *m_live_timer; // Timer callback - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + void device_timer(emu_timer &timer, device_timer_id id, int param) override; // Handlers for incoming signals void ready_handler(); diff --git a/src/devices/machine/hp_dc100_tape.cpp b/src/devices/machine/hp_dc100_tape.cpp index 8c72745d4b5..4e94a6d2999 100644 --- a/src/devices/machine/hp_dc100_tape.cpp +++ b/src/devices/machine/hp_dc100_tape.cpp @@ -504,7 +504,7 @@ void hp_dc100_tape_device::device_reset() clear_state(); } -void hp_dc100_tape_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hp_dc100_tape_device::device_timer(emu_timer &timer, device_timer_id id, int param) { LOG_TMR("%.6f TMR %d p=%d s=%.3f(%.3f) a=%d\n" , machine().time().as_double() , id , m_tape_pos , m_speed , m_set_point , m_accelerating); update_speed_pos(); diff --git a/src/devices/machine/hp_dc100_tape.h b/src/devices/machine/hp_dc100_tape.h index 6b52b3c7274..3ee166466ce 100644 --- a/src/devices/machine/hp_dc100_tape.h +++ b/src/devices/machine/hp_dc100_tape.h @@ -103,7 +103,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: devcb_write_line m_cart_out_handler; diff --git a/src/devices/machine/hp_taco.cpp b/src/devices/machine/hp_taco.cpp index fc95c72e454..02cbfa2199d 100644 --- a/src/devices/machine/hp_taco.cpp +++ b/src/devices/machine/hp_taco.cpp @@ -607,7 +607,7 @@ void hp_taco_device::device_reset() m_error_timer->reset(); } -void hp_taco_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hp_taco_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case GAP_TMR_ID: diff --git a/src/devices/machine/hp_taco.h b/src/devices/machine/hp_taco.h index 88ab82f2579..e6c212b6505 100644 --- a/src/devices/machine/hp_taco.h +++ b/src/devices/machine/hp_taco.h @@ -52,7 +52,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; private: required_device<hp_dc100_tape_device> m_tape; diff --git a/src/devices/machine/i7220.cpp b/src/devices/machine/i7220.cpp index 44d671c412b..64a582ddd18 100644 --- a/src/devices/machine/i7220.cpp +++ b/src/devices/machine/i7220.cpp @@ -108,7 +108,7 @@ void i7220_device::device_reset() memset(&m_regs, 0, sizeof(m_regs)); } -void i7220_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void i7220_device::device_timer(emu_timer &timer, device_timer_id id, int param) { general_continue(bi); } diff --git a/src/devices/machine/i7220.h b/src/devices/machine/i7220.h index 631f03cd01e..99d8466226c 100644 --- a/src/devices/machine/i7220.h +++ b/src/devices/machine/i7220.h @@ -67,7 +67,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; int m_data_size; diff --git a/src/devices/machine/i8087.cpp b/src/devices/machine/i8087.cpp index 9d2327bd3af..907bc50cab2 100644 --- a/src/devices/machine/i8087.cpp +++ b/src/devices/machine/i8087.cpp @@ -215,7 +215,7 @@ void i8087_device::device_start() build_opcode_table(); } -void i8087_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void i8087_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_busy_handler(1); } diff --git a/src/devices/machine/i8087.h b/src/devices/machine/i8087.h index 4ee28a095bf..c9bab30b0db 100644 --- a/src/devices/machine/i8087.h +++ b/src/devices/machine/i8087.h @@ -26,7 +26,7 @@ protected: i8087_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); 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: address_space &space() { return *m_space; } diff --git a/src/devices/machine/i82586.cpp b/src/devices/machine/i82586.cpp index 16068820d29..510acc4e9d2 100644 --- a/src/devices/machine/i82586.cpp +++ b/src/devices/machine/i82586.cpp @@ -204,7 +204,7 @@ void i82586_base_device::device_reset() m_mac_multi = 0; } -void i82586_base_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void i82586_base_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/i82586.h b/src/devices/machine/i82586.h index ad02c0bfece..65ecff63329 100644 --- a/src/devices/machine/i82586.h +++ b/src/devices/machine/i82586.h @@ -167,7 +167,7 @@ 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 space_config_vector memory_space_config() const override; // device_network_interface overrides diff --git a/src/devices/machine/i8271.cpp b/src/devices/machine/i8271.cpp index 06ee6a40104..70e27fa9bfd 100644 --- a/src/devices/machine/i8271.cpp +++ b/src/devices/machine/i8271.cpp @@ -1546,7 +1546,7 @@ std::string i8271_device::ttsn() const return machine().time().to_string(); } -void i8271_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void i8271_device::device_timer(emu_timer &timer, device_timer_id id, int param) { live_sync(); diff --git a/src/devices/machine/i8271.h b/src/devices/machine/i8271.h index ba15f6ec166..c337ac98df4 100644 --- a/src/devices/machine/i8271.h +++ b/src/devices/machine/i8271.h @@ -44,7 +44,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; private: enum { diff --git a/src/devices/machine/ibm21s850.cpp b/src/devices/machine/ibm21s850.cpp index 3afb88b27a1..cd44591645c 100644 --- a/src/devices/machine/ibm21s850.cpp +++ b/src/devices/machine/ibm21s850.cpp @@ -81,7 +81,7 @@ void ibm21s851_device::device_reset() m_regs[REG_COUNT_OFFS] |= 0x0b; // 11 registers following the standard block on 21S851 } -void ibm21s85x_base_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ibm21s85x_base_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_RESET) { diff --git a/src/devices/machine/ibm21s850.h b/src/devices/machine/ibm21s850.h index 3853a7c9799..e0725a7cbd3 100644 --- a/src/devices/machine/ibm21s850.h +++ b/src/devices/machine/ibm21s850.h @@ -30,7 +30,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 power_on_reset(); diff --git a/src/devices/machine/icm7170.cpp b/src/devices/machine/icm7170.cpp index c66d1b6bcc7..8537074371a 100644 --- a/src/devices/machine/icm7170.cpp +++ b/src/devices/machine/icm7170.cpp @@ -112,7 +112,7 @@ void icm7170_device::device_reset() // device_timer - handles timer events //------------------------------------------------- -void icm7170_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void icm7170_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // advance hundredths m_irq_status |= IRQ_BIT_100TH_SECOND; diff --git a/src/devices/machine/icm7170.h b/src/devices/machine/icm7170.h index e38a556b06c..e7f2e9db63a 100644 --- a/src/devices/machine/icm7170.h +++ b/src/devices/machine/icm7170.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; // device_rtc_interface overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; diff --git a/src/devices/machine/ie15.cpp b/src/devices/machine/ie15.cpp index 4d9d17a3afc..532f73846db 100644 --- a/src/devices/machine/ie15.cpp +++ b/src/devices/machine/ie15.cpp @@ -231,7 +231,7 @@ uint8_t ie15_device::kb_s_lin_r() /* serial port */ -void ie15_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ie15_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/ie15.h b/src/devices/machine/ie15.h index 3bd93567d22..496874c5a86 100644 --- a/src/devices/machine/ie15.h +++ b/src/devices/machine/ie15.h @@ -56,7 +56,7 @@ protected: virtual void device_resolve_objects() 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 ioport_constructor device_input_ports() const override; diff --git a/src/devices/machine/ins8250.cpp b/src/devices/machine/ins8250.cpp index 438b3eb75e6..0d766619254 100644 --- a/src/devices/machine/ins8250.cpp +++ b/src/devices/machine/ins8250.cpp @@ -713,7 +713,7 @@ void ns16550_device::device_reset() ins8250_uart_device::device_reset(); } -void ns16550_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ns16550_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(!id) { diff --git a/src/devices/machine/ins8250.h b/src/devices/machine/ins8250.h index 5f9a6bd1793..b40ff23ef65 100644 --- a/src/devices/machine/ins8250.h +++ b/src/devices/machine/ins8250.h @@ -119,7 +119,7 @@ protected: virtual void device_reset() override; virtual void rcv_complete() override; virtual void tra_complete() 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_fcr(u8 data) override; virtual void push_tx(u8 data) override; virtual u8 pop_rx() override; diff --git a/src/devices/machine/intelfsh.cpp b/src/devices/machine/intelfsh.cpp index 2252d2804f7..5221668059f 100644 --- a/src/devices/machine/intelfsh.cpp +++ b/src/devices/machine/intelfsh.cpp @@ -543,7 +543,7 @@ void intelfsh_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void intelfsh_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void intelfsh_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch( m_flash_mode ) { diff --git a/src/devices/machine/intelfsh.h b/src/devices/machine/intelfsh.h index 8001b2fc5ce..cf3d38df15f 100644 --- a/src/devices/machine/intelfsh.h +++ b/src/devices/machine/intelfsh.h @@ -66,7 +66,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; // device_nvram_interface overrides virtual void nvram_default() override; diff --git a/src/devices/machine/iwm.cpp b/src/devices/machine/iwm.cpp index 0f5663908a7..49e69aee2b2 100644 --- a/src/devices/machine/iwm.cpp +++ b/src/devices/machine/iwm.cpp @@ -90,7 +90,7 @@ void iwm_device::device_reset() m_devsel_cb(0); } -void iwm_device::device_timer(emu_timer &, device_timer_id, int, void *) +void iwm_device::device_timer(emu_timer &, device_timer_id, int) { if(m_active == MODE_DELAY) { flush_write(); diff --git a/src/devices/machine/iwm.h b/src/devices/machine/iwm.h index 4cb4edb18cf..5bae4443791 100644 --- a/src/devices/machine/iwm.h +++ b/src/devices/machine/iwm.h @@ -37,7 +37,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; private: enum { diff --git a/src/devices/machine/kb3600.cpp b/src/devices/machine/kb3600.cpp index 5400d8ac1a8..c0e450f601a 100644 --- a/src/devices/machine/kb3600.cpp +++ b/src/devices/machine/kb3600.cpp @@ -106,7 +106,7 @@ void ay3600_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void ay3600_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ay3600_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int ako = 0; diff --git a/src/devices/machine/kb3600.h b/src/devices/machine/kb3600.h index fce1eab7646..35a2a192a5c 100644 --- a/src/devices/machine/kb3600.h +++ b/src/devices/machine/kb3600.h @@ -83,7 +83,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; devcb_read16 m_read_x0, m_read_x1, m_read_x2, m_read_x3, m_read_x4, m_read_x5, m_read_x6, m_read_x7, m_read_x8; devcb_read_line m_read_shift, m_read_control; diff --git a/src/devices/machine/kr2376.cpp b/src/devices/machine/kr2376.cpp index 7d59c4ea317..8f6b6a4b4fd 100644 --- a/src/devices/machine/kr2376.cpp +++ b/src/devices/machine/kr2376.cpp @@ -263,7 +263,7 @@ void kr2376_device::detect_keypress() } } -void kr2376_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void kr2376_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/kr2376.h b/src/devices/machine/kr2376.h index ab5a4c3f82c..9b9715a8742 100644 --- a/src/devices/machine/kr2376.h +++ b/src/devices/machine/kr2376.h @@ -71,7 +71,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 uint8_t key_codes(int mode, int x, int y) { return 0x00; } private: diff --git a/src/devices/machine/laserdsc.cpp b/src/devices/machine/laserdsc.cpp index 6d1ef156bf9..4d04ea68505 100644 --- a/src/devices/machine/laserdsc.cpp +++ b/src/devices/machine/laserdsc.cpp @@ -283,7 +283,7 @@ void laserdisc_device::device_validity_check(validity_checker &valid) const // device //------------------------------------------------- -void laserdisc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void laserdisc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/laserdsc.h b/src/devices/machine/laserdsc.h index 5eb06f105ea..b706afb5816 100644 --- a/src/devices/machine/laserdsc.h +++ b/src/devices/machine/laserdsc.h @@ -218,7 +218,7 @@ protected: virtual void device_start() override; virtual void device_stop() 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; // device_sound_interface overrides diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp index 64392ed0c90..360b7d93a45 100644 --- a/src/devices/machine/ldpr8210.cpp +++ b/src/devices/machine/ldpr8210.cpp @@ -316,7 +316,7 @@ void pioneer_pr8210_device::device_reset() // device //------------------------------------------------- -void pioneer_pr8210_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pioneer_pr8210_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -374,7 +374,7 @@ void pioneer_pr8210_device::device_timer(emu_timer &timer, device_timer_id id, i // pass everything else onto the parent default: - laserdisc_device::device_timer(timer, id, param, ptr); + laserdisc_device::device_timer(timer, id, param); break; } } @@ -986,7 +986,7 @@ void simutrek_special_device::device_reset() // device //------------------------------------------------- -void simutrek_special_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void simutrek_special_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -1003,7 +1003,7 @@ void simutrek_special_device::device_timer(emu_timer &timer, device_timer_id id, // pass everything else onto the parent default: - pioneer_pr8210_device::device_timer(timer, id, param, ptr); + pioneer_pr8210_device::device_timer(timer, id, param); break; } } diff --git a/src/devices/machine/ldpr8210.h b/src/devices/machine/ldpr8210.h index 217159e0cd1..79453d5604b 100644 --- a/src/devices/machine/ldpr8210.h +++ b/src/devices/machine/ldpr8210.h @@ -57,7 +57,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 void device_add_mconfig(machine_config &config) override; @@ -166,7 +166,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp index 934633e4b5a..5ef4a5cd1a9 100644 --- a/src/devices/machine/ldv1000.cpp +++ b/src/devices/machine/ldv1000.cpp @@ -191,7 +191,7 @@ void pioneer_ldv1000_device::device_reset() // device //------------------------------------------------- -void pioneer_ldv1000_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pioneer_ldv1000_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -251,7 +251,7 @@ void pioneer_ldv1000_device::device_timer(emu_timer &timer, device_timer_id id, // pass everything else onto the parent default: - laserdisc_device::device_timer(timer, id, param, ptr); + laserdisc_device::device_timer(timer, id, param); break; } } diff --git a/src/devices/machine/ldv1000.h b/src/devices/machine/ldv1000.h index 2d19b81c4e3..a4ea232429a 100644 --- a/src/devices/machine/ldv1000.h +++ b/src/devices/machine/ldv1000.h @@ -62,7 +62,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/machine/ldvp931.cpp b/src/devices/machine/ldvp931.cpp index 69bf68d2f55..056a6b1d2ab 100644 --- a/src/devices/machine/ldvp931.cpp +++ b/src/devices/machine/ldvp931.cpp @@ -185,7 +185,7 @@ void philips_22vp931_device::device_reset() // device //------------------------------------------------- -void philips_22vp931_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void philips_22vp931_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -265,7 +265,7 @@ void philips_22vp931_device::device_timer(emu_timer &timer, device_timer_id id, // pass everything else onto the parent default: - laserdisc_device::device_timer(timer, id, param, ptr); + laserdisc_device::device_timer(timer, id, param); break; } } diff --git a/src/devices/machine/ldvp931.h b/src/devices/machine/ldvp931.h index c492f0cb699..a1eee3be52e 100644 --- a/src/devices/machine/ldvp931.h +++ b/src/devices/machine/ldvp931.h @@ -67,7 +67,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/machine/m68sfdc.cpp b/src/devices/machine/m68sfdc.cpp index 1f9b37acf4c..e0cb6b8109b 100644 --- a/src/devices/machine/m68sfdc.cpp +++ b/src/devices/machine/m68sfdc.cpp @@ -150,7 +150,7 @@ WRITE_LINE_MEMBER(m68sfdc_device::handle_nmi) m_nmi_handler(state); } -void m68sfdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void m68sfdc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/m68sfdc.h b/src/devices/machine/m68sfdc.h index aa7dfcb00ee..cdd5b67a5e3 100644 --- a/src/devices/machine/m68sfdc.h +++ b/src/devices/machine/m68sfdc.h @@ -84,7 +84,7 @@ private: virtual void device_resolve_objects() 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 ioport_constructor device_input_ports() const override; diff --git a/src/devices/machine/mb3773.cpp b/src/devices/machine/mb3773.cpp index 948fdd7a75e..b23b2c2ca20 100644 --- a/src/devices/machine/mb3773.cpp +++ b/src/devices/machine/mb3773.cpp @@ -56,7 +56,7 @@ void mb3773_device::device_reset() reset_timer(); } -void mb3773_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mb3773_device::device_timer(emu_timer &timer, device_timer_id id, int param) { logerror("Reset caused by watchdog\n"); diff --git a/src/devices/machine/mb3773.h b/src/devices/machine/mb3773.h index e6f8bf4c955..377c705f6b0 100644 --- a/src/devices/machine/mb3773.h +++ b/src/devices/machine/mb3773.h @@ -27,7 +27,7 @@ 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; private: void reset_timer(); diff --git a/src/devices/machine/mb8795.cpp b/src/devices/machine/mb8795.cpp index 4f6d08d9aca..544d954f35e 100644 --- a/src/devices/machine/mb8795.cpp +++ b/src/devices/machine/mb8795.cpp @@ -323,7 +323,7 @@ bool mb8795_device::recv_is_multicast() return rxbuf[0] & 0x01; } -void mb8795_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mb8795_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(id == TIMER_TX) { drq_tx = true; diff --git a/src/devices/machine/mb8795.h b/src/devices/machine/mb8795.h index 1298a6295cc..ba590d776f3 100644 --- a/src/devices/machine/mb8795.h +++ b/src/devices/machine/mb8795.h @@ -22,7 +22,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 void recv_cb(uint8_t *buf, int len) override; diff --git a/src/devices/machine/mb89352.cpp b/src/devices/machine/mb89352.cpp index 62b9adb78bb..4412cf8bd44 100644 --- a/src/devices/machine/mb89352.cpp +++ b/src/devices/machine/mb89352.cpp @@ -217,7 +217,7 @@ int mb89352_device::get_scsi_cmd_len(uint8_t cbyte) //return 6; } -void mb89352_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mb89352_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/machine/mb89352.h b/src/devices/machine/mb89352.h index 7454e63a352..9ce98c6380f 100644 --- a/src/devices/machine/mb89352.h +++ b/src/devices/machine/mb89352.h @@ -31,7 +31,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_stop() 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 device state goes here diff --git a/src/devices/machine/mc14411.cpp b/src/devices/machine/mc14411.cpp index fb24372e7bd..9d4cb73bf12 100644 --- a/src/devices/machine/mc14411.cpp +++ b/src/devices/machine/mc14411.cpp @@ -215,7 +215,7 @@ void mc14411_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void mc14411_device::device_timer(emu_timer &timer, device_timer_id id, int32_t param, void *ptr) +void mc14411_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id >= TIMER_F1 && id <= TIMER_F16) { diff --git a/src/devices/machine/mc14411.h b/src/devices/machine/mc14411.h index 99cc8309c96..47d081b128b 100644 --- a/src/devices/machine/mc14411.h +++ b/src/devices/machine/mc14411.h @@ -78,7 +78,7 @@ protected: virtual void device_start() override; virtual void device_clock_changed() 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: void arm_timer(int i); diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp index c7597a2fbea..7f2aab30270 100644 --- a/src/devices/machine/mc146818.cpp +++ b/src/devices/machine/mc146818.cpp @@ -107,7 +107,7 @@ void mc146818_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void mc146818_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mc146818_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/mc146818.h b/src/devices/machine/mc146818.h index 96acaa7fc62..baea2104c1c 100644 --- a/src/devices/machine/mc146818.h +++ b/src/devices/machine/mc146818.h @@ -53,7 +53,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_nvram_interface overrides virtual void nvram_default() override; diff --git a/src/devices/machine/mc6843.cpp b/src/devices/machine/mc6843.cpp index 695c26a1500..e169049a0d3 100644 --- a/src/devices/machine/mc6843.cpp +++ b/src/devices/machine/mc6843.cpp @@ -300,7 +300,7 @@ void mc6843_device::ready_callback(floppy_image_device *floppy, int state) } } -void mc6843_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mc6843_device::device_timer(emu_timer &timer, device_timer_id id, int param) { live_sync(); run(true, false, false); diff --git a/src/devices/machine/mc6843.h b/src/devices/machine/mc6843.h index a9acaf377ac..63b03a8aa44 100644 --- a/src/devices/machine/mc6843.h +++ b/src/devices/machine/mc6843.h @@ -30,7 +30,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: // Status flags diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp index 645b7c9deba..9d78834d166 100644 --- a/src/devices/machine/mc68681.cpp +++ b/src/devices/machine/mc68681.cpp @@ -208,7 +208,7 @@ void duart_base_device::device_start() read_inport.resolve(); write_outport.resolve_safe(); - duart_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(duart_base_device::duart_timer_callback),this), nullptr); + duart_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(duart_base_device::duart_timer_callback),this)); save_item(NAME(ACR)); save_item(NAME(IMR)); diff --git a/src/devices/machine/mc68901.cpp b/src/devices/machine/mc68901.cpp index 082e02985a7..5160e27eee9 100644 --- a/src/devices/machine/mc68901.cpp +++ b/src/devices/machine/mc68901.cpp @@ -503,7 +503,7 @@ void mc68901_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void mc68901_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mc68901_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(id >= TIMER_A && id <= TIMER_D) timer_count(id); diff --git a/src/devices/machine/mc68901.h b/src/devices/machine/mc68901.h index cc792b34900..de640fac657 100644 --- a/src/devices/machine/mc68901.h +++ b/src/devices/machine/mc68901.h @@ -91,7 +91,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 check_interrupts(); void take_interrupt(u16 mask); diff --git a/src/devices/machine/mccs1850.cpp b/src/devices/machine/mccs1850.cpp index 7422565b53f..ebd70e04f9c 100644 --- a/src/devices/machine/mccs1850.cpp +++ b/src/devices/machine/mccs1850.cpp @@ -359,7 +359,7 @@ void mccs1850_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void mccs1850_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mccs1850_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/mccs1850.h b/src/devices/machine/mccs1850.h index 62b7f5d5afc..19b0a635e97 100644 --- a/src/devices/machine/mccs1850.h +++ b/src/devices/machine/mccs1850.h @@ -55,7 +55,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_nvram_interface overrides virtual void nvram_default() override; diff --git a/src/devices/machine/meters.cpp b/src/devices/machine/meters.cpp index cf36ff75177..a1c9a77b076 100644 --- a/src/devices/machine/meters.cpp +++ b/src/devices/machine/meters.cpp @@ -61,7 +61,7 @@ void meters_device::device_reset() // device_timer - device-specific timer events //------------------------------------------------- -void meters_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void meters_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id >= m_number_mtr) throw emu_fatalerror("Unknown id in meters_device::device_timer"); diff --git a/src/devices/machine/meters.h b/src/devices/machine/meters.h index c9a11790931..b8da53bfe1b 100644 --- a/src/devices/machine/meters.h +++ b/src/devices/machine/meters.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: // internal state diff --git a/src/devices/machine/microtch.cpp b/src/devices/machine/microtch.cpp index a974202bfab..dfcf1e52d3d 100644 --- a/src/devices/machine/microtch.cpp +++ b/src/devices/machine/microtch.cpp @@ -160,7 +160,7 @@ void microtouch_device::send_touch_packet() } } -void microtouch_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void microtouch_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (!id) { diff --git a/src/devices/machine/microtch.h b/src/devices/machine/microtch.h index 2f955955e03..3eba8bfbb68 100644 --- a/src/devices/machine/microtch.h +++ b/src/devices/machine/microtch.h @@ -26,7 +26,7 @@ protected: // device_t implementation virtual ioport_constructor device_input_ports() const 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; // device_serial_interface implementation virtual void tra_callback() override; diff --git a/src/devices/machine/mm5740.cpp b/src/devices/machine/mm5740.cpp index ca378caecf9..43a44024200 100644 --- a/src/devices/machine/mm5740.cpp +++ b/src/devices/machine/mm5740.cpp @@ -100,7 +100,7 @@ void mm5740_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void mm5740_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mm5740_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int ako = 0; diff --git a/src/devices/machine/mm5740.h b/src/devices/machine/mm5740.h index a3242711a95..91d2280f3fb 100644 --- a/src/devices/machine/mm5740.h +++ b/src/devices/machine/mm5740.h @@ -105,7 +105,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; diff --git a/src/devices/machine/mm58167.cpp b/src/devices/machine/mm58167.cpp index 05aa4377ccb..571b162b094 100644 --- a/src/devices/machine/mm58167.cpp +++ b/src/devices/machine/mm58167.cpp @@ -97,7 +97,7 @@ void mm58167_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void mm58167_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mm58167_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_milliseconds++; diff --git a/src/devices/machine/mm58167.h b/src/devices/machine/mm58167.h index c12b151b676..08def7cd569 100644 --- a/src/devices/machine/mm58167.h +++ b/src/devices/machine/mm58167.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; // device_rtc_interface overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; diff --git a/src/devices/machine/mm58174.cpp b/src/devices/machine/mm58174.cpp index 53d23bdc4e3..bf0759bea22 100644 --- a/src/devices/machine/mm58174.cpp +++ b/src/devices/machine/mm58174.cpp @@ -282,7 +282,7 @@ void mm58174_device::write(offs_t offset, uint8_t data) // Increment RTC clock (timed interrupt every 1/10s) -void mm58174_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mm58174_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id > 0) return; diff --git a/src/devices/machine/mm58174.h b/src/devices/machine/mm58174.h index 7d592e258b8..01db657255d 100644 --- a/src/devices/machine/mm58174.h +++ b/src/devices/machine/mm58174.h @@ -23,7 +23,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; // device_rtc_interface overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; diff --git a/src/devices/machine/mm74c922.cpp b/src/devices/machine/mm74c922.cpp index e9f3c9704ac..af3fd1047d6 100644 --- a/src/devices/machine/mm74c922.cpp +++ b/src/devices/machine/mm74c922.cpp @@ -90,7 +90,7 @@ void mm74c922_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void mm74c922_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mm74c922_device::device_timer(emu_timer &timer, device_timer_id id, int param) { change_output_lines(); clock_scan_counters(); diff --git a/src/devices/machine/mm74c922.h b/src/devices/machine/mm74c922.h index fd70c7871ae..bd265b87bfa 100644 --- a/src/devices/machine/mm74c922.h +++ b/src/devices/machine/mm74c922.h @@ -67,7 +67,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; private: void change_output_lines(); diff --git a/src/devices/machine/mos6526.cpp b/src/devices/machine/mos6526.cpp index 3612db9cee3..0ccb524d233 100644 --- a/src/devices/machine/mos6526.cpp +++ b/src/devices/machine/mos6526.cpp @@ -762,7 +762,7 @@ void mos6526_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void mos6526_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mos6526_device::device_timer(emu_timer &timer, device_timer_id id, int param) { tod_w(1); tod_w(0); diff --git a/src/devices/machine/mos6526.h b/src/devices/machine/mos6526.h index 33ccc6dd26d..f86cf960461 100644 --- a/src/devices/machine/mos6526.h +++ b/src/devices/machine/mos6526.h @@ -113,7 +113,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 execute_run() override; int m_icount; diff --git a/src/devices/machine/mos6530.cpp b/src/devices/machine/mos6530.cpp index 8cc7198b3e5..45d2ec6cf29 100644 --- a/src/devices/machine/mos6530.cpp +++ b/src/devices/machine/mos6530.cpp @@ -157,7 +157,7 @@ uint8_t mos6530_device::get_timer() timer -------------------------------------------------*/ -void mos6530_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mos6530_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/mos6530.h b/src/devices/machine/mos6530.h index 0639544d8e0..f6385a32ec6 100644 --- a/src/devices/machine/mos6530.h +++ b/src/devices/machine/mos6530.h @@ -66,7 +66,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: enum diff --git a/src/devices/machine/mos6530n.cpp b/src/devices/machine/mos6530n.cpp index e6ad3c9dc86..384b35375a8 100644 --- a/src/devices/machine/mos6530n.cpp +++ b/src/devices/machine/mos6530n.cpp @@ -242,7 +242,7 @@ void mos6530_device_base::device_reset() // device_timer - handler timer events //------------------------------------------------- -void mos6530_device_base::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mos6530_device_base::device_timer(emu_timer &timer, device_timer_id id, int param) { live_sync(); live_run(); diff --git a/src/devices/machine/mos6530n.h b/src/devices/machine/mos6530n.h index 2822d18d6bf..ee246e1eb69 100644 --- a/src/devices/machine/mos6530n.h +++ b/src/devices/machine/mos6530n.h @@ -101,7 +101,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; enum { diff --git a/src/devices/machine/mpu401.cpp b/src/devices/machine/mpu401.cpp index 0103e51ceca..e4099571fc4 100644 --- a/src/devices/machine/mpu401.cpp +++ b/src/devices/machine/mpu401.cpp @@ -127,7 +127,7 @@ mpu401_device::mpu401_device(const machine_config &mconfig, const char *tag, dev void mpu401_device::device_start() { write_irq.resolve_safe(); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); } //------------------------------------------------- @@ -148,7 +148,7 @@ void mpu401_device::device_reset() // device_timer - called when our device timer expires //------------------------------------------------- -void mpu401_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void mpu401_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { m_ourcpu->m6801_clock_serial(); } diff --git a/src/devices/machine/mpu401.h b/src/devices/machine/mpu401.h index 6a51a8f3e91..e2a0cd5cdab 100644 --- a/src/devices/machine/mpu401.h +++ b/src/devices/machine/mpu401.h @@ -28,7 +28,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual const tiny_rom_entry *device_rom_region() const 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; private: diff --git a/src/devices/machine/msm5832.cpp b/src/devices/machine/msm5832.cpp index 9d4ef6e088a..5459fd77fc6 100644 --- a/src/devices/machine/msm5832.cpp +++ b/src/devices/machine/msm5832.cpp @@ -128,7 +128,7 @@ void msm5832_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void msm5832_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void msm5832_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/msm5832.h b/src/devices/machine/msm5832.h index 5ba34a537da..82988d5b023 100644 --- a/src/devices/machine/msm5832.h +++ b/src/devices/machine/msm5832.h @@ -56,7 +56,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; // device_rtc_interface overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; diff --git a/src/devices/machine/msm58321.cpp b/src/devices/machine/msm58321.cpp index 4f74ef3f888..c34513e6847 100644 --- a/src/devices/machine/msm58321.cpp +++ b/src/devices/machine/msm58321.cpp @@ -247,7 +247,7 @@ void msm58321_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void msm58321_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void msm58321_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/msm58321.h b/src/devices/machine/msm58321.h index d5b7a5d78c3..7b9cfc3a1dc 100644 --- a/src/devices/machine/msm58321.h +++ b/src/devices/machine/msm58321.h @@ -73,7 +73,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; // device_rtc_interface overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; diff --git a/src/devices/machine/msm6242.cpp b/src/devices/machine/msm6242.cpp index f6dd7c6dca7..14f206d15c7 100644 --- a/src/devices/machine/msm6242.cpp +++ b/src/devices/machine/msm6242.cpp @@ -168,7 +168,7 @@ void msm6242_device::device_post_load() // fires //------------------------------------------------- -void msm6242_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void msm6242_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/machine/msm6242.h b/src/devices/machine/msm6242.h index 6ee5929a641..17afe8794d2 100644 --- a/src/devices/machine/msm6242.h +++ b/src/devices/machine/msm6242.h @@ -62,7 +62,7 @@ protected: virtual void device_reset() override; virtual void device_pre_save() 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; // rtc overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; diff --git a/src/devices/machine/myb3k_kbd.cpp b/src/devices/machine/myb3k_kbd.cpp index 83ee8553373..9fb46201fd2 100644 --- a/src/devices/machine/myb3k_kbd.cpp +++ b/src/devices/machine/myb3k_kbd.cpp @@ -456,7 +456,7 @@ void myb3k_keyboard_device::update_modifiers(int y, bool down) m_modifier_keys = (m_modifier_keys & mask) | (down?bit:0); } -void myb3k_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void myb3k_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/myb3k_kbd.h b/src/devices/machine/myb3k_kbd.h index 384d837bf20..752c8e32546 100644 --- a/src/devices/machine/myb3k_kbd.h +++ b/src/devices/machine/myb3k_kbd.h @@ -63,7 +63,7 @@ protected: void key_changed(int x, int y, bool down); void scan_keys(); void update_modifiers(int y, bool down); - 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; output_delegate m_keyboard_cb; required_ioport_array<12> m_io_kbd_t; diff --git a/src/devices/machine/ncr5380.cpp b/src/devices/machine/ncr5380.cpp index 60906ec8ca3..9eeafad0587 100644 --- a/src/devices/machine/ncr5380.cpp +++ b/src/devices/machine/ncr5380.cpp @@ -410,7 +410,7 @@ void ncr5380_device::sdir_w(u8 data) } } -void ncr5380_device::state_timer(void *ptr, s32 param) +void ncr5380_device::state_timer(s32 param) { // step state machine int const delay = state_step(); diff --git a/src/devices/machine/ncr5380.h b/src/devices/machine/ncr5380.h index cac2ff97965..e7107ae285e 100644 --- a/src/devices/machine/ncr5380.h +++ b/src/devices/machine/ncr5380.h @@ -60,7 +60,7 @@ protected: void sdir_w(u8 data); // state machine - void state_timer(void *ptr, s32 param); + void state_timer(s32 param); int state_step(); // other helpers diff --git a/src/devices/machine/ncr5390.cpp b/src/devices/machine/ncr5390.cpp index 2c516a37ddb..c9f55ad655e 100644 --- a/src/devices/machine/ncr5390.cpp +++ b/src/devices/machine/ncr5390.cpp @@ -251,7 +251,7 @@ void ncr5390_device::scsi_ctrl_changed() step(false); } -void ncr5390_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ncr5390_device::device_timer(emu_timer &timer, device_timer_id id, int param) { step(true); } diff --git a/src/devices/machine/ncr5390.h b/src/devices/machine/ncr5390.h index 76952fe0f7b..f16ffee69cc 100644 --- a/src/devices/machine/ncr5390.h +++ b/src/devices/machine/ncr5390.h @@ -52,7 +52,7 @@ 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; enum { MODE_D, MODE_T, MODE_I }; enum { IDLE }; diff --git a/src/devices/machine/ncr539x.cpp b/src/devices/machine/ncr539x.cpp index 1ddd46b2c18..90b2e6bb8ec 100644 --- a/src/devices/machine/ncr539x.cpp +++ b/src/devices/machine/ncr539x.cpp @@ -137,7 +137,7 @@ void ncr539x_device::device_start() m_out_irq_cb.resolve_safe(); m_out_drq_cb.resolve_safe(); - m_operation_timer = timer_alloc(0, nullptr); + m_operation_timer = timer_alloc(0); } //------------------------------------------------- @@ -177,7 +177,7 @@ void ncr539x_device::dma_write_data(int bytes, uint8_t *pData) write_data(pData, bytes); } -void ncr539x_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void ncr539x_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { //printf("539X: device_timer expired, param = %d, m_command = %02x\n", param, m_command); diff --git a/src/devices/machine/ncr539x.h b/src/devices/machine/ncr539x.h index 8172f4ea5f2..62fd58a8e47 100644 --- a/src/devices/machine/ncr539x.h +++ b/src/devices/machine/ncr539x.h @@ -35,7 +35,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: void fifo_write(uint8_t data); diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp index cc1f92c5755..ad7bb45fbc2 100644 --- a/src/devices/machine/netlist.cpp +++ b/src/devices/machine/netlist.cpp @@ -289,17 +289,17 @@ void netlist_mame_analog_input_device::write(const double val) m_value_for_device_timer = val * m_mult + m_offset; if (m_value_for_device_timer != (*m_param)()) { - synchronize(0, 0, &m_value_for_device_timer); -} + synchronize(); + } } -void netlist_mame_analog_input_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void netlist_mame_analog_input_device::device_timer(emu_timer &timer, device_timer_id id, int param) { update_to_current_time(); #if NETLIST_CREATE_CSV - nl_owner().log_add(m_param_name, *((double *) ptr), true); + nl_owner().log_add(m_param_name, m_value_for_device_timer, true); #endif - m_param->set(*((double *) ptr)); + m_param->set(m_value_for_device_timer); } void netlist_mame_int_input_device::write(const uint32_t val) @@ -322,7 +322,7 @@ void netlist_mame_logic_input_device::write(const uint32_t val) } } -void netlist_mame_int_input_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void netlist_mame_int_input_device::device_timer(emu_timer &timer, device_timer_id id, int param) { update_to_current_time(); #if NETLIST_CREATE_CSV @@ -331,7 +331,7 @@ void netlist_mame_int_input_device::device_timer(emu_timer &timer, device_timer_ m_param->set(param); } -void netlist_mame_logic_input_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void netlist_mame_logic_input_device::device_timer(emu_timer &timer, device_timer_id id, int param) { update_to_current_time(); #if NETLIST_CREATE_CSV @@ -340,7 +340,7 @@ void netlist_mame_logic_input_device::device_timer(emu_timer &timer, device_time m_param->set(param); } -void netlist_mame_ram_pointer_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void netlist_mame_ram_pointer_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_data = (*m_param)(); } diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h index 7f6d0c4dde5..4745ea1f2e0 100644 --- a/src/devices/machine/netlist.h +++ b/src/devices/machine/netlist.h @@ -382,7 +382,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: netlist::param_num_t<netlist::nl_fptype> *m_param; @@ -482,7 +482,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: netlist::param_num_t<int> *m_param; @@ -523,7 +523,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: netlist::param_num_t<bool> *m_param; @@ -551,7 +551,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: netlist::param_ptr_t *m_param; diff --git a/src/devices/machine/ns32081.cpp b/src/devices/machine/ns32081.cpp index c27ffde6595..af873292056 100644 --- a/src/devices/machine/ns32081.cpp +++ b/src/devices/machine/ns32081.cpp @@ -630,7 +630,7 @@ void ns32081_device::execute() m_complete->adjust(attotime::from_ticks(m_tcy, clock())); } -void ns32081_device::complete(void *buf, s32 param) +void ns32081_device::complete(s32 param) { m_out_scb(0); m_out_scb(1); diff --git a/src/devices/machine/ns32081.h b/src/devices/machine/ns32081.h index 4097494c830..38da6767ac2 100644 --- a/src/devices/machine/ns32081.h +++ b/src/devices/machine/ns32081.h @@ -29,7 +29,7 @@ protected: virtual void device_reset() override; void execute(); - void complete(void *buf, s32 param); + void complete(s32 param); private: emu_timer *m_complete; diff --git a/src/devices/machine/ns32202.cpp b/src/devices/machine/ns32202.cpp index 3499a6bab05..8f34610f1e6 100644 --- a/src/devices/machine/ns32202.cpp +++ b/src/devices/machine/ns32202.cpp @@ -252,7 +252,7 @@ template void ns32202_device::ir_w<15>(int state); * - unmasked pending interrupt has priority > in-service interrupt; or * - unmasked pending cascade interrupt has priorty >= in-service interrupt */ -void ns32202_device::interrupt(void *ptr, s32 param) +void ns32202_device::interrupt(s32 param) { // check for unmasked pending interrupts if (!(m_ipnd & ~m_imsk)) @@ -472,7 +472,7 @@ void ns32202_device::interrupt_update() } // N=0 -> l-counter -template <unsigned N> void ns32202_device::counter(void *buf, s32 param) +template <unsigned N> void ns32202_device::counter(s32 param) { u32 const scaled_clock = clock() / ((m_cctl & CCTL_CFNPS) ? 1 : 4); diff --git a/src/devices/machine/ns32202.h b/src/devices/machine/ns32202.h index 8547bcc43e6..7795b205e91 100644 --- a/src/devices/machine/ns32202.h +++ b/src/devices/machine/ns32202.h @@ -26,13 +26,13 @@ protected: void set_int(bool int_state); void set_cout(bool cout_state); - void interrupt(void *buf, s32 param); + void interrupt(s32 param); u8 interrupt_acknowledge(bool side_effects); u8 interrupt_return(bool side_effects); void interrupt_update(); - template <unsigned N> void counter(void *buf, s32 param); + template <unsigned N> void counter(s32 param); template <unsigned ST1, bool SideEffects> u8 hvct_r(); diff --git a/src/devices/machine/nsc810.cpp b/src/devices/machine/nsc810.cpp index 42ddd8db02f..c077a86eff1 100644 --- a/src/devices/machine/nsc810.cpp +++ b/src/devices/machine/nsc810.cpp @@ -86,7 +86,7 @@ void nsc810_device::device_reset() m_ramselect = false; } -void nsc810_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nsc810_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/machine/nsc810.h b/src/devices/machine/nsc810.h index 520591208f7..f6ad2042959 100644 --- a/src/devices/machine/nsc810.h +++ b/src/devices/machine/nsc810.h @@ -52,7 +52,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; private: uint8_t m_portA_latch; diff --git a/src/devices/machine/nscsi_bus.cpp b/src/devices/machine/nscsi_bus.cpp index 2909742d1ba..89f18a902e2 100644 --- a/src/devices/machine/nscsi_bus.cpp +++ b/src/devices/machine/nscsi_bus.cpp @@ -266,7 +266,7 @@ void nscsi_full_device::device_reset() sense(false, SK_NO_SENSE); } -void nscsi_full_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nscsi_full_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(id != SCSI_TIMER) return; diff --git a/src/devices/machine/nscsi_bus.h b/src/devices/machine/nscsi_bus.h index 60c9f02a3b1..997844c4342 100644 --- a/src/devices/machine/nscsi_bus.h +++ b/src/devices/machine/nscsi_bus.h @@ -316,7 +316,7 @@ 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 void scsi_message(); virtual void scsi_command(); diff --git a/src/devices/machine/pcf8573.cpp b/src/devices/machine/pcf8573.cpp index 5a33d716be8..e7b8d514373 100644 --- a/src/devices/machine/pcf8573.cpp +++ b/src/devices/machine/pcf8573.cpp @@ -83,7 +83,7 @@ void pcf8573_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void pcf8573_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pcf8573_device::device_timer(emu_timer &timer, device_timer_id id, int param) { advance_seconds(); diff --git a/src/devices/machine/pcf8573.h b/src/devices/machine/pcf8573.h index 1085118da4f..63d0da0502e 100644 --- a/src/devices/machine/pcf8573.h +++ b/src/devices/machine/pcf8573.h @@ -64,7 +64,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; // device_rtc_interface overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; diff --git a/src/devices/machine/pcf8583.cpp b/src/devices/machine/pcf8583.cpp index 0cc31023844..7883340cf15 100644 --- a/src/devices/machine/pcf8583.cpp +++ b/src/devices/machine/pcf8583.cpp @@ -73,7 +73,7 @@ void pcf8583_device::device_start() m_irq_cb.resolve_safe(); } -void pcf8583_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pcf8583_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/pcf8583.h b/src/devices/machine/pcf8583.h index b01eadc44fd..3ece2f2d3f2 100644 --- a/src/devices/machine/pcf8583.h +++ b/src/devices/machine/pcf8583.h @@ -88,7 +88,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; // device_rtc_interface overrides virtual bool rtc_feature_y2k() const override { return true; } diff --git a/src/devices/machine/pcf8593.cpp b/src/devices/machine/pcf8593.cpp index 331e12ccdbd..dc3d93d7ad1 100644 --- a/src/devices/machine/pcf8593.cpp +++ b/src/devices/machine/pcf8593.cpp @@ -90,7 +90,7 @@ void pcf8593_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void pcf8593_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pcf8593_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/machine/pcf8593.h b/src/devices/machine/pcf8593.h index 2b6d76bc853..c51ebadc454 100644 --- a/src/devices/machine/pcf8593.h +++ b/src/devices/machine/pcf8593.h @@ -32,7 +32,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_rtc_interface overrides virtual bool rtc_feature_y2k() const override { return true; } diff --git a/src/devices/machine/pckeybrd.cpp b/src/devices/machine/pckeybrd.cpp index 015c534327c..8defcd0297e 100644 --- a/src/devices/machine/pckeybrd.cpp +++ b/src/devices/machine/pckeybrd.cpp @@ -300,7 +300,7 @@ at_keyboard_device::at_keyboard_device(const machine_config &mconfig, const char } -void pc_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pc_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param) { polling(); if(!charqueue_empty()) diff --git a/src/devices/machine/pckeybrd.h b/src/devices/machine/pckeybrd.h index 8eeb2118b6b..eb685ec175e 100644 --- a/src/devices/machine/pckeybrd.h +++ b/src/devices/machine/pckeybrd.h @@ -40,7 +40,7 @@ protected: virtual ioport_constructor device_input_ports() 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; void queue_insert(uint8_t data); void clear_buffer(); diff --git a/src/devices/machine/phi.cpp b/src/devices/machine/phi.cpp index c131f2f3191..8e44c2fb49b 100644 --- a/src/devices/machine/phi.cpp +++ b/src/devices/machine/phi.cpp @@ -417,7 +417,7 @@ void phi_device::device_reset() update_488(); } -void phi_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void phi_device::device_timer(emu_timer &timer, device_timer_id id, int param) { LOG_NOISY("tmr %d enabled %d\n" , id , timer.enabled()); update_fsm(); diff --git a/src/devices/machine/phi.h b/src/devices/machine/phi.h index 755f073a2d9..6e6e1cf54cf 100644 --- a/src/devices/machine/phi.h +++ b/src/devices/machine/phi.h @@ -95,7 +95,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: // Depth of inbound/outbound FIFOs diff --git a/src/devices/machine/pic8259.cpp b/src/devices/machine/pic8259.cpp index d5104413691..4701df8e869 100644 --- a/src/devices/machine/pic8259.cpp +++ b/src/devices/machine/pic8259.cpp @@ -29,7 +29,7 @@ ALLOW_SAVE_TYPE(pic8259_device::state_t); // allow save_item on a non-fundamental type -void pic8259_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pic8259_device::device_timer(emu_timer &timer, device_timer_id id, int param) { /* check the various IRQs */ for (int n = 0, irq = m_prio; n < 8; n++, irq = (irq + 1) & 7) diff --git a/src/devices/machine/pic8259.h b/src/devices/machine/pic8259.h index a1f14b4c51d..a140e5288c4 100644 --- a/src/devices/machine/pic8259.h +++ b/src/devices/machine/pic8259.h @@ -59,7 +59,7 @@ protected: virtual void device_resolve_objects() 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 bool is_x86() const { return m_is_x86; } diff --git a/src/devices/machine/pit8253.cpp b/src/devices/machine/pit8253.cpp index 7d0d4246b67..e3becf3d613 100644 --- a/src/devices/machine/pit8253.cpp +++ b/src/devices/machine/pit8253.cpp @@ -972,7 +972,7 @@ void pit8254_device::readback_command(uint8_t data) m_counter[timer]->readback(read_command); } -void pit_counter_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pit_counter_device::device_timer(emu_timer &timer, device_timer_id id, int param) { update(); switch (id) diff --git a/src/devices/machine/pit8253.h b/src/devices/machine/pit8253.h index c602a64a3d1..430563ebebf 100644 --- a/src/devices/machine/pit8253.h +++ b/src/devices/machine/pit8253.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; private: inline uint32_t adjusted_count() const; diff --git a/src/devices/machine/pxa255.cpp b/src/devices/machine/pxa255.cpp index 6bd82ec987c..55aba8af310 100644 --- a/src/devices/machine/pxa255.cpp +++ b/src/devices/machine/pxa255.cpp @@ -1567,7 +1567,7 @@ void pxa255_periphs_device::device_reset() memset(&m_clocks_regs, 0, sizeof(m_clocks_regs)); } -void pxa255_periphs_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pxa255_periphs_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id < TIMER_OSTIMER0) dma_end_tick(id); diff --git a/src/devices/machine/pxa255.h b/src/devices/machine/pxa255.h index 87a7cef0ce8..22ee82a4b8a 100644 --- a/src/devices/machine/pxa255.h +++ b/src/devices/machine/pxa255.h @@ -65,7 +65,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; static const device_timer_id TIMER_DMA0 = 0; static const device_timer_id TIMER_OSTIMER0 = 16; diff --git a/src/devices/machine/r10788.cpp b/src/devices/machine/r10788.cpp index f4b0ac810ab..cb1b7d9a374 100644 --- a/src/devices/machine/r10788.cpp +++ b/src/devices/machine/r10788.cpp @@ -109,7 +109,7 @@ void r10788_device::device_reset() * @param param parameter * @param ptr pointer parameter */ -void r10788_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void r10788_device::device_timer(emu_timer &timer, device_timer_id id, int param) { uint8_t data; switch (id) diff --git a/src/devices/machine/r10788.h b/src/devices/machine/r10788.h index 6ef21ccc466..452d9e14429 100644 --- a/src/devices/machine/r10788.h +++ b/src/devices/machine/r10788.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; private: static const device_timer_id TIMER_DISPLAY = 0; diff --git a/src/devices/machine/ripple_counter.cpp b/src/devices/machine/ripple_counter.cpp index 96ce53aeec6..32db0862b93 100644 --- a/src/devices/machine/ripple_counter.cpp +++ b/src/devices/machine/ripple_counter.cpp @@ -178,7 +178,7 @@ WRITE_LINE_MEMBER(ripple_counter_device::reset_w) // fires //------------------------------------------------- -void ripple_counter_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ripple_counter_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/ripple_counter.h b/src/devices/machine/ripple_counter.h index 450dc2118bb..6436723d738 100644 --- a/src/devices/machine/ripple_counter.h +++ b/src/devices/machine/ripple_counter.h @@ -43,7 +43,7 @@ protected: virtual void device_resolve_objects() override; virtual void device_start() 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_rom_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/machine/rp5c01.cpp b/src/devices/machine/rp5c01.cpp index 67850396213..8ea9e85e6ef 100644 --- a/src/devices/machine/rp5c01.cpp +++ b/src/devices/machine/rp5c01.cpp @@ -230,7 +230,7 @@ void rp5c01_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void rp5c01_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void rp5c01_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/rp5c01.h b/src/devices/machine/rp5c01.h index f26a382db67..ab62fc81cca 100644 --- a/src/devices/machine/rp5c01.h +++ b/src/devices/machine/rp5c01.h @@ -54,7 +54,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; // device_rtc_interface overrides virtual bool rtc_feature_leap_year() const override { return true; } diff --git a/src/devices/machine/rp5c15.cpp b/src/devices/machine/rp5c15.cpp index 78d71d42000..a0700a3069f 100644 --- a/src/devices/machine/rp5c15.cpp +++ b/src/devices/machine/rp5c15.cpp @@ -242,7 +242,7 @@ void rp5c15_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void rp5c15_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void rp5c15_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/rp5c15.h b/src/devices/machine/rp5c15.h index 6d4e161ac3e..7d981a9ec87 100644 --- a/src/devices/machine/rp5c15.h +++ b/src/devices/machine/rp5c15.h @@ -41,7 +41,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; // device_rtc_interface overrides virtual bool rtc_feature_leap_year() const override { return true; } diff --git a/src/devices/machine/rtc4543.cpp b/src/devices/machine/rtc4543.cpp index f58278118f6..32ae1a7a3dd 100644 --- a/src/devices/machine/rtc4543.cpp +++ b/src/devices/machine/rtc4543.cpp @@ -104,7 +104,7 @@ void rtc4543_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void rtc4543_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void rtc4543_device::device_timer(emu_timer &timer, device_timer_id id, int param) { advance_seconds(); } diff --git a/src/devices/machine/rtc4543.h b/src/devices/machine/rtc4543.h index f93fa097d59..0f2d7b689f8 100644 --- a/src/devices/machine/rtc4543.h +++ b/src/devices/machine/rtc4543.h @@ -44,7 +44,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_rtc_interface overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; diff --git a/src/devices/machine/s_smp.cpp b/src/devices/machine/s_smp.cpp index fb4396b68d5..277d40f3533 100644 --- a/src/devices/machine/s_smp.cpp +++ b/src/devices/machine/s_smp.cpp @@ -179,7 +179,7 @@ inline void s_smp_device::update_timer_tick(u8 which) } } -void s_smp_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void s_smp_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id != TIMER_TICK_ID) throw emu_fatalerror("Unknown id in s_smp_device::device_timer"); diff --git a/src/devices/machine/s_smp.h b/src/devices/machine/s_smp.h index 9fd0232329c..2654db91776 100644 --- a/src/devices/machine/s_smp.h +++ b/src/devices/machine/s_smp.h @@ -31,7 +31,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; // device_memory_interface configuration virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/machine/saa1043.cpp b/src/devices/machine/saa1043.cpp index c6766cf5b7e..1c310643dcc 100644 --- a/src/devices/machine/saa1043.cpp +++ b/src/devices/machine/saa1043.cpp @@ -62,7 +62,7 @@ void saa1043_device::device_reset() m_outputs[V2](ASSERT_LINE); } -void saa1043_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void saa1043_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/saa1043.h b/src/devices/machine/saa1043.h index 32591d58300..d6b7271dce7 100644 --- a/src/devices/machine/saa1043.h +++ b/src/devices/machine/saa1043.h @@ -101,7 +101,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: devcb_write_line::array<OUT_COUNT> m_outputs; diff --git a/src/devices/machine/scc2698b.cpp b/src/devices/machine/scc2698b.cpp index 5d70b23856e..db7ed52d4aa 100644 --- a/src/devices/machine/scc2698b.cpp +++ b/src/devices/machine/scc2698b.cpp @@ -369,7 +369,7 @@ scc2698b_device::scc2698b_device(const machine_config &mconfig, const char *tag, -void scc2698b_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void scc2698b_device::device_timer(emu_timer &timer, device_timer_id id, int param) { } diff --git a/src/devices/machine/scc2698b.h b/src/devices/machine/scc2698b.h index 84da53998c5..8b2921e3224 100644 --- a/src/devices/machine/scc2698b.h +++ b/src/devices/machine/scc2698b.h @@ -114,7 +114,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 void device_add_mconfig(machine_config &config) override; devcb_write_line write_intr_A, write_intr_B, write_intr_C, write_intr_D; diff --git a/src/devices/machine/scc68070.cpp b/src/devices/machine/scc68070.cpp index 84debddc48d..9bde1e65982 100644 --- a/src/devices/machine/scc68070.cpp +++ b/src/devices/machine/scc68070.cpp @@ -267,7 +267,7 @@ void scc68070_device::device_reset() // device_timer - device-specific timer callback //------------------------------------------------- -void scc68070_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void scc68070_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_TMR0) timer0_callback(); diff --git a/src/devices/machine/scc68070.h b/src/devices/machine/scc68070.h index 2bae392ab63..77e46e9d45f 100644 --- a/src/devices/machine/scc68070.h +++ b/src/devices/machine/scc68070.h @@ -264,7 +264,7 @@ protected: virtual void device_resolve_objects() 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_execute_interface overrides virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return (clocks + 2 - 1) / 2; } diff --git a/src/devices/machine/scnxx562.cpp b/src/devices/machine/scnxx562.cpp index c01de5be1f7..aff96002ecc 100644 --- a/src/devices/machine/scnxx562.cpp +++ b/src/devices/machine/scnxx562.cpp @@ -723,7 +723,7 @@ void duscc_channel::device_reset() m_a7 = 0; } -void duscc_channel::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void duscc_channel::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/machine/scnxx562.h b/src/devices/machine/scnxx562.h index 72f3322a2e5..ea623140966 100644 --- a/src/devices/machine/scnxx562.h +++ b/src/devices/machine/scnxx562.h @@ -152,7 +152,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_serial_interface overrides virtual void tra_callback() override; diff --git a/src/devices/machine/sega_scu.cpp b/src/devices/machine/sega_scu.cpp index d7a0bf521cb..7b049c7425f 100644 --- a/src/devices/machine/sega_scu.cpp +++ b/src/devices/machine/sega_scu.cpp @@ -270,7 +270,7 @@ void sega_scu_device::device_reset_after_children() } -void sega_scu_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sega_scu_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) diff --git a/src/devices/machine/sega_scu.h b/src/devices/machine/sega_scu.h index ae751b09d2f..c454862bea0 100644 --- a/src/devices/machine/sega_scu.h +++ b/src/devices/machine/sega_scu.h @@ -63,7 +63,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_reset_after_children() 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<scudsp_cpu_device> m_scudsp; diff --git a/src/devices/machine/smioc.cpp b/src/devices/machine/smioc.cpp index e58673a0bb0..cd871e3d0a8 100644 --- a/src/devices/machine/smioc.cpp +++ b/src/devices/machine/smioc.cpp @@ -214,8 +214,8 @@ smioc_device::smioc_device(const machine_config &mconfig, const char *tag, devic void smioc_device::device_start() { - m_dma_timer = timer_alloc(0, nullptr); - m_451_timer = timer_alloc(1, nullptr); + m_dma_timer = timer_alloc(0); + m_451_timer = timer_alloc(1); /* Resolve callbacks */ m_m68k_r_cb.resolve_safe(0); @@ -246,7 +246,7 @@ void smioc_device::SoftReset() } -void smioc_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void smioc_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { switch (tid) { diff --git a/src/devices/machine/smioc.h b/src/devices/machine/smioc.h index a75a5b33ed3..4939fb53b1b 100644 --- a/src/devices/machine/smioc.h +++ b/src/devices/machine/smioc.h @@ -108,7 +108,7 @@ protected: /* Optional information overrides */ virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const 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; u16 ReadDmaParameter(smioc_dma_parameter_t param); int DmaParameterAddress(smioc_dma_parameter_t param); diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp index 4f2e9ca8295..30047cb51f1 100644 --- a/src/devices/machine/smpc.cpp +++ b/src/devices/machine/smpc.cpp @@ -564,7 +564,7 @@ void smpc_hle_device::command_register_w(uint8_t data) } -void smpc_hle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void smpc_hle_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/machine/smpc.h b/src/devices/machine/smpc.h index b62d13dc1d3..a2f7c140ef0 100644 --- a/src/devices/machine/smpc.h +++ b/src/devices/machine/smpc.h @@ -86,7 +86,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 space_config_vector memory_space_config() const override; private: diff --git a/src/devices/machine/spg290_cdservo.cpp b/src/devices/machine/spg290_cdservo.cpp index 651d5e16818..aa0ed1856d4 100644 --- a/src/devices/machine/spg290_cdservo.cpp +++ b/src/devices/machine/spg290_cdservo.cpp @@ -101,7 +101,7 @@ void spg290_cdservo_device::device_reset() change_status(); } -void spg290_cdservo_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void spg290_cdservo_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (!(m_control1 & 0x04) && m_cur_sector == m_seek_lba + SPG290_LEADIN_LEN) { diff --git a/src/devices/machine/spg290_cdservo.h b/src/devices/machine/spg290_cdservo.h index 790e7b4c28d..aff8cb62447 100644 --- a/src/devices/machine/spg290_cdservo.h +++ b/src/devices/machine/spg290_cdservo.h @@ -31,7 +31,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; private: void change_status(); diff --git a/src/devices/machine/spg290_i2c.cpp b/src/devices/machine/spg290_i2c.cpp index 94faef82598..0475824c9bc 100644 --- a/src/devices/machine/spg290_i2c.cpp +++ b/src/devices/machine/spg290_i2c.cpp @@ -52,7 +52,7 @@ void spg290_i2c_device::device_reset() m_irq_cb(CLEAR_LINE); } -void spg290_i2c_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void spg290_i2c_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (m_config & 0x40) m_rdata = m_i2c_read_cb(m_port_addr); diff --git a/src/devices/machine/spg290_i2c.h b/src/devices/machine/spg290_i2c.h index 9b6c35cd9d9..5e9fd0b3347 100644 --- a/src/devices/machine/spg290_i2c.h +++ b/src/devices/machine/spg290_i2c.h @@ -23,7 +23,7 @@ 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; private: devcb_write_line m_irq_cb; diff --git a/src/devices/machine/spg290_timer.cpp b/src/devices/machine/spg290_timer.cpp index 25ee7790e8b..e574f3fcf39 100644 --- a/src/devices/machine/spg290_timer.cpp +++ b/src/devices/machine/spg290_timer.cpp @@ -56,7 +56,7 @@ void spg290_timer_device::device_clock_changed() m_tick_timer->adjust(attotime::never); } -void spg290_timer_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void spg290_timer_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (!BIT(m_control, 31)) return; diff --git a/src/devices/machine/spg290_timer.h b/src/devices/machine/spg290_timer.h index 44c399fbb64..9f3c3fe1e80 100644 --- a/src/devices/machine/spg290_timer.h +++ b/src/devices/machine/spg290_timer.h @@ -22,7 +22,7 @@ protected: 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: devcb_write_line m_irq_cb; diff --git a/src/devices/machine/spg2xx_audio.cpp b/src/devices/machine/spg2xx_audio.cpp index 2441ebf17ce..8c6c76c3fab 100644 --- a/src/devices/machine/spg2xx_audio.cpp +++ b/src/devices/machine/spg2xx_audio.cpp @@ -159,7 +159,7 @@ void spg2xx_audio_device::device_stop() #endif } -void spg2xx_audio_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void spg2xx_audio_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id >= TIMER_IRQ && id < (TIMER_IRQ + 16)) { diff --git a/src/devices/machine/spg2xx_audio.h b/src/devices/machine/spg2xx_audio.h index 588d49e7895..72d9fd736d5 100644 --- a/src/devices/machine/spg2xx_audio.h +++ b/src/devices/machine/spg2xx_audio.h @@ -337,7 +337,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_stop() 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; uint16_t read_space(offs_t offset); diff --git a/src/devices/machine/spg2xx_video.cpp b/src/devices/machine/spg2xx_video.cpp index da3bb29f7df..cdf93b52c51 100644 --- a/src/devices/machine/spg2xx_video.cpp +++ b/src/devices/machine/spg2xx_video.cpp @@ -463,7 +463,7 @@ void spg2xx_video_device::check_video_irq() m_video_irq_cb((VIDEO_IRQ_STATUS & VIDEO_IRQ_ENABLE) ? ASSERT_LINE : CLEAR_LINE); } -void spg2xx_video_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void spg2xx_video_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/spg2xx_video.h b/src/devices/machine/spg2xx_video.h index 2d48f247bdc..fe21cd39984 100644 --- a/src/devices/machine/spg2xx_video.h +++ b/src/devices/machine/spg2xx_video.h @@ -46,7 +46,7 @@ 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; void do_sprite_dma(uint32_t len); diff --git a/src/devices/machine/sun4c_mmu.cpp b/src/devices/machine/sun4c_mmu.cpp index feadefe0566..655326ccc1a 100644 --- a/src/devices/machine/sun4c_mmu.cpp +++ b/src/devices/machine/sun4c_mmu.cpp @@ -221,7 +221,7 @@ void sun4_mmu_base_device::device_reset() memset(&m_cachedata[0], 0, sizeof(uint32_t) * 16384); } -void sun4_mmu_base_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sun4_mmu_base_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_RESET) { diff --git a/src/devices/machine/sun4c_mmu.h b/src/devices/machine/sun4c_mmu.h index 9152705a905..10e6afe8812 100644 --- a/src/devices/machine/sun4c_mmu.h +++ b/src/devices/machine/sun4c_mmu.h @@ -127,7 +127,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_stop() 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; uint32_t page_entry_to_uint(uint32_t index); void merge_page_entry(uint32_t index, uint32_t data, uint32_t mem_mask); diff --git a/src/devices/machine/swim1.cpp b/src/devices/machine/swim1.cpp index 57afba463f4..7e9a047d3d5 100644 --- a/src/devices/machine/swim1.cpp +++ b/src/devices/machine/swim1.cpp @@ -380,7 +380,7 @@ void swim1_device::ism_write(offs_t offset, u8 data) } } -void swim1_device::device_timer(emu_timer &, device_timer_id, int, void *) +void swim1_device::device_timer(emu_timer &, device_timer_id, int) { if(m_iwm_active == MODE_DELAY) { flush_write(); diff --git a/src/devices/machine/swim1.h b/src/devices/machine/swim1.h index a9cdfd18931..dd87bf3fb43 100644 --- a/src/devices/machine/swim1.h +++ b/src/devices/machine/swim1.h @@ -35,7 +35,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; private: enum { diff --git a/src/devices/machine/swim2.cpp b/src/devices/machine/swim2.cpp index c4b8ee387f4..d04ea62ed98 100644 --- a/src/devices/machine/swim2.cpp +++ b/src/devices/machine/swim2.cpp @@ -78,7 +78,7 @@ void swim2_device::device_reset() m_last_sync = machine().time().as_ticks(clock()); } -void swim2_device::device_timer(emu_timer &, device_timer_id, int, void *) +void swim2_device::device_timer(emu_timer &, device_timer_id, int) { } diff --git a/src/devices/machine/swim2.h b/src/devices/machine/swim2.h index 20df1671131..8cf665986c8 100644 --- a/src/devices/machine/swim2.h +++ b/src/devices/machine/swim2.h @@ -36,7 +36,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; private: enum { diff --git a/src/devices/machine/swim3.cpp b/src/devices/machine/swim3.cpp index 1be0e9937f6..41f313c3ee5 100644 --- a/src/devices/machine/swim3.cpp +++ b/src/devices/machine/swim3.cpp @@ -300,7 +300,7 @@ void swim3_device::index_callback(floppy_image_device *floppy, int state) run(false, true); } } -void swim3_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void swim3_device::device_timer(emu_timer &timer, device_timer_id id, int param) { sync(); run(true, false); diff --git a/src/devices/machine/swim3.h b/src/devices/machine/swim3.h index c3cf7d9361e..e6a1cba19d1 100644 --- a/src/devices/machine/swim3.h +++ b/src/devices/machine/swim3.h @@ -42,7 +42,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; private: enum { diff --git a/src/devices/machine/swtpc8212.cpp b/src/devices/machine/swtpc8212.cpp index fffd6eefe7f..68d433e1186 100644 --- a/src/devices/machine/swtpc8212.cpp +++ b/src/devices/machine/swtpc8212.cpp @@ -329,7 +329,7 @@ MC6845_UPDATE_ROW(swtpc8212_device::update_row) } } -void swtpc8212_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void swtpc8212_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/swtpc8212.h b/src/devices/machine/swtpc8212.h index 343d182de4b..6e503b26e47 100644 --- a/src/devices/machine/swtpc8212.h +++ b/src/devices/machine/swtpc8212.h @@ -39,7 +39,7 @@ protected: virtual void device_resolve_objects() 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 ioport_constructor device_input_ports() const override; diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp index ed1dd4d001f..9dd98c13a00 100644 --- a/src/devices/machine/terminal.cpp +++ b/src/devices/machine/terminal.cpp @@ -361,7 +361,7 @@ void generic_terminal_device::device_reset() m_framecnt = 0; } -void generic_terminal_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void generic_terminal_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/terminal.h b/src/devices/machine/terminal.h index aa98c91dc62..620d04c3c1e 100644 --- a/src/devices/machine/terminal.h +++ b/src/devices/machine/terminal.h @@ -41,7 +41,7 @@ protected: virtual void term_write(uint8_t data); 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 ioport_constructor device_input_ports() const override; virtual void device_add_mconfig(machine_config &config) override; virtual void send_key(uint8_t code) { if (!m_keyboard_cb.isnull()) m_keyboard_cb(code); } diff --git a/src/devices/machine/ticket.cpp b/src/devices/machine/ticket.cpp index 8cf8e3fddf0..a3ab3072393 100644 --- a/src/devices/machine/ticket.cpp +++ b/src/devices/machine/ticket.cpp @@ -159,7 +159,7 @@ void ticket_dispenser_device::device_reset() // device_timer - handle timer callbacks //------------------------------------------------- -void ticket_dispenser_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ticket_dispenser_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // if we still have power, keep toggling ticket states if (m_power) diff --git a/src/devices/machine/ticket.h b/src/devices/machine/ticket.h index 7330ad3cb74..ee4e2bfed1d 100644 --- a/src/devices/machine/ticket.h +++ b/src/devices/machine/ticket.h @@ -71,7 +71,7 @@ protected: // device-level overrides virtual void device_start() override ATTR_COLD; virtual void device_reset() override ATTR_COLD; - 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; // configuration state uint8_t m_motor_sense; diff --git a/src/devices/machine/timekpr.cpp b/src/devices/machine/timekpr.cpp index 5128ef1ac62..fbddc56d1ab 100644 --- a/src/devices/machine/timekpr.cpp +++ b/src/devices/machine/timekpr.cpp @@ -268,7 +268,7 @@ void timekeeper_device::counters_from_ram() m_century = counter_from_ram(&m_data[0], m_offset_century); } -void timekeeper_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void timekeeper_device::device_timer(emu_timer &timer, device_timer_id id, int param) { LOGMASKED(LOG_TICKS, "Tick\n"); if ((m_seconds & SECONDS_ST) != 0 || diff --git a/src/devices/machine/timekpr.h b/src/devices/machine/timekpr.h index def60c02059..e32b135576c 100644 --- a/src/devices/machine/timekpr.h +++ b/src/devices/machine/timekpr.h @@ -46,7 +46,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_nvram_interface overrides virtual void nvram_default() override; diff --git a/src/devices/machine/timer.cpp b/src/devices/machine/timer.cpp index 2461fb4da30..d5e0efe9394 100644 --- a/src/devices/machine/timer.cpp +++ b/src/devices/machine/timer.cpp @@ -37,7 +37,6 @@ timer_device::timer_device(const machine_config &mconfig, const char *tag, devic : device_t(mconfig, TIMER, tag, owner, clock), m_type(TIMER_TYPE_GENERIC), m_callback(*this), - m_ptr(nullptr), m_start_delay(attotime::zero), m_period(attotime::zero), m_param(0), @@ -158,7 +157,7 @@ void timer_device::device_reset() // device_timer - handle timer expiration events //------------------------------------------------- -void timer_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void timer_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (m_type) { @@ -166,7 +165,7 @@ void timer_device::device_timer(emu_timer &timer, device_timer_id id, int param, case TIMER_TYPE_GENERIC: case TIMER_TYPE_PERIODIC: if (!m_callback.isnull()) - (m_callback)(*this, m_ptr, param); + (m_callback)(*this, param); break; // scanline timers have to do some additional bookkeeping @@ -181,7 +180,7 @@ void timer_device::device_timer(emu_timer &timer, device_timer_id id, int param, // call the real callback int vpos = m_screen->vpos(); if (!m_callback.isnull()) - (m_callback)(*this, m_ptr, vpos); + (m_callback)(*this, vpos); // advance by the increment only if we will still be within the screen bounds if (m_increment != 0 && (vpos + m_increment) < m_screen->height()) diff --git a/src/devices/machine/timer.h b/src/devices/machine/timer.h index 04d0f192325..c2e5bcefa6c 100644 --- a/src/devices/machine/timer.h +++ b/src/devices/machine/timer.h @@ -20,7 +20,7 @@ //************************************************************************** // macros for a timer callback functions -#define TIMER_DEVICE_CALLBACK_MEMBER(name) void name(timer_device &timer, void *ptr, s32 param) +#define TIMER_DEVICE_CALLBACK_MEMBER(name) void name(timer_device &timer, s32 param) //************************************************************************** // TYPE DEFINITIONS @@ -32,7 +32,7 @@ class timer_device : public device_t { public: // a timer callbacks look like this - typedef device_delegate<void (timer_device &, void *, s32)> expired_delegate; + typedef device_delegate<void (timer_device &, s32)> expired_delegate; // construction/destruction timer_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); @@ -81,12 +81,10 @@ public: // property getters int param() const { return m_timer->param(); } - void *ptr() const { return m_ptr; } bool enabled() const { return m_timer->enabled(); } // property setters void set_param(int param) const { if(m_type != TIMER_TYPE_GENERIC) fatalerror("Cannot change parameter on a non-generic timer.\n"); m_timer->set_param(param); } - void set_ptr(void *ptr) { m_ptr = ptr; } void enable(bool enable = true) const { m_timer->enable(enable); } // adjustments @@ -110,7 +108,7 @@ private: virtual void device_validity_check(validity_checker &valid) 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; // timer types enum timer_type @@ -123,7 +121,6 @@ private: // configuration data timer_type m_type; // type of timer expired_delegate m_callback; // the timer's callback function - void * m_ptr; // the pointer parameter passed to the timer callback // periodic timers only attotime m_start_delay; // delay before the timer fires for the first time diff --git a/src/devices/machine/tms5501.cpp b/src/devices/machine/tms5501.cpp index 6f115084d70..43d30a2c2d0 100644 --- a/src/devices/machine/tms5501.cpp +++ b/src/devices/machine/tms5501.cpp @@ -125,7 +125,7 @@ void tms5501_device::device_reset() // device_timer - handle timer events //------------------------------------------------- -void tms5501_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tms5501_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/tms5501.h b/src/devices/machine/tms5501.h index 74fae77b586..f2acc942478 100644 --- a/src/devices/machine/tms5501.h +++ b/src/devices/machine/tms5501.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; // device_serial_interface overrides virtual void tra_callback() override; diff --git a/src/devices/machine/tms9901.cpp b/src/devices/machine/tms9901.cpp index 64250f7079a..c05cffad2a7 100644 --- a/src/devices/machine/tms9901.cpp +++ b/src/devices/machine/tms9901.cpp @@ -453,7 +453,7 @@ void tms9901_device::write_bit(int offset, bool data) Decrementer counts down the value set in clock mode; when it reaches 0, raises an interrupt and resets to the start value */ -void tms9901_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tms9901_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id==DECREMENTER) // we have only that one { diff --git a/src/devices/machine/tms9901.h b/src/devices/machine/tms9901.h index 7947845601a..fd0d68c01cb 100644 --- a/src/devices/machine/tms9901.h +++ b/src/devices/machine/tms9901.h @@ -89,7 +89,7 @@ public: private: static constexpr device_timer_id DECREMENTER = 0; - 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 soft_reset(); void device_start() override; diff --git a/src/devices/machine/tms9902.cpp b/src/devices/machine/tms9902.cpp index 2431d7abb41..6c5b54a6095 100644 --- a/src/devices/machine/tms9902.cpp +++ b/src/devices/machine/tms9902.cpp @@ -256,7 +256,7 @@ void tms9902_device::rcv_break(bool value) /* Timer callback */ -void tms9902_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tms9902_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/tms9902.h b/src/devices/machine/tms9902.h index ce236cf18c7..37570b9ba5e 100644 --- a/src/devices/machine/tms9902.h +++ b/src/devices/machine/tms9902.h @@ -73,7 +73,7 @@ public: void cruwrite(offs_t offset, uint8_t data); protected: - 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_start() override; virtual void device_reset() override; virtual void device_stop() override; diff --git a/src/devices/machine/tms9914.cpp b/src/devices/machine/tms9914.cpp index b8d7b05e4a4..0c230efebeb 100644 --- a/src/devices/machine/tms9914.cpp +++ b/src/devices/machine/tms9914.cpp @@ -593,7 +593,7 @@ void tms9914_device::device_reset() update_ren(); } -void tms9914_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tms9914_device::device_timer(emu_timer &timer, device_timer_id id, int param) { LOG_NOISY("tmr %d\n" , id); update_fsm(); diff --git a/src/devices/machine/tms9914.h b/src/devices/machine/tms9914.h index 2c766f0dfc3..7b346a2e1d3 100644 --- a/src/devices/machine/tms9914.h +++ b/src/devices/machine/tms9914.h @@ -94,7 +94,7 @@ private: // 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; devcb_read8 m_dio_read_func; devcb_write8 m_dio_write_func; diff --git a/src/devices/machine/upd1990a.cpp b/src/devices/machine/upd1990a.cpp index 6b14f95c123..8cad6a3bd3f 100644 --- a/src/devices/machine/upd1990a.cpp +++ b/src/devices/machine/upd1990a.cpp @@ -133,7 +133,7 @@ void upd1990a_device::rtc_clock_updated(int year, int month, int day, int day_of // device_timer - handler timer events //------------------------------------------------- -void upd1990a_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void upd1990a_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/upd1990a.h b/src/devices/machine/upd1990a.h index fbd26e6dfb4..9d41cf24f56 100644 --- a/src/devices/machine/upd1990a.h +++ b/src/devices/machine/upd1990a.h @@ -55,7 +55,7 @@ protected: upd1990a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant); 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; // device_rtc_interface overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; diff --git a/src/devices/machine/upd4991a.cpp b/src/devices/machine/upd4991a.cpp index da192819024..0252ccb2266 100644 --- a/src/devices/machine/upd4991a.cpp +++ b/src/devices/machine/upd4991a.cpp @@ -69,7 +69,7 @@ void upd4991a_device::device_start() } -void upd4991a_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void upd4991a_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/upd4991a.h b/src/devices/machine/upd4991a.h index 64746980a87..9b2d797ac7b 100644 --- a/src/devices/machine/upd4991a.h +++ b/src/devices/machine/upd4991a.h @@ -35,7 +35,7 @@ protected: // device-level overrides virtual void device_validity_check(validity_checker &valid) const 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 void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; private: diff --git a/src/devices/machine/upd4992.cpp b/src/devices/machine/upd4992.cpp index 60a2eece92b..04ffb207350 100644 --- a/src/devices/machine/upd4992.cpp +++ b/src/devices/machine/upd4992.cpp @@ -63,7 +63,7 @@ void upd4992_device::device_start() } -void upd4992_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void upd4992_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/upd4992.h b/src/devices/machine/upd4992.h index 7ceb831410b..edf58cbeb3e 100644 --- a/src/devices/machine/upd4992.h +++ b/src/devices/machine/upd4992.h @@ -34,7 +34,7 @@ protected: // device-level overrides virtual void device_validity_check(validity_checker &valid) const 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 void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; private: diff --git a/src/devices/machine/upd7002.cpp b/src/devices/machine/upd7002.cpp index 3985d05b733..4288035eeba 100644 --- a/src/devices/machine/upd7002.cpp +++ b/src/devices/machine/upd7002.cpp @@ -68,7 +68,7 @@ READ_LINE_MEMBER( upd7002_device::eoc_r ) } -void upd7002_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void upd7002_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/machine/upd7002.h b/src/devices/machine/upd7002.h index 5f9e88928c7..06d353ca1fd 100644 --- a/src/devices/machine/upd7002.h +++ b/src/devices/machine/upd7002.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: // internal state diff --git a/src/devices/machine/upd7004.cpp b/src/devices/machine/upd7004.cpp index e3cfb911864..bd3df848884 100644 --- a/src/devices/machine/upd7004.cpp +++ b/src/devices/machine/upd7004.cpp @@ -74,7 +74,7 @@ void upd7004_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void upd7004_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void upd7004_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (m_state) { diff --git a/src/devices/machine/upd7004.h b/src/devices/machine/upd7004.h index 11b311b60f2..6f52e1533a3 100644 --- a/src/devices/machine/upd7004.h +++ b/src/devices/machine/upd7004.h @@ -49,7 +49,7 @@ public: // 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: // callbacks diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp index 3f0c442555f..3c8f3add09e 100644 --- a/src/devices/machine/upd765.cpp +++ b/src/devices/machine/upd765.cpp @@ -2522,7 +2522,7 @@ std::string upd765_family_device::ttsn() const return machine().time().to_string(); } -void upd765_family_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void upd765_family_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(id == TIMER_DRIVE_READY_POLLING) { run_drive_ready_polling(); diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h index 9e5f845efbf..f7c2334e477 100644 --- a/src/devices/machine/upd765.h +++ b/src/devices/machine/upd765.h @@ -64,7 +64,7 @@ protected: virtual void device_resolve_objects() 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; enum { TIMER_DRIVE_READY_POLLING = 4 diff --git a/src/devices/machine/vic_pl192.cpp b/src/devices/machine/vic_pl192.cpp index bd7c4de4e2c..a0616a349a0 100644 --- a/src/devices/machine/vic_pl192.cpp +++ b/src/devices/machine/vic_pl192.cpp @@ -15,7 +15,7 @@ DEFINE_DEVICE_TYPE(PL190_VIC, vic_pl190_device, "vic_pl190", "ARM PL190 VIC") DEFINE_DEVICE_TYPE(UPD800468_VIC, vic_upd800468_device, "vic_upd800468", "NEC uPD800468 VIC") DEFINE_DEVICE_TYPE(PL192_VIC, vic_pl192_device, "vic_pl192", "ARM PL192 VIC") -void vic_pl190_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void vic_pl190_device::device_timer(emu_timer &timer, device_timer_id id, int param) { u32 intrs = (raw_intr | soft_intr) & intr_en; diff --git a/src/devices/machine/vic_pl192.h b/src/devices/machine/vic_pl192.h index cb07a8854d5..01c58e9d241 100644 --- a/src/devices/machine/vic_pl192.h +++ b/src/devices/machine/vic_pl192.h @@ -70,7 +70,7 @@ protected: virtual void device_resolve_objects() 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 space_config_vector memory_space_config() const override; diff --git a/src/devices/machine/vrender0.cpp b/src/devices/machine/vrender0.cpp index c97a40a5736..c4e1c3ce5e1 100644 --- a/src/devices/machine/vrender0.cpp +++ b/src/devices/machine/vrender0.cpp @@ -164,8 +164,10 @@ void vrender0soc_device::device_start() if (this->clock() == 0) fatalerror("%s: bus clock not setup properly",this->tag()); - for (int i = 0; i < 4; i++) - m_Timer[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(vrender0soc_device::Timercb),this), (void*)(uintptr_t)i); + m_Timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(vrender0soc_device::Timercb<0>),this)); + m_Timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(vrender0soc_device::Timercb<1>),this)); + m_Timer[2] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(vrender0soc_device::Timercb<2>),this)); + m_Timer[3] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(vrender0soc_device::Timercb<3>),this)); write_tx.resolve_all_safe(); @@ -362,17 +364,17 @@ void vrender0soc_device::TimerStart(int which) // printf("timer %d start, PD = %x TCV = %x period = %s\n", which, PD, TCV, period.as_string()); } +template<int Which> TIMER_CALLBACK_MEMBER(vrender0soc_device::Timercb) { - int which = (int)(uintptr_t)ptr; static const int num[] = { 0, 1, 9, 10 }; - if (m_timer_control[which] & 2) - TimerStart(which); + if (m_timer_control[Which] & 2) + TimerStart(Which); else - m_timer_control[which] &= ~1; + m_timer_control[Which] &= ~1; - IntReq(num[which]); + IntReq(num[Which]); } template<int Which> diff --git a/src/devices/machine/vrender0.h b/src/devices/machine/vrender0.h index 1d11acbacab..8a3b19d59fb 100644 --- a/src/devices/machine/vrender0.h +++ b/src/devices/machine/vrender0.h @@ -150,7 +150,7 @@ private: template<int Which> uint32_t tmcon_r(); template<int Which> void tmcnt_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); template<int Which> uint16_t tmcnt_r(); - TIMER_CALLBACK_MEMBER(Timercb); + template<int Which> TIMER_CALLBACK_MEMBER(Timercb); uint32_t m_timer_control[4] = { 0, 0, 0, 0 }; uint16_t m_timer_count[4] = { 0, 0, 0, 0 }; diff --git a/src/devices/machine/watchdog.cpp b/src/devices/machine/watchdog.cpp index 7829709abff..01f363b0a28 100644 --- a/src/devices/machine/watchdog.cpp +++ b/src/devices/machine/watchdog.cpp @@ -90,7 +90,7 @@ void watchdog_timer_device::device_reset() // device_timer - handle timer expiration events //------------------------------------------------- -void watchdog_timer_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void watchdog_timer_device::device_timer(emu_timer &timer, device_timer_id id, int param) { watchdog_fired(); } diff --git a/src/devices/machine/watchdog.h b/src/devices/machine/watchdog.h index 0c93a62ac01..a140b13e319 100644 --- a/src/devices/machine/watchdog.h +++ b/src/devices/machine/watchdog.h @@ -42,7 +42,7 @@ protected: virtual void device_validity_check(validity_checker &valid) 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; private: // internal helpers diff --git a/src/devices/machine/wd1000.cpp b/src/devices/machine/wd1000.cpp index f8c879ef20e..efe6a64e553 100644 --- a/src/devices/machine/wd1000.cpp +++ b/src/devices/machine/wd1000.cpp @@ -114,7 +114,7 @@ void wd1000_device::device_reset() // device_timer - device-specific timer //------------------------------------------------- -void wd1000_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void wd1000_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { switch (tid) { diff --git a/src/devices/machine/wd1000.h b/src/devices/machine/wd1000.h index ac2219e8425..6b12f325b1c 100644 --- a/src/devices/machine/wd1000.h +++ b/src/devices/machine/wd1000.h @@ -45,7 +45,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: enum diff --git a/src/devices/machine/wd1010.cpp b/src/devices/machine/wd1010.cpp index 4c77c88b215..b1ce0d8b168 100644 --- a/src/devices/machine/wd1010.cpp +++ b/src/devices/machine/wd1010.cpp @@ -127,7 +127,7 @@ void wd1010_device::device_reset() // device_timer - device-specific timer //------------------------------------------------- -void wd1010_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void wd1010_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { switch (tid) { diff --git a/src/devices/machine/wd1010.h b/src/devices/machine/wd1010.h index 81607536f34..980c0518f32 100644 --- a/src/devices/machine/wd1010.h +++ b/src/devices/machine/wd1010.h @@ -54,7 +54,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: enum diff --git a/src/devices/machine/wd2010.cpp b/src/devices/machine/wd2010.cpp index 486d22b47f0..fd4fbac41a1 100644 --- a/src/devices/machine/wd2010.cpp +++ b/src/devices/machine/wd2010.cpp @@ -875,7 +875,7 @@ void wd2010_device::buffer_ready(bool state) } -void wd2010_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void wd2010_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { switch (tid) { diff --git a/src/devices/machine/wd2010.h b/src/devices/machine/wd2010.h index 1617f886ed6..5f5acc6ebfd 100644 --- a/src/devices/machine/wd2010.h +++ b/src/devices/machine/wd2010.h @@ -50,7 +50,7 @@ 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; private: void compute_correction(uint8_t data); diff --git a/src/devices/machine/wd33c9x.cpp b/src/devices/machine/wd33c9x.cpp index 89d89e30051..dd7fa07a7c4 100644 --- a/src/devices/machine/wd33c9x.cpp +++ b/src/devices/machine/wd33c9x.cpp @@ -446,7 +446,7 @@ void wd33c9x_base_device::device_reset() // device_timer - device-specific timer handler //------------------------------------------------- -void wd33c9x_base_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void wd33c9x_base_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { step(true); } diff --git a/src/devices/machine/wd33c9x.h b/src/devices/machine/wd33c9x.h index bdfb84fe8d9..fcc3e50051a 100644 --- a/src/devices/machine/wd33c9x.h +++ b/src/devices/machine/wd33c9x.h @@ -43,7 +43,7 @@ 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 void scsi_ctrl_changed() override; diff --git a/src/devices/machine/wd_fdc.cpp b/src/devices/machine/wd_fdc.cpp index 29645a83489..fa1b4013f49 100644 --- a/src/devices/machine/wd_fdc.cpp +++ b/src/devices/machine/wd_fdc.cpp @@ -315,7 +315,7 @@ WRITE_LINE_MEMBER(wd_fdc_device_base::dden_w) } } -void wd_fdc_device_base::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void wd_fdc_device_base::device_timer(emu_timer &timer, device_timer_id id, int param) { LOGEVENT("Event fired for timer %s\n", (id==TM_GEN)? "TM_GEN" : (id==TM_CMD)? "TM_CMD" : (id==TM_TRACK)? "TM_TRACK" : "TM_SECTOR"); live_sync(); diff --git a/src/devices/machine/wd_fdc.h b/src/devices/machine/wd_fdc.h index 6d9ee3a8d55..c205bfe3afd 100644 --- a/src/devices/machine/wd_fdc.h +++ b/src/devices/machine/wd_fdc.h @@ -117,7 +117,7 @@ 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 int calc_sector_size(uint8_t size, uint8_t command) const; virtual int settle_time() const; diff --git a/src/devices/machine/wozfdc.cpp b/src/devices/machine/wozfdc.cpp index 0c316a4c108..9b3aa213dbf 100644 --- a/src/devices/machine/wozfdc.cpp +++ b/src/devices/machine/wozfdc.cpp @@ -178,7 +178,7 @@ void appleiii_fdc_device::device_reset() enable1 = 1; } -void wozfdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void wozfdc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(active) lss_sync(); diff --git a/src/devices/machine/wozfdc.h b/src/devices/machine/wozfdc.h index 6c7a438be17..ad638ec16f0 100644 --- a/src/devices/machine/wozfdc.h +++ b/src/devices/machine/wozfdc.h @@ -39,7 +39,7 @@ 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; void control(int offset); void set_phase(uint8_t data); diff --git a/src/devices/machine/ym2148.cpp b/src/devices/machine/ym2148.cpp index 04a3e53e97e..bc07d809f19 100644 --- a/src/devices/machine/ym2148.cpp +++ b/src/devices/machine/ym2148.cpp @@ -136,7 +136,7 @@ void ym2148_device::update_irq() } -void ym2148_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ym2148_device::device_timer(emu_timer &timer, device_timer_id id, int param) { receive_clock(); transmit_clock(); diff --git a/src/devices/machine/ym2148.h b/src/devices/machine/ym2148.h index 3cb13bf2058..70130ce3f5d 100644 --- a/src/devices/machine/ym2148.h +++ b/src/devices/machine/ym2148.h @@ -40,7 +40,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; private: devcb_write_line m_txd_handler; diff --git a/src/devices/machine/ym3802.cpp b/src/devices/machine/ym3802.cpp index 3f0e8080ba7..85a0bea0292 100644 --- a/src/devices/machine/ym3802.cpp +++ b/src/devices/machine/ym3802.cpp @@ -54,7 +54,7 @@ void ym3802_device::device_reset() set_comms_mode(); } -void ym3802_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ym3802_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // TODO: support clock and timers switch(id) diff --git a/src/devices/machine/ym3802.h b/src/devices/machine/ym3802.h index 68cdf4d535d..05adada6b4f 100644 --- a/src/devices/machine/ym3802.h +++ b/src/devices/machine/ym3802.h @@ -41,7 +41,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; private: enum diff --git a/src/devices/machine/z80ctc.cpp b/src/devices/machine/z80ctc.cpp index 654591e64e0..3dbd8b25ad1 100644 --- a/src/devices/machine/z80ctc.cpp +++ b/src/devices/machine/z80ctc.cpp @@ -497,7 +497,7 @@ void z80ctc_channel_device::trigger(bool state) { // if we hit zero, do the same thing as for a timer interrupt if (--m_down == 0) - timer_callback(nullptr,0); + timer_callback(0); } } } diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp index 1a1dc0a3eda..81a35652df5 100644 --- a/src/devices/machine/z80scc.cpp +++ b/src/devices/machine/z80scc.cpp @@ -1185,7 +1185,7 @@ void z80scc_channel::device_reset() m_extint_states = m_rr0; } -void z80scc_channel::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void z80scc_channel::device_timer(emu_timer &timer, device_timer_id id, int param) { // LOG("%s %d\n", FUNCNAME, id); diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h index 18d6ffffc55..466b5270848 100644 --- a/src/devices/machine/z80scc.h +++ b/src/devices/machine/z80scc.h @@ -64,7 +64,7 @@ public: // 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_serial_interface overrides virtual void tra_callback() override; diff --git a/src/devices/machine/z80sti.cpp b/src/devices/machine/z80sti.cpp index 22d03323aa9..f049c3d19fa 100644 --- a/src/devices/machine/z80sti.cpp +++ b/src/devices/machine/z80sti.cpp @@ -179,7 +179,7 @@ void z80sti_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void z80sti_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void z80sti_device::device_timer(emu_timer &timer, device_timer_id id, int param) { timer_count(id); } diff --git a/src/devices/machine/z80sti.h b/src/devices/machine/z80sti.h index 24c23964f3d..2d5dba0f397 100644 --- a/src/devices/machine/z80sti.h +++ b/src/devices/machine/z80sti.h @@ -148,7 +148,7 @@ private: // 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_serial_interface overrides virtual void tra_callback() override; diff --git a/src/devices/machine/z8536.cpp b/src/devices/machine/z8536.cpp index 6d4fe6825c5..e95dfe7574a 100644 --- a/src/devices/machine/z8536.cpp +++ b/src/devices/machine/z8536.cpp @@ -888,7 +888,7 @@ void z8536_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void cio_base_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cio_base_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (counter_enabled(TIMER_1) && !counter_external_count(TIMER_1)) { diff --git a/src/devices/machine/z8536.h b/src/devices/machine/z8536.h index e307ea09069..442b3e7a00f 100644 --- a/src/devices/machine/z8536.h +++ b/src/devices/machine/z8536.h @@ -109,7 +109,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; bool is_reset() const { return (m_register[MASTER_INTERRUPT_CONTROL] & MICR_RESET) != 0; } diff --git a/src/devices/sound/ad1848.cpp b/src/devices/sound/ad1848.cpp index b9fec7e6125..414edc6ecb0 100644 --- a/src/devices/sound/ad1848.cpp +++ b/src/devices/sound/ad1848.cpp @@ -32,7 +32,7 @@ void ad1848_device::device_add_mconfig(machine_config &config) void ad1848_device::device_start() { - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_irq_cb.resolve_safe(); m_drq_cb.resolve_safe(); save_item(NAME(m_regs.idx)); @@ -156,7 +156,7 @@ void ad1848_device::dack_w(uint8_t data) m_drq_cb(CLEAR_LINE); } -void ad1848_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ad1848_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(!m_play) return; diff --git a/src/devices/sound/ad1848.h b/src/devices/sound/ad1848.h index 2b98691befa..ad50c964556 100644 --- a/src/devices/sound/ad1848.h +++ b/src/devices/sound/ad1848.h @@ -24,7 +24,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 void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/sound/asc.cpp b/src/devices/sound/asc.cpp index 23ec35a2766..aee85be2d45 100644 --- a/src/devices/sound/asc.cpp +++ b/src/devices/sound/asc.cpp @@ -66,7 +66,7 @@ void asc_device::device_start() memset(m_regs, 0, sizeof(m_regs)); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); save_item(NAME(m_fifo_a_rdptr)); save_item(NAME(m_fifo_b_rdptr)); @@ -107,7 +107,7 @@ void asc_device::device_reset() // device_timer - called when our device timer expires //------------------------------------------------- -void asc_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void asc_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { m_stream->update(); } diff --git a/src/devices/sound/asc.h b/src/devices/sound/asc.h index 9848646e2bb..c6293366f1c 100644 --- a/src/devices/sound/asc.h +++ b/src/devices/sound/asc.h @@ -76,7 +76,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 sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/bsmt2000.cpp b/src/devices/sound/bsmt2000.cpp index 09392661079..5ffa2209c66 100644 --- a/src/devices/sound/bsmt2000.cpp +++ b/src/devices/sound/bsmt2000.cpp @@ -145,7 +145,7 @@ void bsmt2000_device::device_reset() // resets as a timer callback //------------------------------------------------- -void bsmt2000_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void bsmt2000_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/sound/bsmt2000.h b/src/devices/sound/bsmt2000.h index 289457cffd9..abf084d7ae1 100644 --- a/src/devices/sound/bsmt2000.h +++ b/src/devices/sound/bsmt2000.h @@ -50,7 +50,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; // device_sound_interface overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/cdp1864.cpp b/src/devices/sound/cdp1864.cpp index 7f3811bf09b..87b5ea830d0 100644 --- a/src/devices/sound/cdp1864.cpp +++ b/src/devices/sound/cdp1864.cpp @@ -166,7 +166,7 @@ void cdp1864_device::device_reset() // device_timer - handle timer events //------------------------------------------------- -void cdp1864_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cdp1864_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int scanline = screen().vpos(); diff --git a/src/devices/sound/cdp1864.h b/src/devices/sound/cdp1864.h index 589867997dd..db2bd156f3a 100644 --- a/src/devices/sound/cdp1864.h +++ b/src/devices/sound/cdp1864.h @@ -112,7 +112,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; // internal callbacks virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/cdp1869.cpp b/src/devices/sound/cdp1869.cpp index 9e28aa4c048..ac7533ac316 100644 --- a/src/devices/sound/cdp1869.cpp +++ b/src/devices/sound/cdp1869.cpp @@ -459,7 +459,7 @@ void cdp1869_device::device_post_load() // device_timer - handler timer events //------------------------------------------------- -void cdp1869_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cdp1869_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_write_prd(param); m_prd = param; diff --git a/src/devices/sound/cdp1869.h b/src/devices/sound/cdp1869.h index dc9c1501ea0..e40a9705333 100644 --- a/src/devices/sound/cdp1869.h +++ b/src/devices/sound/cdp1869.h @@ -210,7 +210,7 @@ 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; + 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/sound/dave.cpp b/src/devices/sound/dave.cpp index be2a6a8593a..8a7386e640b 100644 --- a/src/devices/sound/dave.cpp +++ b/src/devices/sound/dave.cpp @@ -149,7 +149,7 @@ void dave_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void dave_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void dave_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/sound/dave.h b/src/devices/sound/dave.h index 7d2da120658..7a6a521738f 100644 --- a/src/devices/sound/dave.h +++ b/src/devices/sound/dave.h @@ -41,7 +41,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/sound/es1373.cpp b/src/devices/sound/es1373.cpp index 1c707599188..d6baac9ad01 100644 --- a/src/devices/sound/es1373.cpp +++ b/src/devices/sound/es1373.cpp @@ -122,7 +122,7 @@ void es1373_device::device_start() // create the stream m_stream = stream_alloc(0, 2, 44100/2); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(attotime::zero, 0, attotime::from_hz(44100/2/16)); // Save states @@ -224,7 +224,7 @@ void es1373_device::map_extra(uint64_t memory_window_start, uint64_t memory_wind //------------------------------------------------- // device_timer - called when our device timer expires //------------------------------------------------- -void es1373_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void es1373_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { m_stream->update(); } diff --git a/src/devices/sound/es1373.h b/src/devices/sound/es1373.h index 6e3cddb8a42..ba246a05535 100644 --- a/src/devices/sound/es1373.h +++ b/src/devices/sound/es1373.h @@ -26,7 +26,7 @@ protected: virtual void device_start() override; virtual void device_stop() 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 void device_post_load() override; virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/es5503.cpp b/src/devices/sound/es5503.cpp index 8b38b1cd068..365254301b6 100644 --- a/src/devices/sound/es5503.cpp +++ b/src/devices/sound/es5503.cpp @@ -70,7 +70,7 @@ es5503_device::es5503_device(const machine_config &mconfig, const char *tag, dev // device_timer - called when our device timer expires //------------------------------------------------- -void es5503_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void es5503_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { m_stream->update(); } @@ -235,7 +235,7 @@ void es5503_device::device_start() output_rate = (clock() / 8) / (oscsenabled + 2); m_stream = stream_alloc(0, output_channels, output_rate); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); } void es5503_device::device_clock_changed() diff --git a/src/devices/sound/es5503.h b/src/devices/sound/es5503.h index 2fd316aad8e..fde389ef250 100644 --- a/src/devices/sound/es5503.h +++ b/src/devices/sound/es5503.h @@ -33,7 +33,7 @@ protected: virtual void device_start() override; virtual void device_clock_changed() override; virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) override; + virtual void device_timer(emu_timer &timer, device_timer_id tid, int param) override; // device_sound_interface overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/ics2115.cpp b/src/devices/sound/ics2115.cpp index 0afc0787ed0..9eca1102f88 100644 --- a/src/devices/sound/ics2115.cpp +++ b/src/devices/sound/ics2115.cpp @@ -59,8 +59,8 @@ void ics2115_device::device_start() space(0).cache(m_cache); - m_timer[0].timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ics2115_device::timer_cb_0),this), this); - m_timer[1].timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ics2115_device::timer_cb_1),this), this); + m_timer[0].timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ics2115_device::timer_cb_0),this)); + m_timer[1].timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ics2115_device::timer_cb_1),this)); m_stream = stream_alloc(0, 2, clock() / (32 * 32)); m_irq_cb.resolve_safe(); diff --git a/src/devices/sound/iopspu.cpp b/src/devices/sound/iopspu.cpp index 0267c31eadb..b2599eae2cd 100644 --- a/src/devices/sound/iopspu.cpp +++ b/src/devices/sound/iopspu.cpp @@ -31,10 +31,10 @@ void iop_spu_device::device_start() m_ram = std::make_unique<uint16_t[]>(2 * 1024 * 1024); // ? if (!m_core[0].m_autodma_done_timer_hack) - m_core[0].m_autodma_done_timer_hack = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(iop_spu_device::autodma_done_timer_hack), this), 0); + m_core[0].m_autodma_done_timer_hack = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(iop_spu_device::autodma_done_timer_hack), this)); if (!m_core[1].m_autodma_done_timer_hack) - m_core[1].m_autodma_done_timer_hack = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(iop_spu_device::autodma_done_timer_hack), this), (void*)1); + m_core[1].m_autodma_done_timer_hack = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(iop_spu_device::autodma_done_timer_hack), this)); save_item(NAME(m_core[0].m_status)); save_item(NAME(m_core[0].m_start_port_addr)); diff --git a/src/devices/sound/k053260.cpp b/src/devices/sound/k053260.cpp index 7337b0c8b91..b2e1e6cb0a0 100644 --- a/src/devices/sound/k053260.cpp +++ b/src/devices/sound/k053260.cpp @@ -164,7 +164,7 @@ void k053260_device::rom_bank_updated() } -void k053260_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void k053260_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(m_timer_state) { case 0: m_sh1_cb(ASSERT_LINE); break; diff --git a/src/devices/sound/k053260.h b/src/devices/sound/k053260.h index ad14244ceb9..dc8d918117e 100644 --- a/src/devices/sound/k053260.h +++ b/src/devices/sound/k053260.h @@ -39,7 +39,7 @@ protected: virtual void device_start() override; virtual void device_clock_changed() 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; // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/k054539.cpp b/src/devices/sound/k054539.cpp index cba942e002f..b30dbcbc724 100644 --- a/src/devices/sound/k054539.cpp +++ b/src/devices/sound/k054539.cpp @@ -307,7 +307,7 @@ void k054539_device::sound_stream_update(sound_stream &stream, std::vector<read_ } -void k054539_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void k054539_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (regs[0x22f] & 0x20) m_timer_handler(m_timer_state ^= 1); diff --git a/src/devices/sound/k054539.h b/src/devices/sound/k054539.h index 6c79ac6d0be..c58f6021af3 100644 --- a/src/devices/sound/k054539.h +++ b/src/devices/sound/k054539.h @@ -64,7 +64,7 @@ protected: virtual void device_clock_changed() 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; // device_sound_interface overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/ks0164.cpp b/src/devices/sound/ks0164.cpp index 3431c49c0f7..99cb75ab878 100644 --- a/src/devices/sound/ks0164.cpp +++ b/src/devices/sound/ks0164.cpp @@ -98,7 +98,7 @@ void ks0164_device::device_reset() m_timer->adjust(attotime::from_msec(1), 0, attotime::from_msec(1)); } -void ks0164_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ks0164_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_timer_interrupt = true; if(m_irqen_76 & 0x40) diff --git a/src/devices/sound/ks0164.h b/src/devices/sound/ks0164.h index c82689f4ff1..6024ae62669 100644 --- a/src/devices/sound/ks0164.h +++ b/src/devices/sound/ks0164.h @@ -30,7 +30,7 @@ protected: virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; virtual void device_add_mconfig(machine_config &config) override; virtual space_config_vector memory_space_config() const 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 tra_callback() override; virtual void tra_complete() override; diff --git a/src/devices/sound/mm5837.cpp b/src/devices/sound/mm5837.cpp index 6049b64d0fe..b9125b5c616 100644 --- a/src/devices/sound/mm5837.cpp +++ b/src/devices/sound/mm5837.cpp @@ -73,7 +73,7 @@ void mm5837_device::device_reset() // device_timer - handle timer callbacks //------------------------------------------------- -void mm5837_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mm5837_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_output_cb(m_source.clock()); } diff --git a/src/devices/sound/mm5837.h b/src/devices/sound/mm5837.h index 49374537b9c..21d37596c45 100644 --- a/src/devices/sound/mm5837.h +++ b/src/devices/sound/mm5837.h @@ -168,7 +168,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 state diff --git a/src/devices/sound/mos6560.cpp b/src/devices/sound/mos6560.cpp index a140e63602b..1a007c80693 100644 --- a/src/devices/sound/mos6560.cpp +++ b/src/devices/sound/mos6560.cpp @@ -865,7 +865,7 @@ void mos6560_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void mos6560_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mos6560_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/sound/mos6560.h b/src/devices/sound/mos6560.h index 182cba47dba..eb902f5471e 100644 --- a/src/devices/sound/mos6560.h +++ b/src/devices/sound/mos6560.h @@ -121,7 +121,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; // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/mos7360.cpp b/src/devices/sound/mos7360.cpp index aa9604b3a78..c4749b2fb9b 100644 --- a/src/devices/sound/mos7360.cpp +++ b/src/devices/sound/mos7360.cpp @@ -419,7 +419,7 @@ void mos7360_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void mos7360_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mos7360_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/sound/mos7360.h b/src/devices/sound/mos7360.h index c8733dc3e46..c34dd2036f4 100644 --- a/src/devices/sound/mos7360.h +++ b/src/devices/sound/mos7360.h @@ -107,7 +107,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_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; diff --git a/src/devices/sound/msm5205.cpp b/src/devices/sound/msm5205.cpp index 9e889503ed9..382e69ca54e 100644 --- a/src/devices/sound/msm5205.cpp +++ b/src/devices/sound/msm5205.cpp @@ -176,7 +176,7 @@ void msm5205_device::compute_tables() // fires //------------------------------------------------- -void msm5205_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void msm5205_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -382,7 +382,7 @@ void msm5205_device::sound_stream_update(sound_stream &stream, std::vector<read_ // fires //------------------------------------------------- -void msm6585_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void msm6585_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/sound/msm5205.h b/src/devices/sound/msm5205.h index 02b8bc3746c..1bbe1f56036 100644 --- a/src/devices/sound/msm5205.h +++ b/src/devices/sound/msm5205.h @@ -60,7 +60,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; void update_adpcm(); @@ -105,7 +105,7 @@ protected: virtual int get_prescaler() const override; // device-level overrides - 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; // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/pokey.cpp b/src/devices/sound/pokey.cpp index f749afad2ae..d90504499a9 100644 --- a/src/devices/sound/pokey.cpp +++ b/src/devices/sound/pokey.cpp @@ -358,7 +358,7 @@ void pokey_device::device_clock_changed() // our sound stream //------------------------------------------------- -void pokey_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pokey_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/devices/sound/pokey.h b/src/devices/sound/pokey.h index 0717429aff3..c9d58e18eeb 100644 --- a/src/devices/sound/pokey.h +++ b/src/devices/sound/pokey.h @@ -190,7 +190,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_sound_interface overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/qs1000.cpp b/src/devices/sound/qs1000.cpp index 23b0ee76a44..8a98b85111a 100644 --- a/src/devices/sound/qs1000.cpp +++ b/src/devices/sound/qs1000.cpp @@ -315,7 +315,7 @@ void qs1000_device::device_reset() // device_timer - handle deferred writes and // resets as a timer callback //------------------------------------------------- -void qs1000_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void qs1000_device::device_timer(emu_timer &timer, device_timer_id id, int param) { } diff --git a/src/devices/sound/qs1000.h b/src/devices/sound/qs1000.h index aad353962a5..d992c6a9e7b 100644 --- a/src/devices/sound/qs1000.h +++ b/src/devices/sound/qs1000.h @@ -70,7 +70,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; // device_sound_interface overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/qsound.cpp b/src/devices/sound/qsound.cpp index 29b2661add5..123b19443b4 100644 --- a/src/devices/sound/qsound.cpp +++ b/src/devices/sound/qsound.cpp @@ -358,12 +358,12 @@ u16 qsound_device::dsp_pio_r() } } -void qsound_device::set_dsp_ready(void *ptr, s32 param) +void qsound_device::set_dsp_ready(s32 param) { m_dsp_ready = 1U; } -void qsound_device::set_cmd(void *ptr, s32 param) +void qsound_device::set_cmd(s32 param) { /* * I don't believe the data word is actually double-buffered in diff --git a/src/devices/sound/qsound.h b/src/devices/sound/qsound.h index 6a9be5dfbc2..a2886318275 100644 --- a/src/devices/sound/qsound.h +++ b/src/devices/sound/qsound.h @@ -47,8 +47,8 @@ private: // for synchronised DSP communication DECLARE_WRITE_LINE_MEMBER(dsp_ock_w); u16 dsp_pio_r(); - void set_dsp_ready(void *ptr, s32 param); - void set_cmd(void *ptr, s32 param); + void set_dsp_ready(s32 param); + void set_cmd(s32 param); // MAME resources required_device<dsp16_device_base> m_dsp; diff --git a/src/devices/sound/sn76496.cpp b/src/devices/sound/sn76496.cpp index eac04a2d99f..e204b0355cb 100644 --- a/src/devices/sound/sn76496.cpp +++ b/src/devices/sound/sn76496.cpp @@ -298,7 +298,7 @@ void sn76496_base_device::stereo_w(u8 data) else fatalerror("sn76496_base_device: Call to stereo write with mono chip!\n"); } -void sn76496_base_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sn76496_base_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_ready_state = true; m_ready_handler(ASSERT_LINE); diff --git a/src/devices/sound/sn76496.h b/src/devices/sound/sn76496.h index da6ec178f3e..d8cc4442314 100644 --- a/src/devices/sound/sn76496.h +++ b/src/devices/sound/sn76496.h @@ -44,12 +44,12 @@ protected: virtual void device_start() override; virtual void device_clock_changed() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; private: inline bool in_noise_mode(); void register_for_save_states(); - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; bool m_ready_state; devcb_write_line m_ready_handler; diff --git a/src/devices/sound/sp0250.cpp b/src/devices/sound/sp0250.cpp index 862b3781a7c..77a66a2233f 100644 --- a/src/devices/sound/sp0250.cpp +++ b/src/devices/sound/sp0250.cpp @@ -99,7 +99,7 @@ void sp0250_device::device_start() save_item(NAME(m_fifo_pos)); } -void sp0250_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sp0250_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_stream->update(); } diff --git a/src/devices/sound/sp0250.h b/src/devices/sound/sp0250.h index d51ab2286bd..c5b0b2caeea 100644 --- a/src/devices/sound/sp0250.h +++ b/src/devices/sound/sp0250.h @@ -19,7 +19,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; // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/tms5110.cpp b/src/devices/sound/tms5110.cpp index 14bb5523322..e96a9c6e736 100644 --- a/src/devices/sound/tms5110.cpp +++ b/src/devices/sound/tms5110.cpp @@ -1193,7 +1193,7 @@ uint8_t m58817_device::status_r() ******************************************************************************/ -void tms5110_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tms5110_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_romclk_hack_state = !m_romclk_hack_state; } @@ -1322,7 +1322,7 @@ void tmsprom_device::update_prom_cnt() m_prom_cnt &= 0x0f; } -void tmsprom_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tmsprom_device::device_timer(emu_timer &timer, device_timer_id id, int param) { /* only 16 bytes needed ... The original dump is bad. This * is what is needed to get speech to work. The prom data has diff --git a/src/devices/sound/tms5110.h b/src/devices/sound/tms5110.h index e3bb2078075..e49ea9e93cc 100644 --- a/src/devices/sound/tms5110.h +++ b/src/devices/sound/tms5110.h @@ -57,7 +57,7 @@ protected: 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; // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; @@ -285,7 +285,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; private: void register_for_save_states(); diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp index 05c5c3464df..7fedbb79339 100644 --- a/src/devices/sound/tms5220.cpp +++ b/src/devices/sound/tms5220.cpp @@ -1733,7 +1733,7 @@ void tms5220_device::device_reset() ***********************************************************************************************/ -void tms5220_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tms5220_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/sound/tms5220.h b/src/devices/sound/tms5220.h index 5c45a685e21..826a78ec291 100644 --- a/src/devices/sound/tms5220.h +++ b/src/devices/sound/tms5220.h @@ -72,7 +72,7 @@ protected: 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; // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/upd7759.cpp b/src/devices/sound/upd7759.cpp index fc07c0f95ab..cbd6bca0f83 100644 --- a/src/devices/sound/upd7759.cpp +++ b/src/devices/sound/upd7759.cpp @@ -593,7 +593,7 @@ void upd775x_device::advance_state() *************************************************************/ -void upd7759_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void upd7759_device::device_timer(emu_timer &timer, device_timer_id id, int param) { uint8_t olddrq = m_drq; diff --git a/src/devices/sound/upd7759.h b/src/devices/sound/upd7759.h index ab1ff98e3a2..0084ac8c774 100644 --- a/src/devices/sound/upd7759.h +++ b/src/devices/sound/upd7759.h @@ -131,7 +131,7 @@ 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; devcb_write_line m_drqcallback; emu_timer *m_timer; diff --git a/src/devices/sound/votrax.cpp b/src/devices/sound/votrax.cpp index c9d3a44bddf..ee4a21a3c9f 100644 --- a/src/devices/sound/votrax.cpp +++ b/src/devices/sound/votrax.cpp @@ -334,7 +334,7 @@ void votrax_sc01_device::device_clock_changed() // device_timer - handle device timer //------------------------------------------------- -void votrax_sc01_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void votrax_sc01_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_stream->update(); diff --git a/src/devices/sound/votrax.h b/src/devices/sound/votrax.h index 19d98ca1da7..87c466b1875 100644 --- a/src/devices/sound/votrax.h +++ b/src/devices/sound/votrax.h @@ -34,7 +34,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; // device_sound_interface overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/ym2154.cpp b/src/devices/sound/ym2154.cpp index 83613506833..8be2888175b 100644 --- a/src/devices/sound/ym2154.cpp +++ b/src/devices/sound/ym2154.cpp @@ -240,7 +240,7 @@ void ym2154_device::device_clock_changed() // sound_stream_update - generate sound data //------------------------------------------------- -void ym2154_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ym2154_device::device_timer(emu_timer &timer, device_timer_id id, int param) { update_irq_state(1); m_timer->adjust((2048 - m_timer_count) * attotime::from_hz(sample_rate())); diff --git a/src/devices/sound/ym2154.h b/src/devices/sound/ym2154.h index 58976f0177b..3736b6aa367 100644 --- a/src/devices/sound/ym2154.h +++ b/src/devices/sound/ym2154.h @@ -37,7 +37,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; // sound overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/devices/sound/ymf271.cpp b/src/devices/sound/ymf271.cpp index 271b4e092ee..4201d0aaf23 100644 --- a/src/devices/sound/ymf271.cpp +++ b/src/devices/sound/ymf271.cpp @@ -1309,7 +1309,7 @@ void ymf271_device::ymf271_write_pcm(uint8_t address, uint8_t data) } } -void ymf271_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ymf271_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/devices/sound/ymf271.h b/src/devices/sound/ymf271.h index 1c628f34cf1..6dbf1a9408f 100644 --- a/src/devices/sound/ymf271.h +++ b/src/devices/sound/ymf271.h @@ -24,7 +24,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_clock_changed() override; // sound stream update overrides diff --git a/src/devices/sound/ymfm_mame.h b/src/devices/sound/ymfm_mame.h index d55be4f35f2..d22fc9ad8b2 100644 --- a/src/devices/sound/ymfm_mame.h +++ b/src/devices/sound/ymfm_mame.h @@ -152,9 +152,9 @@ protected: } // timer callbacks - void fm_mode_write(void *ptr, int param) { m_engine->engine_mode_write(param); } - void fm_check_interrupts(void *ptr, int param) { m_engine->engine_check_interrupts(); } - void fm_timer_handler(void *ptr, int param) { m_engine->engine_timer_expired(param); } + void fm_mode_write(int param) { m_engine->engine_mode_write(param); } + void fm_check_interrupts(int param) { m_engine->engine_check_interrupts(); } + void fm_timer_handler(int param) { m_engine->engine_timer_expired(param); } // internal state attotime m_busy_end; // busy end time diff --git a/src/devices/sound/ymz280b.cpp b/src/devices/sound/ymz280b.cpp index a9a87eb558f..f6e6a0e3935 100644 --- a/src/devices/sound/ymz280b.cpp +++ b/src/devices/sound/ymz280b.cpp @@ -639,7 +639,7 @@ void ymz280b_device::device_reset() } -void ymz280b_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ymz280b_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id < 8) update_irq_state_timer_common( id ); diff --git a/src/devices/sound/ymz280b.h b/src/devices/sound/ymz280b.h index 5da3ea46cc3..c35d4be20fc 100644 --- a/src/devices/sound/ymz280b.h +++ b/src/devices/sound/ymz280b.h @@ -32,7 +32,7 @@ protected: virtual void device_start() override; virtual void device_post_load() 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_clock_changed() override; // sound stream update overrides 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)); } diff --git a/src/emu/device.cpp b/src/emu/device.cpp index af0f84e223b..90441ceebd8 100644 --- a/src/emu/device.cpp +++ b/src/emu/device.cpp @@ -464,9 +464,9 @@ u64 device_t::attotime_to_clocks(const attotime &duration) const noexcept // callback //------------------------------------------------- -emu_timer *device_t::timer_alloc(device_timer_id id, void *ptr) +emu_timer *device_t::timer_alloc(device_timer_id id) { - return machine().scheduler().timer_alloc(*this, id, ptr); + return machine().scheduler().timer_alloc(*this, id); } @@ -475,9 +475,9 @@ emu_timer *device_t::timer_alloc(device_timer_id id, void *ptr) // call our device callback //------------------------------------------------- -void device_t::timer_set(const attotime &duration, device_timer_id id, int param, void *ptr) +void device_t::timer_set(const attotime &duration, device_timer_id id, int param) { - machine().scheduler().timer_set(duration, *this, id, param, ptr); + machine().scheduler().timer_set(duration, *this, id, param); } @@ -886,7 +886,7 @@ void device_t::device_debug_setup() // fires //------------------------------------------------- -void device_t::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void device_t::device_timer(emu_timer &timer, device_timer_id id, int param) { // do nothing by default } diff --git a/src/emu/device.h b/src/emu/device.h index 77c12cb2d56..9fbcf8231e6 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -705,10 +705,10 @@ public: u64 attotime_to_clocks(const attotime &duration) const noexcept; // timer interfaces - emu_timer *timer_alloc(device_timer_id id = 0, void *ptr = nullptr); - void timer_set(const attotime &duration, device_timer_id id = 0, int param = 0, void *ptr = nullptr); - void synchronize(device_timer_id id = 0, int param = 0, void *ptr = nullptr) { timer_set(attotime::zero, id, param, ptr); } - void timer_expired(emu_timer &timer, device_timer_id id, int param, void *ptr) { device_timer(timer, id, param, ptr); } + emu_timer *timer_alloc(device_timer_id id = 0); + void timer_set(const attotime &duration, device_timer_id id = 0, int param = 0); + void synchronize(device_timer_id id = 0, int param = 0) { timer_set(attotime::zero, id, param); } + void timer_expired(emu_timer &timer, device_timer_id id, int param) { device_timer(timer, id, param); } /// \brief Register data for save states /// @@ -976,7 +976,7 @@ protected: virtual void device_clock_changed(); virtual void device_debug_setup(); - 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); //------------------- end derived class overrides diff --git a/src/emu/drivers/testcpu.cpp b/src/emu/drivers/testcpu.cpp index 574e6fc88b3..1cdb945db88 100644 --- a/src/emu/drivers/testcpu.cpp +++ b/src/emu/drivers/testcpu.cpp @@ -38,7 +38,7 @@ public: } // timer callback; used to wrest control of the system - 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 { static const u32 sample_instructions[] = { diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index e76e4811abd..633bde66de8 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -942,7 +942,7 @@ void running_machine::handle_saveload() // of the system //------------------------------------------------- -void running_machine::soft_reset(void *ptr, s32 param) +void running_machine::soft_reset(s32 param) { logerror("Soft reset\n"); diff --git a/src/emu/machine.h b/src/emu/machine.h index f3aef08d265..3b736e58dff 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -248,7 +248,7 @@ private: void start(); void set_saveload_filename(std::string &&filename); void handle_saveload(); - void soft_reset(void *ptr = nullptr, s32 param = 0); + void soft_reset(s32 param = 0); std::string nvram_filename(device_t &device) const; void nvram_load(); void nvram_save(); diff --git a/src/emu/natkeyboard.cpp b/src/emu/natkeyboard.cpp index e5dcdc93dbc..5a36e6b8e13 100644 --- a/src/emu/natkeyboard.cpp +++ b/src/emu/natkeyboard.cpp @@ -864,7 +864,7 @@ void natural_keyboard::internal_post(char32_t ch) // when posting a string of characters //------------------------------------------------- -void natural_keyboard::timer(void *ptr, int param) +void natural_keyboard::timer(s32 param) { if (!m_queue_chars.isnull()) { diff --git a/src/emu/natkeyboard.h b/src/emu/natkeyboard.h index c3454ee8dd4..dc89b0eb156 100644 --- a/src/emu/natkeyboard.h +++ b/src/emu/natkeyboard.h @@ -109,7 +109,7 @@ private: bool can_post_alternate(char32_t ch); attotime choose_delay(char32_t ch); void internal_post(char32_t ch); - void timer(void *ptr, int param); + void timer(s32 param); std::string unicode_to_string(char32_t ch) const; const keycode_map_entry *find_code(char32_t ch) const; diff --git a/src/emu/schedule.cpp b/src/emu/schedule.cpp index e32afb68f00..dd72dfa13b0 100644 --- a/src/emu/schedule.cpp +++ b/src/emu/schedule.cpp @@ -49,7 +49,6 @@ emu_timer::emu_timer() : m_next(nullptr), m_prev(nullptr), m_param(0), - m_ptr(nullptr), m_enabled(false), m_temporary(false), m_period(attotime::zero), @@ -75,7 +74,7 @@ emu_timer::~emu_timer() // re-allocated as a non-device timer //------------------------------------------------- -inline emu_timer &emu_timer::init(running_machine &machine, timer_expired_delegate callback, void *ptr, bool temporary) +inline emu_timer &emu_timer::init(running_machine &machine, timer_expired_delegate callback, bool temporary) { // ensure the entire timer state is clean m_machine = &machine; @@ -83,7 +82,6 @@ inline emu_timer &emu_timer::init(running_machine &machine, timer_expired_delega m_prev = nullptr; m_callback = callback; m_param = 0; - m_ptr = ptr; m_enabled = false; m_temporary = temporary; m_period = attotime::never; @@ -107,7 +105,7 @@ inline emu_timer &emu_timer::init(running_machine &machine, timer_expired_delega // re-allocated as a device timer //------------------------------------------------- -inline emu_timer &emu_timer::init(device_t &device, device_timer_id id, void *ptr, bool temporary) +inline emu_timer &emu_timer::init(device_t &device, device_timer_id id, bool temporary) { // ensure the entire timer state is clean m_machine = &device.machine(); @@ -115,7 +113,6 @@ inline emu_timer &emu_timer::init(device_t &device, device_timer_id id, void *pt m_prev = nullptr; m_callback = timer_expired_delegate(FUNC(emu_timer::device_timer_expired), this); m_param = 0; - m_ptr = ptr; m_enabled = false; m_temporary = temporary; m_period = attotime::never; @@ -296,7 +293,7 @@ inline void emu_timer::schedule_next_period() void emu_timer::dump() const { - machine().logerror("%p: en=%d temp=%d exp=%15s start=%15s per=%15s param=%d ptr=%p", this, m_enabled, m_temporary, m_expire.as_string(PRECISION), m_start.as_string(PRECISION), m_period.as_string(PRECISION), m_param, m_ptr); + machine().logerror("%p: en=%d temp=%d exp=%15s start=%15s per=%15s param=%d", this, m_enabled, m_temporary, m_expire.as_string(PRECISION), m_start.as_string(PRECISION), m_period.as_string(PRECISION), m_param); if (m_device == nullptr) if (m_callback.name() == nullptr) machine().logerror(" cb=NULL\n"); @@ -312,9 +309,9 @@ void emu_timer::dump() const // conditional jump on the hot path //------------------------------------------------- -void emu_timer::device_timer_expired(emu_timer &timer, void *ptr, s32 param) +void emu_timer::device_timer_expired(emu_timer &timer, s32 param) { - timer.m_device->timer_expired(timer, timer.m_id, param, ptr); + timer.m_device->timer_expired(timer, timer.m_id, param); } @@ -340,7 +337,7 @@ device_scheduler::device_scheduler(running_machine &machine) : m_quantum_minimum(ATTOSECONDS_IN_NSEC(1) / 1000) { // append a single never-expiring timer so there is always one in the list - m_timer_list = &m_timer_allocator.alloc()->init(machine, timer_expired_delegate(), nullptr, true); + m_timer_list = &m_timer_allocator.alloc()->init(machine, timer_expired_delegate(), true); m_timer_list->adjust(attotime::never); // register global states @@ -597,9 +594,9 @@ void device_scheduler::boost_interleave(const attotime ×lice_time, const at // timer and return a pointer //------------------------------------------------- -emu_timer *device_scheduler::timer_alloc(timer_expired_delegate callback, void *ptr) +emu_timer *device_scheduler::timer_alloc(timer_expired_delegate callback) { - return &m_timer_allocator.alloc()->init(machine(), callback, ptr, false); + return &m_timer_allocator.alloc()->init(machine(), callback, false); } @@ -609,9 +606,9 @@ emu_timer *device_scheduler::timer_alloc(timer_expired_delegate callback, void * // amount of time //------------------------------------------------- -void device_scheduler::timer_set(const attotime &duration, timer_expired_delegate callback, int param, void *ptr) +void device_scheduler::timer_set(const attotime &duration, timer_expired_delegate callback, int param) { - m_timer_allocator.alloc()->init(machine(), callback, ptr, true).adjust(duration, param); + m_timer_allocator.alloc()->init(machine(), callback, true).adjust(duration, param); } @@ -620,9 +617,9 @@ void device_scheduler::timer_set(const attotime &duration, timer_expired_delegat // and return a pointer //------------------------------------------------- -emu_timer *device_scheduler::timer_alloc(device_t &device, device_timer_id id, void *ptr) +emu_timer *device_scheduler::timer_alloc(device_t &device, device_timer_id id) { - return &m_timer_allocator.alloc()->init(device, id, ptr, false); + return &m_timer_allocator.alloc()->init(device, id, false); } @@ -632,9 +629,9 @@ emu_timer *device_scheduler::timer_alloc(device_t &device, device_timer_id id, v // time //------------------------------------------------- -void device_scheduler::timer_set(const attotime &duration, device_t &device, device_timer_id id, int param, void *ptr) +void device_scheduler::timer_set(const attotime &duration, device_t &device, device_timer_id id, int param) { - m_timer_allocator.alloc()->init(device, id, ptr, true).adjust(duration, param); + m_timer_allocator.alloc()->init(device, id, true).adjust(duration, param); } @@ -655,7 +652,7 @@ void device_scheduler::eat_all_cycles() // given amount of time //------------------------------------------------- -void device_scheduler::timed_trigger(void *ptr, s32 param) +void device_scheduler::timed_trigger(s32 param) { trigger(param); } @@ -904,7 +901,7 @@ inline void device_scheduler::execute_timers() LOG("execute_timers: timer device %s timer %d\n", timer.m_device->tag(), timer.m_id); else LOG("execute_timers: timer callback %s\n", timer.m_callback.name()); - timer.m_callback(timer.m_ptr, timer.m_param); + timer.m_callback(timer.m_param); } g_profiler.stop(); diff --git a/src/emu/schedule.h b/src/emu/schedule.h index 9e90ed68ed5..b194c8b2d1c 100644 --- a/src/emu/schedule.h +++ b/src/emu/schedule.h @@ -22,7 +22,7 @@ // MACROS //************************************************************************** -#define TIMER_CALLBACK_MEMBER(name) void name(void *ptr, s32 param) +#define TIMER_CALLBACK_MEMBER(name) void name(s32 param) //************************************************************************** @@ -30,7 +30,7 @@ //************************************************************************** // timer callbacks look like this -typedef named_delegate<void (void *, s32)> timer_expired_delegate; +typedef named_delegate<void (s32)> timer_expired_delegate; // ======================> emu_timer @@ -45,8 +45,8 @@ class emu_timer ~emu_timer(); // allocation and re-use - emu_timer &init(running_machine &machine, timer_expired_delegate callback, void *ptr, bool temporary); - emu_timer &init(device_t &device, device_timer_id id, void *ptr, bool temporary); + emu_timer &init(running_machine &machine, timer_expired_delegate callback, bool temporary); + emu_timer &init(device_t &device, device_timer_id id, bool temporary); emu_timer &release(); public: @@ -55,12 +55,10 @@ public: running_machine &machine() const noexcept { assert(m_machine != nullptr); return *m_machine; } bool enabled() const { return m_enabled; } int param() const { return m_param; } - void *ptr() const { return m_ptr; } // setters bool enable(bool enable = true); void set_param(int param) { m_param = param; } - void set_ptr(void *ptr) { m_ptr = ptr; } // control void reset(const attotime &duration = attotime::never) { adjust(duration, m_param, m_period); } @@ -78,7 +76,7 @@ private: void register_save(); void schedule_next_period(); void dump() const; - static void device_timer_expired(emu_timer &timer, void *ptr, s32 param); + static void device_timer_expired(emu_timer &timer, s32 param); // internal state running_machine * m_machine; // reference to the owning machine @@ -86,7 +84,6 @@ private: emu_timer * m_prev; // previous timer in order in the list timer_expired_delegate m_callback; // callback function s32 m_param; // integer parameter - void * m_ptr; // pointer parameter bool m_enabled; // is the timer enabled? bool m_temporary; // is the timer temporary? attotime m_period; // the repeat frequency of the timer @@ -124,13 +121,13 @@ public: void suspend_resume_changed() { m_suspend_changes_pending = true; } // timers, specified by callback/name - emu_timer *timer_alloc(timer_expired_delegate callback, void *ptr = nullptr); - void timer_set(const attotime &duration, timer_expired_delegate callback, int param = 0, void *ptr = nullptr); - void synchronize(timer_expired_delegate callback = timer_expired_delegate(), int param = 0, void *ptr = nullptr) { timer_set(attotime::zero, callback, param, ptr); } + emu_timer *timer_alloc(timer_expired_delegate callback); + void timer_set(const attotime &duration, timer_expired_delegate callback, int param = 0); + void synchronize(timer_expired_delegate callback = timer_expired_delegate(), int param = 0) { timer_set(attotime::zero, callback, param); } // timers, specified by device/id; generally devices should use the device_t methods instead - emu_timer *timer_alloc(device_t &device, device_timer_id id = 0, void *ptr = nullptr); - void timer_set(const attotime &duration, device_t &device, device_timer_id id = 0, int param = 0, void *ptr = nullptr); + emu_timer *timer_alloc(device_t &device, device_timer_id id = 0); + void timer_set(const attotime &duration, device_t &device, device_timer_id id = 0, int param = 0); // debugging void dump_timers() const; @@ -140,7 +137,7 @@ public: private: // callbacks - void timed_trigger(void *ptr, s32 param); + void timed_trigger(s32 param); void presave(); void postload(); diff --git a/src/emu/screen.cpp b/src/emu/screen.cpp index 19b0d05b6ad..8ecd87663ae 100644 --- a/src/emu/screen.cpp +++ b/src/emu/screen.cpp @@ -934,7 +934,7 @@ void screen_device::device_post_load() // fires //------------------------------------------------- -void screen_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void screen_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/emu/screen.h b/src/emu/screen.h index 8f54ae9fb3a..d4c8d8a7dfd 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -437,7 +437,7 @@ private: virtual void device_reset() override; virtual void device_stop() 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; // internal helpers void set_container(render_container &container) { m_container = &container; } diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp index 56b7d7ef071..a4cb5041d8f 100644 --- a/src/emu/sound.cpp +++ b/src/emu/sound.cpp @@ -885,7 +885,7 @@ void sound_stream::reprime_sync_timer() // synchronous stream //------------------------------------------------- -void sound_stream::sync_update(void *, s32) +void sound_stream::sync_update(s32) { update(); reprime_sync_timer(); @@ -1457,7 +1457,7 @@ stream_buffer::sample_t sound_manager::adjust_toward_compressor_scale(stream_buf // and send it to the OSD layer //------------------------------------------------- -void sound_manager::update(void *ptr, int param) +void sound_manager::update(int param) { VPRINTF(("sound_update\n")); diff --git a/src/emu/sound.h b/src/emu/sound.h index 4dd1d2e5c46..658c956e5d4 100644 --- a/src/emu/sound.h +++ b/src/emu/sound.h @@ -674,7 +674,7 @@ private: void reprime_sync_timer(); // timer callback for synchronous streams - void sync_update(void *, s32); + void sync_update(s32); // return a view of 0 data covering the given time period read_stream_view empty_view(attotime start, attotime end); @@ -817,7 +817,7 @@ private: stream_buffer::sample_t adjust_toward_compressor_scale(stream_buffer::sample_t curscale, stream_buffer::sample_t prevsample, stream_buffer::sample_t rawsample); // periodic sound update, called STREAMS_UPDATE_FREQUENCY per second - void update(void *ptr = nullptr, s32 param = 0); + void update(s32 param = 0); // internal state running_machine &m_machine; // reference to the running machine diff --git a/src/emu/video.cpp b/src/emu/video.cpp index 20b723ff57a..5d3691c08c9 100644 --- a/src/emu/video.cpp +++ b/src/emu/video.cpp @@ -493,7 +493,7 @@ void video_manager::exit() // when there are no screens to drive it //------------------------------------------------- -void video_manager::screenless_update_callback(void *ptr, int param) +void video_manager::screenless_update_callback(int param) { // force an update frame_update(false); @@ -511,7 +511,7 @@ void video_manager::postload() for (const auto &x : m_movie_recordings) x->set_next_frame_time(emutime); - // reset speed counters + // reset speed measurements m_speed_last_realtime = osd_ticks(); m_speed_last_emutime = emutime; } diff --git a/src/emu/video.h b/src/emu/video.h index c6d69194ba1..5be473ec7e3 100644 --- a/src/emu/video.h +++ b/src/emu/video.h @@ -90,7 +90,7 @@ public: private: // internal helpers void exit(); - void screenless_update_callback(void *ptr, int param); + void screenless_update_callback(int param); void postload(); // effective value helpers diff --git a/src/frontend/mame/luaengine.cpp b/src/frontend/mame/luaengine.cpp index 84048cf7e57..4798d7ca9d4 100644 --- a/src/frontend/mame/luaengine.cpp +++ b/src/frontend/mame/luaengine.cpp @@ -710,7 +710,7 @@ void lua_engine::initialize() if (ret == 1) return luaL_error(L, "cannot wait from outside coroutine"); int ref = luaL_ref(L, LUA_REGISTRYINDEX); - engine->machine().scheduler().timer_set(attotime::from_double(lua_tonumber(L, 1)), timer_expired_delegate(FUNC(lua_engine::resume), engine), ref, nullptr); + engine->machine().scheduler().timer_set(attotime::from_double(lua_tonumber(L, 1)), timer_expired_delegate(FUNC(lua_engine::resume), engine), ref); return lua_yield(L, 0); }); emu["lang_translate"] = sol::overload( @@ -1894,7 +1894,7 @@ void lua_engine::close() } } -void lua_engine::resume(void *ptr, int nparam) +void lua_engine::resume(int nparam) { lua_rawgeti(m_lua_state, LUA_REGISTRYINDEX, nparam); lua_State *L = lua_tothread(m_lua_state, -1); diff --git a/src/frontend/mame/luaengine.h b/src/frontend/mame/luaengine.h index f61baa8c083..bb16aea6a43 100644 --- a/src/frontend/mame/luaengine.h +++ b/src/frontend/mame/luaengine.h @@ -159,7 +159,7 @@ private: void on_machine_resume(); void on_machine_frame(); - void resume(void *ptr, int nparam); + void resume(int nparam); void register_function(sol::function func, const char *id); int enumerate_functions(const char *id, std::function<bool(const sol::protected_function &func)> &&callback); bool execute_function(const char *id); diff --git a/src/mame/audio/acan.cpp b/src/mame/audio/acan.cpp index 0df726ad8c9..f9e559236a1 100644 --- a/src/mame/audio/acan.cpp +++ b/src/mame/audio/acan.cpp @@ -71,7 +71,7 @@ void acan_sound_device::device_reset() m_dma_irq_handler(0); } -void acan_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void acan_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (m_regs[0x14] & 0x40) { diff --git a/src/mame/audio/acan.h b/src/mame/audio/acan.h index 0f6ac312a2d..b56ffd1cebe 100644 --- a/src/mame/audio/acan.h +++ b/src/mame/audio/acan.h @@ -27,7 +27,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; // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/mame/audio/alesis.cpp b/src/mame/audio/alesis.cpp index b36a6fa060e..102de6566bb 100644 --- a/src/mame/audio/alesis.cpp +++ b/src/mame/audio/alesis.cpp @@ -77,7 +77,7 @@ void alesis_dm3ag_device::device_reset() //------------------------------------------------- // device_timer - handler timer events //------------------------------------------------- -void alesis_dm3ag_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void alesis_dm3ag_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (m_output_active) { diff --git a/src/mame/audio/cmi01a.cpp b/src/mame/audio/cmi01a.cpp index 5577805856f..c51fedcbf67 100644 --- a/src/mame/audio/cmi01a.cpp +++ b/src/mame/audio/cmi01a.cpp @@ -340,7 +340,7 @@ WRITE_LINE_MEMBER( cmi01a_device::cmi01a_irq ) m_irq_cb(state ? ASSERT_LINE : CLEAR_LINE); } -void cmi01a_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cmi01a_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/audio/cmi01a.h b/src/mame/audio/cmi01a.h index 743c50e5829..a19a7fabd8c 100644 --- a/src/mame/audio/cmi01a.h +++ b/src/mame/audio/cmi01a.h @@ -41,7 +41,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) 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; static const device_timer_id TIMER_ZX = 0; static const device_timer_id TIMER_EOSI = 1; diff --git a/src/mame/audio/csd.cpp b/src/mame/audio/csd.cpp index 6550548a43b..755d463abcd 100644 --- a/src/mame/audio/csd.cpp +++ b/src/mame/audio/csd.cpp @@ -92,7 +92,7 @@ void midway_cheap_squeak_deluxe_device::device_start() // device_timer - timer callbacks //------------------------------------------------- -void midway_cheap_squeak_deluxe_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void midway_cheap_squeak_deluxe_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_pia->ca1_w(param); diff --git a/src/mame/audio/csd.h b/src/mame/audio/csd.h index 514480f7bae..ed20b78f2aa 100644 --- a/src/mame/audio/csd.h +++ b/src/mame/audio/csd.h @@ -43,7 +43,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const 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; private: // devices diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp index aeadfc27a21..36b65f4808b 100644 --- a/src/mame/audio/dcs.cpp +++ b/src/mame/audio/dcs.cpp @@ -746,7 +746,7 @@ dcs_audio_device::dcs_audio_device(const machine_config &mconfig, device_type ty void dcs_audio_device::device_reset() { - dcs_reset(nullptr, 0); + dcs_reset(0); } void dcs_audio_device::device_start() @@ -795,7 +795,7 @@ void dcs_audio_device::device_start() /* register for save states */ dcs_register_state(); /* reset the system */ - dcs_reset(nullptr, 0); + dcs_reset(0); } @@ -893,7 +893,7 @@ void dcs2_audio_device::device_start() dcs_register_state(); /* reset the system */ - dcs_reset(nullptr, 0); + dcs_reset(0); } diff --git a/src/mame/audio/efo_zsu.cpp b/src/mame/audio/efo_zsu.cpp index 017bb10c005..5be098b0e51 100644 --- a/src/mame/audio/efo_zsu.cpp +++ b/src/mame/audio/efo_zsu.cpp @@ -233,7 +233,7 @@ static const z80_daisy_config daisy_chain[] = TIMER_CALLBACK_MEMBER(cedar_magnet_sound_device::reset_assert_callback) { - cedar_magnet_board_interface::reset_assert_callback(ptr,param); + cedar_magnet_board_interface::reset_assert_callback(param); // reset lines go to the ctc as well? m_ctc[0]->reset(); m_ctc[1]->reset(); diff --git a/src/mame/audio/geebee.cpp b/src/mame/audio/geebee.cpp index 01858b5ecad..3ac70c3947c 100644 --- a/src/mame/audio/geebee.cpp +++ b/src/mame/audio/geebee.cpp @@ -54,7 +54,7 @@ void geebee_sound_device::device_start() save_item(NAME(m_vcount)); } -void geebee_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void geebee_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/audio/geebee.h b/src/mame/audio/geebee.h index 1bbddf36bba..aaa49a0278d 100644 --- a/src/mame/audio/geebee.h +++ b/src/mame/audio/geebee.h @@ -24,7 +24,7 @@ protected: // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) 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 state diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp index a0a985e5027..f7754ec99e4 100644 --- a/src/mame/audio/gottlieb.cpp +++ b/src/mame/audio/gottlieb.cpp @@ -741,7 +741,7 @@ void gottlieb_sound_r2_device::device_start() // device_timer - handle timer-based behaviors //------------------------------------------------- -void gottlieb_sound_r2_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void gottlieb_sound_r2_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/audio/gottlieb.h b/src/mame/audio/gottlieb.h index 623844845f7..a2b64bcac83 100644 --- a/src/mame/audio/gottlieb.h +++ b/src/mame/audio/gottlieb.h @@ -159,7 +159,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const 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; private: // internal helpers diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp index ddeb4f1c286..b67471686e7 100644 --- a/src/mame/audio/leland.cpp +++ b/src/mame/audio/leland.cpp @@ -492,7 +492,7 @@ void leland_80186_sound_device::command_hi_w(u8 data) * *************************************/ -void leland_80186_sound_device::delayed_response_r(void *ptr, int param) +void leland_80186_sound_device::delayed_response_r(int param) { int checkpc = param; int pc = m_master->pc(); diff --git a/src/mame/audio/leland.h b/src/mame/audio/leland.h index eaca7c0e6c4..847ac382ea5 100644 --- a/src/mame/audio/leland.h +++ b/src/mame/audio/leland.h @@ -71,7 +71,7 @@ protected: void leland_80186_map_program(address_map &map); private: - void delayed_response_r(void *ptr, int param); + void delayed_response_r(int param); void set_clock_line(int which, int state) { m_clock_active = state ? (m_clock_active | (1<<which)) : (m_clock_active & ~(1<<which)); } // internal state diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp index 58d7c830b8d..a6a67710cde 100644 --- a/src/mame/audio/midway.cpp +++ b/src/mame/audio/midway.cpp @@ -463,7 +463,7 @@ void midway_ssio_device::device_reset() // device_timer - timer callbacks //------------------------------------------------- -void midway_ssio_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void midway_ssio_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_data[param >> 8] = param & 0xff; } @@ -653,7 +653,7 @@ void midway_sounds_good_device::device_reset() // device_timer - timer callbacks //------------------------------------------------- -void midway_sounds_good_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void midway_sounds_good_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_pia->portb_w((param >> 1) & 0x0f); m_pia->ca1_w(~param & 0x01); @@ -820,7 +820,7 @@ void midway_turbo_cheap_squeak_device::device_reset() // device_timer - timer callbacks //------------------------------------------------- -void midway_turbo_cheap_squeak_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void midway_turbo_cheap_squeak_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_pia->portb_w((param >> 1) & 0x0f); m_pia->ca1_w(~param & 0x01); diff --git a/src/mame/audio/midway.h b/src/mame/audio/midway.h index d633448ba79..38021a863e2 100644 --- a/src/mame/audio/midway.h +++ b/src/mame/audio/midway.h @@ -85,7 +85,7 @@ protected: virtual ioport_constructor device_input_ports() 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; private: // internal helpers @@ -143,7 +143,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; private: // devices @@ -183,7 +183,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; private: // devices diff --git a/src/mame/audio/mw8080bw.cpp b/src/mame/audio/mw8080bw.cpp index 301a335d010..0d35eb4194a 100644 --- a/src/mame/audio/mw8080bw.cpp +++ b/src/mame/audio/mw8080bw.cpp @@ -3115,7 +3115,7 @@ void spcenctr_audio_device::device_start() save_item(NAME(m_strobe_enable)); - strobe_callback(nullptr, 0U); + strobe_callback(0); } TIMER_CALLBACK_MEMBER(spcenctr_audio_device::strobe_callback) diff --git a/src/mame/audio/pinsnd88.cpp b/src/mame/audio/pinsnd88.cpp index d3f36e3cd50..45f12c09024 100644 --- a/src/mame/audio/pinsnd88.cpp +++ b/src/mame/audio/pinsnd88.cpp @@ -159,7 +159,7 @@ void pinsnd88_device::pinsnd88_map(address_map &map) map(0xc000, 0xffff).rom().region("cpu",0x3c000); // fixed bank } -void pinsnd88_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pinsnd88_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/audio/pinsnd88.h b/src/mame/audio/pinsnd88.h index 13c06392fb5..f6fc88790dd 100644 --- a/src/mame/audio/pinsnd88.h +++ b/src/mame/audio/pinsnd88.h @@ -55,7 +55,7 @@ protected: static const device_timer_id TIMER_SYNC = 0; private: // overrides - 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; // members devcb_write_line m_syncq_cb; diff --git a/src/mame/audio/t5182.cpp b/src/mame/audio/t5182.cpp index c6e62079d29..2b5c4f65bf0 100644 --- a/src/mame/audio/t5182.cpp +++ b/src/mame/audio/t5182.cpp @@ -221,12 +221,12 @@ TIMER_CALLBACK_MEMBER( t5182_device::setirq_callback ) m_ourcpu->set_input_line(0,ASSERT_LINE); } -void t5182_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void t5182_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case SETIRQ_CB: - setirq_callback(ptr, param); + setirq_callback(param); break; default: throw emu_fatalerror("Unknown id in t5182_device::device_timer"); diff --git a/src/mame/audio/t5182.h b/src/mame/audio/t5182.h index c4280cc913a..6fef45ca445 100644 --- a/src/mame/audio/t5182.h +++ b/src/mame/audio/t5182.h @@ -42,7 +42,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; virtual ioport_constructor device_input_ports() const override; virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/mame/audio/tvc.cpp b/src/mame/audio/tvc.cpp index ddae30f94ed..7baad1f6401 100644 --- a/src/mame/audio/tvc.cpp +++ b/src/mame/audio/tvc.cpp @@ -52,7 +52,7 @@ void tvc_sound_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void tvc_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tvc_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_write_sndint(1); } diff --git a/src/mame/audio/tvc.h b/src/mame/audio/tvc.h index 004ed6975bf..8ad34a97e21 100644 --- a/src/mame/audio/tvc.h +++ b/src/mame/audio/tvc.h @@ -33,7 +33,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 sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; private: diff --git a/src/mame/audio/vboy.cpp b/src/mame/audio/vboy.cpp index d7b3f587eed..1b4a32d8185 100644 --- a/src/mame/audio/vboy.cpp +++ b/src/mame/audio/vboy.cpp @@ -211,7 +211,7 @@ void vboysnd_device::device_start() // create the stream m_stream = stream_alloc(0, 2, rate); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); m_timer->adjust(attotime::zero, 0, rate ? attotime::from_hz(rate / 4) : attotime::never); for (int i=0; i<2048; i++) @@ -259,7 +259,7 @@ void vboysnd_device::device_reset() // device_timer - called when our device timer expires //------------------------------------------------- -void vboysnd_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void vboysnd_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { m_stream->update(); } diff --git a/src/mame/audio/vboy.h b/src/mame/audio/vboy.h index e6d1f36deee..e73f51b232c 100644 --- a/src/mame/audio/vboy.h +++ b/src/mame/audio/vboy.h @@ -70,7 +70,7 @@ protected: virtual void device_start() override; virtual void device_clock_changed() 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 sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; diff --git a/src/mame/audio/warpwarp.cpp b/src/mame/audio/warpwarp.cpp index 5ef7e52659c..c7c0845ff66 100644 --- a/src/mame/audio/warpwarp.cpp +++ b/src/mame/audio/warpwarp.cpp @@ -71,7 +71,7 @@ void warpwarp_sound_device::device_start() save_item(NAME(m_mcount)); } -void warpwarp_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void warpwarp_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/audio/warpwarp.h b/src/mame/audio/warpwarp.h index d4bcdc15d23..34add2c258d 100644 --- a/src/mame/audio/warpwarp.h +++ b/src/mame/audio/warpwarp.h @@ -29,7 +29,7 @@ protected: // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) 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 state diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp index d2dda4bcaa3..636dc9b27f9 100644 --- a/src/mame/audio/williams.cpp +++ b/src/mame/audio/williams.cpp @@ -249,7 +249,7 @@ void williams_cvsd_sound_device::device_reset() // device_timer - timer callbacks //------------------------------------------------- -void williams_cvsd_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void williams_cvsd_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // process incoming data write m_pia->portb_w(param & 0xff); @@ -585,7 +585,7 @@ void williams_narc_sound_device::device_reset() // device_timer - timer callbacks //------------------------------------------------- -void williams_narc_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void williams_narc_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -821,7 +821,7 @@ void williams_adpcm_sound_device::device_reset() // device_timer - timer callbacks //------------------------------------------------- -void williams_adpcm_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void williams_adpcm_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/audio/williams.h b/src/mame/audio/williams.h index 1f18ce232db..e970b6e49b9 100644 --- a/src/mame/audio/williams.h +++ b/src/mame/audio/williams.h @@ -61,7 +61,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; private: // devices @@ -116,7 +116,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; private: // timer IDs @@ -180,7 +180,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; private: // devices diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp index 5630b00edc3..a102fd6df03 100644 --- a/src/mame/drivers/2mindril.cpp +++ b/src/mame/drivers/2mindril.cpp @@ -88,7 +88,7 @@ private: }; protected: - 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) override; #endif }; @@ -132,7 +132,7 @@ void _2mindril_state::coins_w(u8 data) PORT_DIPSETTING( 0x0800, DEF_STR( On ) ) */ #ifdef UNUSED_FUNCTION -void _2mindril_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void _2mindril_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp index da7a43517b0..6a9a2f7aa44 100644 --- a/src/mame/drivers/a2600.cpp +++ b/src/mame/drivers/a2600.cpp @@ -503,8 +503,8 @@ void a2600_pop_state::machine_start() a2600_base_state::machine_start(); m_bank->configure_entries(0, 48, memregion("maincpu")->base(), 0x1000); m_bank->set_entry(0); - m_reset_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(a2600_pop_state::reset_timer_callback),this), nullptr); - m_game_select_button_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(a2600_pop_state::game_select_button_timer_callback),this), nullptr); + m_reset_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(a2600_pop_state::reset_timer_callback),this)); + m_game_select_button_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(a2600_pop_state::game_select_button_timer_callback),this)); } diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp index b0f8c771ade..df28cb13058 100644 --- a/src/mame/drivers/abc80.cpp +++ b/src/mame/drivers/abc80.cpp @@ -378,7 +378,7 @@ void abc80_state::kbd_w(u8 data) // device_timer - handler timer events //------------------------------------------------- -void abc80_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void abc80_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp index 9228cefd313..5ee911fa734 100644 --- a/src/mame/drivers/accomm.cpp +++ b/src/mame/drivers/accomm.cpp @@ -94,7 +94,7 @@ protected: virtual void machine_start() override; virtual void video_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: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -481,7 +481,7 @@ uint32_t accomm_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -void accomm_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void accomm_state::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_SCANLINE_INTERRUPT) { diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp index f8fc8e8b065..d343155cf94 100644 --- a/src/mame/drivers/acefruit.cpp +++ b/src/mame/drivers/acefruit.cpp @@ -55,7 +55,7 @@ protected: virtual void machine_start() override; virtual void video_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: void acefruit_colorram_w(offs_t offset, uint8_t data); @@ -108,7 +108,7 @@ void acefruit_state::acefruit_update_irq(int vpos) } -void acefruit_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void acefruit_state::device_timer(emu_timer &timer, device_timer_id id, int param) { int vpos = m_screen->vpos(); diff --git a/src/mame/drivers/aces1.cpp b/src/mame/drivers/aces1.cpp index 618e0a62971..ce82540a16d 100644 --- a/src/mame/drivers/aces1.cpp +++ b/src/mame/drivers/aces1.cpp @@ -263,8 +263,8 @@ void aces1_state::machine_start() m_reel_clock[reel] =0; m_reel_phase[reel] =0; } - m_aces1_irq_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(aces1_state::m_aces1_irq_timer_callback),this), nullptr); - m_aces1_nmi_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(aces1_state::m_aces1_nmi_timer_callback),this), nullptr); + m_aces1_irq_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(aces1_state::m_aces1_irq_timer_callback),this)); + m_aces1_nmi_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(aces1_state::m_aces1_nmi_timer_callback),this)); m_digits.resolve(); m_lamps.resolve(); diff --git a/src/mame/drivers/alfaskop41xx.cpp b/src/mame/drivers/alfaskop41xx.cpp index 6895e955c24..60f4562ab75 100644 --- a/src/mame/drivers/alfaskop41xx.cpp +++ b/src/mame/drivers/alfaskop41xx.cpp @@ -116,7 +116,7 @@ private: TIMER_POLL_START, TIMER_POLL_BIT }; - 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; // DEBUG stuff, will be removed when hooked up towards remote peer /* zero extended SDLC poll message frame to feed into receiver as a test @@ -480,7 +480,7 @@ void alfaskop4110_state::machine_start() timer_set(attotime::from_msec(5000), TIMER_POLL_START); } -void alfaskop4110_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void alfaskop4110_state::device_timer(emu_timer &timer, device_timer_id id, int param) { // Debug, inserts a poll SDLC frame through the ADLC, it ends up at address 0x140 in RAM through DMA switch (id) diff --git a/src/mame/drivers/alphatpc16.cpp b/src/mame/drivers/alphatpc16.cpp index 9f492e23df0..836c0f3fcaa 100644 --- a/src/mame/drivers/alphatpc16.cpp +++ b/src/mame/drivers/alphatpc16.cpp @@ -528,7 +528,7 @@ void alphatpc16_state::alphatpc16(machine_config &config) EF9345(config, m_ef9345, 0); m_ef9345->set_palette_tag("palette"); - TIMER(config, "scanline").configure_scanline(NAME([this](timer_device &t, void *ptr, s32 p){m_ef9345->update_scanline((uint16_t)p);}), screen, 0, 10); + TIMER(config, "scanline").configure_scanline(NAME([this](timer_device &t, s32 p){m_ef9345->update_scanline((uint16_t)p);}), screen, 0, 10); // these are supported by the bios, they may not have been available on real hardware RAM(config, m_ram).set_default_size("64K").set_extra_options("128K,192K,256K,384K,448K,512K"); diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp index ac25897f4eb..6c10a9edf5a 100644 --- a/src/mame/drivers/alto2.cpp +++ b/src/mame/drivers/alto2.cpp @@ -31,7 +31,7 @@ public: void alto2(machine_config &config); protected: - 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: u16 kb_r(offs_t offset); @@ -306,7 +306,7 @@ void alto2_state::init_alto2() m_vblank_timer->adjust(attotime::from_hz(2*30),0,attotime::from_hz(30*2)); } -void alto2_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void alto2_state::device_timer(emu_timer &timer, device_timer_id id, int param) { alto2_cpu_device* cpu = downcast<alto2_cpu_device *>(m_maincpu.target()); switch (id) { diff --git a/src/mame/drivers/apexc.cpp b/src/mame/drivers/apexc.cpp index e16a3660312..f63dce84782 100644 --- a/src/mame/drivers/apexc.cpp +++ b/src/mame/drivers/apexc.cpp @@ -139,7 +139,7 @@ static INPUT_PORTS_START(apexc) PORT_BIT(0x00000001, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Toggle bit #32") PORT_CODE(KEYCODE_C) INPUT_PORTS_END -void apexc_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void apexc_state::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_POLL_INPUTS) { diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp index 12b5a0c3146..b92106c2b7b 100644 --- a/src/mame/drivers/aristmk4.cpp +++ b/src/mame/drivers/aristmk4.cpp @@ -383,7 +383,7 @@ private: TIMER_POWER_FAIL }; - 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; required_device<cpu_device> m_maincpu; required_device<mc146818_device> m_rtc; @@ -1747,7 +1747,7 @@ void aristmk4_state::machine_reset() m_power_timer->adjust(attotime::from_hz(1), 0, attotime::from_hz(1)); } -void aristmk4_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void aristmk4_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/artmagic.cpp b/src/mame/drivers/artmagic.cpp index e5a73845bbf..5e979dd188a 100644 --- a/src/mame/drivers/artmagic.cpp +++ b/src/mame/drivers/artmagic.cpp @@ -119,7 +119,7 @@ void artmagic_state::control_w(offs_t offset, uint16_t data, uint16_t mem_mask) * *************************************/ -void artmagic_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void artmagic_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/asterix.cpp b/src/mame/drivers/asterix.cpp index 50efb9afe59..b7b5d33b086 100644 --- a/src/mame/drivers/asterix.cpp +++ b/src/mame/drivers/asterix.cpp @@ -65,7 +65,7 @@ INTERRUPT_GEN_MEMBER(asterix_state::asterix_interrupt) device.execute().set_input_line(5, HOLD_LINE); /* ??? All irqs have the same vector, and the mask used is 0 or 7 */ } -void asterix_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void asterix_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp index e3427f01480..1dbc3fedefb 100644 --- a/src/mame/drivers/astinvad.cpp +++ b/src/mame/drivers/astinvad.cpp @@ -105,7 +105,7 @@ private: void spaceint_map(address_map &map); void spaceint_portmap(address_map &map); - 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 plot_byte( bitmap_rgb32 &bitmap, uint8_t y, uint8_t x, uint8_t data, uint8_t color ); std::unique_ptr<uint8_t[]> m_colorram; @@ -251,15 +251,15 @@ uint32_t astinvad_state::screen_update_spaceint(screen_device &screen, bitmap_rg * *************************************/ -void astinvad_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void astinvad_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_INT_OFF: - kamikaze_int_off(ptr, param); + kamikaze_int_off(param); break; case TIMER_INT_GEN: - kamizake_int_gen(ptr, param); + kamizake_int_gen(param); break; default: throw emu_fatalerror("Unknown id in astinvad_state::device_timer"); diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp index f625488938e..b5413c3f408 100644 --- a/src/mame/drivers/atarist.cpp +++ b/src/mame/drivers/atarist.cpp @@ -52,7 +52,7 @@ static const double DMASOUND_RATE[] = { Y2/640.0/8.0, Y2/640.0/4.0, Y2/640.0/2.0 // TIMERS //************************************************************************** -void st_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void st_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -825,7 +825,7 @@ void ste_state::dmasound_tick() } -void ste_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ste_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -836,7 +836,7 @@ void ste_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo microwire_tick(); break; default: - st_state::device_timer(timer, id, param, ptr); + st_state::device_timer(timer, id, param); } } diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp index 80c2ead9040..87a8aa4fdc5 100644 --- a/src/mame/drivers/atlantis.cpp +++ b/src/mame/drivers/atlantis.cpp @@ -124,7 +124,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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<mips3_device> m_maincpu; @@ -659,7 +659,7 @@ void atlantis_state::machine_reset() /************************************* * Timer *************************************/ -void atlantis_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void atlantis_state::device_timer(emu_timer &timer, device_timer_id id, int param) { // ADC Ready Timer board_ctrl[STATUS] |= (1 << A2D_IRQ_SHIFT); diff --git a/src/mame/drivers/aviion88k.cpp b/src/mame/drivers/aviion88k.cpp index 38315cea858..0fd77999e40 100644 --- a/src/mame/drivers/aviion88k.cpp +++ b/src/mame/drivers/aviion88k.cpp @@ -80,7 +80,7 @@ protected: // address maps void cpu_map(address_map &map); - void pit_timer(void *ptr, int param) { LOG("pit_timer<%d> expired\n", param); } + void pit_timer(int param) { LOG("pit_timer<%d> expired\n", param); } template <unsigned N> u32 pit_cnt_r() { return m_pit[N]->enabled() ? m_pit[N]->elapsed().as_ticks(m_cpu->clock()) : 0; } template <unsigned N> u32 pit_sts_r() { return m_pit_cmd[N]; } diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp index 9e6e456b886..b8ed67f80d3 100644 --- a/src/mame/drivers/beezer.cpp +++ b/src/mame/drivers/beezer.cpp @@ -108,7 +108,7 @@ protected: TIMER_SCANLINE }; - 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<cpu_device> m_maincpu; @@ -297,7 +297,7 @@ uint8_t beezer_state::line_r() // AUDIO //************************************************************************** -void beezer_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void beezer_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/blockade.cpp b/src/mame/drivers/blockade.cpp index 64568e8908c..7b9efdb0386 100644 --- a/src/mame/drivers/blockade.cpp +++ b/src/mame/drivers/blockade.cpp @@ -62,7 +62,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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<cpu_device> m_maincpu; @@ -455,7 +455,7 @@ void blockade_state::machine_reset() m_coin_inserted = 0; } -void blockade_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void blockade_state::device_timer(emu_timer &timer, device_timer_id id, int param) { // resume cpu, on the real system, this is connected the READY input m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp index ca836a2da03..10cd616cd22 100644 --- a/src/mame/drivers/boxer.cpp +++ b/src/mame/drivers/boxer.cpp @@ -65,7 +65,7 @@ protected: virtual void machine_reset() override; void boxer_map(address_map &map); - 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: /* memory pointers */ @@ -92,15 +92,15 @@ private: * *************************************/ -void boxer_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void boxer_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { case TIMER_POT_INTERRUPT: - pot_interrupt(ptr, param); + pot_interrupt(param); break; case TIMER_PERIODIC: - periodic_callback(ptr, param); + periodic_callback(param); break; default: throw emu_fatalerror("Unknown id in boxer_state::device_timer"); diff --git a/src/mame/drivers/btoads.cpp b/src/mame/drivers/btoads.cpp index 19c4476cfd2..1857e9b4497 100644 --- a/src/mame/drivers/btoads.cpp +++ b/src/mame/drivers/btoads.cpp @@ -66,7 +66,7 @@ uint8_t btoads_state::nvram_r(offs_t offset) * *************************************/ -void btoads_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void btoads_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/capbowl.cpp b/src/mame/drivers/capbowl.cpp index 53b7b583211..ce89730535b 100644 --- a/src/mame/drivers/capbowl.cpp +++ b/src/mame/drivers/capbowl.cpp @@ -122,12 +122,12 @@ INTERRUPT_GEN_MEMBER(capbowl_state::interrupt) * *************************************/ -void capbowl_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void capbowl_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_UPDATE: - update(ptr, param); + update(param); break; default: throw emu_fatalerror("Unknown id in capbowl_state::device_timer"); diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp index 18dbf71eb94..c8611469ef8 100644 --- a/src/mame/drivers/cat.cpp +++ b/src/mame/drivers/cat.cpp @@ -277,7 +277,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_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: required_device<cpu_device> m_maincpu; @@ -898,12 +898,12 @@ static INPUT_PORTS_START( cat ) INPUT_PORTS_END -void cat_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cat_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_COUNTER_6MS: - counter_6ms_callback(ptr, param); + counter_6ms_callback(param); break; default: throw emu_fatalerror("Unknown id in cat_state::device_timer"); diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp index f7db130071b..a2758942c34 100644 --- a/src/mame/drivers/cball.cpp +++ b/src/mame/drivers/cball.cpp @@ -61,7 +61,7 @@ public: void cball(machine_config &config); void cpu_map(address_map &map); protected: - 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; }; @@ -102,12 +102,12 @@ uint32_t cball_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -void cball_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cball_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_INTERRUPT: - interrupt_callback(ptr, param); + interrupt_callback(param); break; default: throw emu_fatalerror("Unknown id in cball_state::device_timer"); diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp index b3924a7fb60..48f9a1874cc 100644 --- a/src/mame/drivers/cbm2.cpp +++ b/src/mame/drivers/cbm2.cpp @@ -139,7 +139,7 @@ public: required_ioport_array<8> m_pb; required_ioport m_lock; - 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; DECLARE_MACHINE_START( cbm2 ); DECLARE_MACHINE_START( cbm2_ntsc ); @@ -2046,7 +2046,7 @@ void cbm2_state::ext_cia_pb_w(uint8_t data) // device_timer - handler timer events //------------------------------------------------- -void cbm2_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cbm2_state::device_timer(emu_timer &timer, device_timer_id id, int param) { m_tpi1->i0_w(m_todclk); diff --git a/src/mame/drivers/cchasm.cpp b/src/mame/drivers/cchasm.cpp index 99385a62057..fc8551513f2 100644 --- a/src/mame/drivers/cchasm.cpp +++ b/src/mame/drivers/cchasm.cpp @@ -64,7 +64,7 @@ protected: TIMER_REFRESH_END }; - 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 machine_start() override; @@ -319,7 +319,7 @@ WRITE_LINE_MEMBER(cchasm_state::ctc_timer_2_w) } -void cchasm_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cchasm_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp index b40d3e0b6da..39bb1cfa615 100644 --- a/src/mame/drivers/chexx.cpp +++ b/src/mame/drivers/chexx.cpp @@ -131,7 +131,7 @@ protected: TIMER_UPDATE }; - 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 update(); @@ -283,7 +283,7 @@ void chexx_state::mem(address_map &map) map(0xf800, 0xffff).rom().region("maincpu", 0); } -void chexx_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void chexx_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/cidelsa.cpp b/src/mame/drivers/cidelsa.cpp index f95ab22ae49..8a18ee987cb 100644 --- a/src/mame/drivers/cidelsa.cpp +++ b/src/mame/drivers/cidelsa.cpp @@ -356,7 +356,7 @@ INPUT_PORTS_END /* Machine Start */ -void cidelsa_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cidelsa_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/clickstart.cpp b/src/mame/drivers/clickstart.cpp index a0afdf0469f..ac11809785e 100644 --- a/src/mame/drivers/clickstart.cpp +++ b/src/mame/drivers/clickstart.cpp @@ -101,7 +101,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(key_update); private: - 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; static const device_timer_id TIMER_UART_TX = 0; @@ -205,7 +205,7 @@ DEVICE_IMAGE_LOAD_MEMBER(clickstart_state::cart_load) return image_init_result::PASS; } -void clickstart_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void clickstart_state::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_UART_TX) { diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp index 4d368c17997..adb36aa187e 100644 --- a/src/mame/drivers/cmi.cpp +++ b/src/mame/drivers/cmi.cpp @@ -228,7 +228,7 @@ public: virtual void machine_reset() override; virtual void machine_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; static const device_timer_id TIMER_MAP_SWITCH = 0; static const device_timer_id TIMER_HBLANK = 1; @@ -965,7 +965,7 @@ template<int cpunum> void cmi_state::irq_ram_w(offs_t offset, uint8_t data) m_scratch_ram[cpunum][0xf8 + offset] = data; } -void cmi_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cmi_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp index b06dc6cf4a5..7b729a18cbb 100644 --- a/src/mame/drivers/comx35.cpp +++ b/src/mame/drivers/comx35.cpp @@ -543,7 +543,7 @@ WRITE_LINE_MEMBER( comx35_state::irq_w ) // device_timer - handler timer events //------------------------------------------------- -void comx35_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void comx35_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp index 53b9530af3e..c85e0d1598b 100644 --- a/src/mame/drivers/dec8.cpp +++ b/src/mame/drivers/dec8.cpp @@ -132,7 +132,7 @@ uint8_t dec8_state::gondo_player_2_r(offs_t offset) * ***************************************************/ -void dec8_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void dec8_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp index 6d00a517ae0..3b36be8ab96 100644 --- a/src/mame/drivers/dectalk.cpp +++ b/src/mame/drivers/dectalk.cpp @@ -326,7 +326,7 @@ private: void tms32010_io(address_map &map); void tms32010_mem(address_map &map); - 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; }; @@ -839,12 +839,12 @@ INPUT_PORTS_END /****************************************************************************** Machine Drivers ******************************************************************************/ -void dectalk_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void dectalk_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_OUTFIFO_READ: - outfifo_read_cb(ptr, param); + outfifo_read_cb(param); break; default: throw emu_fatalerror("Unknown id in dectalk_state::device_timer"); diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp index fd863440050..4120b27e342 100644 --- a/src/mame/drivers/destroyr.cpp +++ b/src/mame/drivers/destroyr.cpp @@ -56,7 +56,7 @@ public: private: virtual void machine_start() override; virtual void machine_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; static const device_timer_id TIMER_DIAL = 0; static const device_timer_id TIMER_FRAME = 1; @@ -180,15 +180,15 @@ uint32_t destroyr_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -void destroyr_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void destroyr_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_DIAL: - dial_callback(ptr, param); + dial_callback(param); break; case TIMER_FRAME: - frame_callback(ptr, param); + frame_callback(param); break; default: throw emu_fatalerror("Unknown id in destroyr_state::device_timer"); diff --git a/src/mame/drivers/dpb7000.cpp b/src/mame/drivers/dpb7000.cpp index 0a702bf235e..2e5f59c96f5 100644 --- a/src/mame/drivers/dpb7000.cpp +++ b/src/mame/drivers/dpb7000.cpp @@ -111,7 +111,7 @@ public: private: virtual void machine_start() override; virtual void machine_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; template <int StoreNum> uint32_t store_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -1062,7 +1062,7 @@ void dpb7000_state::machine_reset() m_tablet_state = 0; } -void dpb7000_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void dpb7000_state::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_DISKSEQ_COMPLETE) req_b_w(1); diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp index 5412f8cf08d..a4f3d5a787e 100644 --- a/src/mame/drivers/dvk_kcgd.cpp +++ b/src/mame/drivers/dvk_kcgd.cpp @@ -108,7 +108,7 @@ private: KCGD_STATUS_TIMER_VAL = 15 }; - 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; uint16_t vram_addr_r(); uint16_t vram_data_r(); @@ -187,7 +187,7 @@ static DEVICE_INPUT_DEFAULTS_START( host_rs232_defaults ) DEVICE_INPUT_DEFAULTS_END -void kcgd_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void kcgd_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp index 4a6bc1afa65..41a66555a7e 100644 --- a/src/mame/drivers/dvk_ksm.cpp +++ b/src/mame/drivers/dvk_ksm.cpp @@ -115,7 +115,7 @@ private: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - 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; DECLARE_WRITE_LINE_MEMBER(write_keyboard_clock); @@ -220,7 +220,7 @@ static INPUT_PORTS_START( ksm ) PORT_DIPSETTING(0x0E, "75") INPUT_PORTS_END -void ksm_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ksm_state::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_ID_BRG) { diff --git a/src/mame/drivers/esh.cpp b/src/mame/drivers/esh.cpp index f47cbf90200..156b931663b 100644 --- a/src/mame/drivers/esh.cpp +++ b/src/mame/drivers/esh.cpp @@ -55,7 +55,7 @@ public: protected: virtual void machine_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: required_device<pioneer_ldv1000_device> m_laserdisc; diff --git a/src/mame/drivers/eurocom2.cpp b/src/mame/drivers/eurocom2.cpp index 3efb4fdd61d..bfae3a8891b 100644 --- a/src/mame/drivers/eurocom2.cpp +++ b/src/mame/drivers/eurocom2.cpp @@ -106,7 +106,7 @@ protected: // driver_device overrides virtual void machine_reset() override; virtual void machine_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_sst; @@ -246,7 +246,7 @@ WRITE_LINE_MEMBER(eurocom2_state::pia1_cb2_w) // reset single-step timer } -void eurocom2_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void eurocom2_state::device_timer(emu_timer &timer, device_timer_id id, int param) { m_sst_state = !m_sst_state; m_pia1->ca2_w(m_sst_state); diff --git a/src/mame/drivers/exidy.cpp b/src/mame/drivers/exidy.cpp index bc431eda28b..687ca1f4b8c 100644 --- a/src/mame/drivers/exidy.cpp +++ b/src/mame/drivers/exidy.cpp @@ -215,7 +215,7 @@ protected: required_device<palette_device> m_palette; required_shared_ptr<uint8_t> m_color_latch; - 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 video_start() override; void base(machine_config &config); @@ -1297,7 +1297,7 @@ void exidy_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) ***************************************************************************/ -void exidy_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void exidy_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/exorciser.cpp b/src/mame/drivers/exorciser.cpp index 8c6dd039509..2e0fc629ea9 100644 --- a/src/mame/drivers/exorciser.cpp +++ b/src/mame/drivers/exorciser.cpp @@ -221,7 +221,7 @@ private: u8 m_restart_count; - 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 pia_dbg_pa_w(u8 data); DECLARE_READ_LINE_MEMBER(pia_dbg_ca1_r); @@ -510,7 +510,7 @@ WRITE_LINE_MEMBER(exorciser_state::pia_dbg_ca2_w) } -void exorciser_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void exorciser_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/fgoal.cpp b/src/mame/drivers/fgoal.cpp index b985bcc6d52..f451e738afd 100644 --- a/src/mame/drivers/fgoal.cpp +++ b/src/mame/drivers/fgoal.cpp @@ -64,12 +64,12 @@ void fgoal_state::fgoal_palette(palette_device &palette) const } -void fgoal_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void fgoal_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_INTERRUPT: - interrupt_callback(ptr, param); + interrupt_callback(param); break; default: throw emu_fatalerror("Unknown id in fgoal_state::device_timer"); diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp index ee657e4a41e..e9eda030204 100644 --- a/src/mame/drivers/flyball.cpp +++ b/src/mame/drivers/flyball.cpp @@ -84,7 +84,7 @@ private: TIMER_CALLBACK_MEMBER(quarter_callback); void flyball_map(address_map &map); - 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; /* devices */ required_device<cpu_device> m_maincpu; @@ -181,18 +181,18 @@ uint32_t flyball_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -void flyball_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void flyball_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_POT_ASSERT: - joystick_callback(ptr, param); + joystick_callback(param); break; case TIMER_POT_CLEAR: m_maincpu->set_input_line(0, CLEAR_LINE); break; case TIMER_QUARTER: - quarter_callback(ptr, param); + quarter_callback(param); break; default: diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp index ac87d0bcbf7..9336706a8bd 100644 --- a/src/mame/drivers/fmtowns.cpp +++ b/src/mame/drivers/fmtowns.cpp @@ -439,7 +439,7 @@ uint8_t towns_state::towns_intervaltimer2_r(offs_t offset) return 0xff; } -void towns_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void towns_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { @@ -462,7 +462,7 @@ void towns_state::device_timer(emu_timer &timer, device_timer_id id, int param, towns_cd_status_ready(); break; case TIMER_CDDA: - towns_delay_cdda((cdrom_image_device*)ptr); + towns_delay_cdda(m_cdrom.target()); break; case TIMER_SPRITES: draw_sprites(); @@ -1455,7 +1455,7 @@ uint8_t towns_state::towns_cd_get_track() TIMER_CALLBACK_MEMBER(towns_state::towns_cdrom_read_byte) { - upd71071_device* device = (upd71071_device* )ptr; + upd71071_device* device = m_dma_1.target(); int masked; // TODO: support software transfers, for now DMA is assumed. @@ -1674,7 +1674,6 @@ void towns_state::towns_cdrom_execute_command(cdrom_image_device* device) break; case 0x04: // Play Audio Track if(LOG_CD) logerror("CD: Command 0x04: PLAY CD-DA\n"); - m_towns_cdda_timer->set_ptr(device); m_towns_cdda_timer->adjust(attotime::from_msec(1),0,attotime::never); break; case 0x05: // Read TOC @@ -2747,7 +2746,7 @@ void towns_state::driver_start() memset(&m_towns_cd,0,sizeof(struct towns_cdrom_controller)); m_towns_cd.status = 0x01; // CDROM controller ready m_towns_cd.buffer_ptr = -1; - m_towns_cd.read_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(towns_state::towns_cdrom_read_byte),this), (void*)m_dma_1.target()); + m_towns_cd.read_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(towns_state::towns_cdrom_read_byte),this)); save_pointer(m_video.towns_crtc_reg,"CRTC registers",32); save_pointer(m_video.towns_video_reg,"Video registers",2); diff --git a/src/mame/drivers/fuukifg2.cpp b/src/mame/drivers/fuukifg2.cpp index b7ea76c6351..93c971edead 100644 --- a/src/mame/drivers/fuukifg2.cpp +++ b/src/mame/drivers/fuukifg2.cpp @@ -416,7 +416,7 @@ GFXDECODE_END also used for water effects and titlescreen linescroll on gogomile */ -void fuuki16_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void fuuki16_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/fuukifg3.cpp b/src/mame/drivers/fuukifg3.cpp index c5cf7414eb1..74c7c8fbd06 100644 --- a/src/mame/drivers/fuukifg3.cpp +++ b/src/mame/drivers/fuukifg3.cpp @@ -481,7 +481,7 @@ GFXDECODE_END ***************************************************************************/ -void fuuki32_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void fuuki32_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp index 19fe6e4fd71..2c3f9c821af 100644 --- a/src/mame/drivers/gaplus.cpp +++ b/src/mame/drivers/gaplus.cpp @@ -210,15 +210,15 @@ void gaplus_base_state::machine_reset() m_subcpu->set_input_line(0, CLEAR_LINE); } -void gaplus_base_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void gaplus_base_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_NAMCOIO0_RUN: - namcoio0_run(ptr, param); + namcoio0_run(param); break; case TIMER_NAMCOIO1_RUN: - namcoio1_run(ptr, param); + namcoio1_run(param); break; default: throw emu_fatalerror("Unknown id in gaplus_base_state::device_timer"); diff --git a/src/mame/drivers/gba.cpp b/src/mame/drivers/gba.cpp index 7ba6049b307..3ea6e6f8166 100644 --- a/src/mame/drivers/gba.cpp +++ b/src/mame/drivers/gba.cpp @@ -312,7 +312,7 @@ void gba_state::dma_exec(int ch) // printf("settng DMA timer %d for %d cycs (tmr %x)\n", ch, cnt, (uint32_t)m_dma_timer[ch]); // m_dma_timer[ch]->adjust(ATTOTIME_IN_CYCLES(0, cnt), ch); - dma_complete(nullptr, ch); + dma_complete(ch); } void gba_state::audio_tick(int ref) diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp index 65149c633e9..71688beda09 100644 --- a/src/mame/drivers/gottlieb.cpp +++ b/src/mame/drivers/gottlieb.cpp @@ -691,21 +691,21 @@ void gottlieb_state::qbert_knocker(machine_config &config) * *************************************/ -void gottlieb_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void gottlieb_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_LASERDISC_PHILIPS: - laserdisc_philips_callback(ptr, param); + laserdisc_philips_callback(param); break; case TIMER_LASERDISC_BIT_OFF: - laserdisc_bit_off_callback(ptr, param); + laserdisc_bit_off_callback(param); break; case TIMER_LASERDISC_BIT: - laserdisc_bit_callback(ptr, param); + laserdisc_bit_callback(param); break; case TIMER_NMI_CLEAR: - nmi_clear(ptr, param); + nmi_clear(param); break; default: throw emu_fatalerror("Unknown id in gottlieb_state::device_timer"); diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp index fa4d657a34b..a4e142b048a 100644 --- a/src/mame/drivers/goupil.cpp +++ b/src/mame/drivers/goupil.cpp @@ -119,7 +119,7 @@ protected: TIMER_SCANLINE }; - 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: void mem(address_map &map); @@ -165,7 +165,7 @@ private: * Keyboard I/O Handlers * ***********************************/ -void goupil_g1_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void goupil_g1_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/gp32.cpp b/src/mame/drivers/gp32.cpp index bef2fac9a24..9e78be20031 100644 --- a/src/mame/drivers/gp32.cpp +++ b/src/mame/drivers/gp32.cpp @@ -1606,18 +1606,18 @@ void gp32_state::s3c240x_mmc_w(offs_t offset, uint32_t data, uint32_t mem_mask) void gp32_state::s3c240x_machine_start() { - m_s3c240x_pwm_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_pwm_timer_exp),this), (void *)(uintptr_t)0); - m_s3c240x_pwm_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_pwm_timer_exp),this), (void *)(uintptr_t)1); - m_s3c240x_pwm_timer[2] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_pwm_timer_exp),this), (void *)(uintptr_t)2); - m_s3c240x_pwm_timer[3] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_pwm_timer_exp),this), (void *)(uintptr_t)3); - m_s3c240x_pwm_timer[4] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_pwm_timer_exp),this), (void *)(uintptr_t)4); - m_s3c240x_dma_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_dma_timer_exp),this), (void *)(uintptr_t)0); - m_s3c240x_dma_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_dma_timer_exp),this), (void *)(uintptr_t)1); - m_s3c240x_dma_timer[2] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_dma_timer_exp),this), (void *)(uintptr_t)2); - m_s3c240x_dma_timer[3] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_dma_timer_exp),this), (void *)(uintptr_t)3); - m_s3c240x_iic_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_iic_timer_exp),this), (void *)(uintptr_t)0); - m_s3c240x_iis_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_iis_timer_exp),this), (void *)(uintptr_t)0); - m_s3c240x_lcd_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_lcd_timer_exp),this), (void *)(uintptr_t)0); + m_s3c240x_pwm_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_pwm_timer_exp),this)); + m_s3c240x_pwm_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_pwm_timer_exp),this)); + m_s3c240x_pwm_timer[2] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_pwm_timer_exp),this)); + m_s3c240x_pwm_timer[3] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_pwm_timer_exp),this)); + m_s3c240x_pwm_timer[4] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_pwm_timer_exp),this)); + m_s3c240x_dma_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_dma_timer_exp),this)); + m_s3c240x_dma_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_dma_timer_exp),this)); + m_s3c240x_dma_timer[2] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_dma_timer_exp),this)); + m_s3c240x_dma_timer[3] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_dma_timer_exp),this)); + m_s3c240x_iic_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_iic_timer_exp),this)); + m_s3c240x_iis_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_iis_timer_exp),this)); + m_s3c240x_lcd_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gp32_state::s3c240x_lcd_timer_exp),this)); m_eeprom_data = std::make_unique<uint8_t[]>(0x2000); // a dump of the EEPROM (S524AB0X91) resulted to be 0x1000 m_nvram->set_base(m_eeprom_data.get(), 0x2000); smc_init(); diff --git a/src/mame/drivers/gpworld.cpp b/src/mame/drivers/gpworld.cpp index d9d008b31b7..654389e5853 100644 --- a/src/mame/drivers/gpworld.cpp +++ b/src/mame/drivers/gpworld.cpp @@ -100,7 +100,7 @@ private: void mainmem(address_map &map); void mainport(address_map &map); - 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; }; @@ -454,7 +454,7 @@ static INPUT_PORTS_START( gpworld ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END -void gpworld_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void gpworld_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/gunbustr.cpp b/src/mame/drivers/gunbustr.cpp index f6911548736..2f34266348b 100644 --- a/src/mame/drivers/gunbustr.cpp +++ b/src/mame/drivers/gunbustr.cpp @@ -59,7 +59,7 @@ /*********************************************************************/ -void gunbustr_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void gunbustr_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp index fc296c17392..1f2bb71d819 100644 --- a/src/mame/drivers/h19.cpp +++ b/src/mame/drivers/h19.cpp @@ -115,7 +115,7 @@ private: void io_map(address_map &map); void mem_map(address_map &map); - 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 machine_start() override; required_device<palette_device> m_palette; @@ -137,7 +137,7 @@ private: uint16_t translate_mm5740_b(uint16_t b); }; -void h19_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void h19_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/hazeltin.cpp b/src/mame/drivers/hazeltin.cpp index ba0ea2f53c3..79ced7c59d9 100644 --- a/src/mame/drivers/hazeltin.cpp +++ b/src/mame/drivers/hazeltin.cpp @@ -141,7 +141,7 @@ public: private: virtual void machine_start() override; virtual void machine_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; static const device_timer_id TIMER_IOWQ = 0; @@ -253,7 +253,7 @@ void hazl1500_state::machine_reset() m_kbd_status_latch = 0; } -void hazl1500_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hazl1500_state::device_timer(emu_timer &timer, device_timer_id id, int param) { m_cpu_iowq->write(1); m_cpu_ba4->write(1); diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp index c52761058ed..b5df505942d 100644 --- a/src/mame/drivers/hp_ipc.cpp +++ b/src/mame/drivers/hp_ipc.cpp @@ -412,7 +412,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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: uint16_t mem_r(offs_t offset, uint16_t mem_mask); @@ -477,7 +477,7 @@ private: }; -void hp_ipc_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hp_ipc_state::device_timer(emu_timer &timer, device_timer_id id, int param) { m_bus_error = false; } diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp index 0a32a806287..b48687bc24f 100644 --- a/src/mame/drivers/ibmpcjr.cpp +++ b/src/mame/drivers/ibmpcjr.cpp @@ -99,7 +99,7 @@ private: int m_signal_count; uint8_t m_nmi_enabled; - 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_pc_int_delay_timer; emu_timer *m_pcjr_watchdog; emu_timer *m_keyb_signal_timer; @@ -153,7 +153,7 @@ void pcjr_state::machine_reset() m_nmi_enabled = 0x80; } -void pcjr_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pcjr_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/drivers/intv.cpp b/src/mame/drivers/intv.cpp index e5bdab00fcb..89f299b3666 100644 --- a/src/mame/drivers/intv.cpp +++ b/src/mame/drivers/intv.cpp @@ -424,18 +424,18 @@ void intv_state::intvkbd2_mem(address_map &map) map(0xe000, 0xffff).r(FUNC(intv_state::intvkb_iocart_r)); } -void intv_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void intv_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_INTV_INTERRUPT2_COMPLETE: - intv_interrupt2_complete(ptr, param); + intv_interrupt2_complete(param); break; case TIMER_INTV_INTERRUPT_COMPLETE: - intv_interrupt_complete(ptr, param); + intv_interrupt_complete(param); break; case TIMER_INTV_BTB_FILL: - intv_btb_fill(ptr, param); + intv_btb_fill(param); break; default: throw emu_fatalerror("Unknown id in intv_state::device_timer"); diff --git a/src/mame/drivers/iphone2g.cpp b/src/mame/drivers/iphone2g.cpp index 9b2ab7b7441..338a7269376 100644 --- a/src/mame/drivers/iphone2g.cpp +++ b/src/mame/drivers/iphone2g.cpp @@ -31,7 +31,7 @@ protected: virtual void device_resolve_objects() 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 space_config_vector memory_space_config() const override; @@ -49,7 +49,7 @@ private: DECLARE_DEVICE_TYPE(IPHONE2G_SPI, iphone2g_spi_device) -void iphone2g_spi_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void iphone2g_spi_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_out_irq_func(1); } @@ -138,7 +138,7 @@ protected: virtual void device_resolve_objects() 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 space_config_vector memory_space_config() const override; @@ -161,7 +161,7 @@ private: DECLARE_DEVICE_TYPE(IPHONE2G_TIMER, iphone2g_timer_device) -void iphone2g_timer_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void iphone2g_timer_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_out_irq_func(1); } diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp index 72fd6292d5c..49311dd1233 100644 --- a/src/mame/drivers/itech8.cpp +++ b/src/mame/drivers/itech8.cpp @@ -674,21 +674,21 @@ void grmatch_state::machine_reset() m_palette_timer->adjust(m_screen->time_until_pos(m_screen->vpos()+1)); } -void itech8_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void itech8_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_IRQ_OFF: - irq_off(ptr, param); + irq_off(param); break; case TIMER_BEHIND_BEAM_UPDATE: - behind_the_beam_update(ptr, param); + behind_the_beam_update(param); break; case TIMER_BLITTER_DONE: - blitter_done(ptr, param); + blitter_done(param); break; case TIMER_DELAYED_Z80_CONTROL: - delayed_z80_control_w(ptr, param); + delayed_z80_control_w(param); break; default: throw emu_fatalerror("Unknown id in itech8_state::device_timer"); diff --git a/src/mame/drivers/laserbat.cpp b/src/mame/drivers/laserbat.cpp index 833ff5806b0..f8057fcb8da 100644 --- a/src/mame/drivers/laserbat.cpp +++ b/src/mame/drivers/laserbat.cpp @@ -459,12 +459,12 @@ void laserbat_state::machine_start() save_item(NAME(m_keys)); } -void laserbat_state_base::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void laserbat_state_base::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_SCANLINE: - video_line(ptr, param); + video_line(param); break; default: throw emu_fatalerror("Unknown id in laserbat_state_base::device_timer"); diff --git a/src/mame/drivers/ldplayer.cpp b/src/mame/drivers/ldplayer.cpp index 9afb99f9332..9c60fe06453 100644 --- a/src/mame/drivers/ldplayer.cpp +++ b/src/mame/drivers/ldplayer.cpp @@ -42,7 +42,7 @@ public: protected: // device overrides - 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 machine_start() override; virtual void machine_reset() override; @@ -113,7 +113,7 @@ public: void pr8210(machine_config &config); protected: // device overrides - 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 machine_start() override; virtual void machine_reset() override; @@ -294,7 +294,7 @@ void ldplayer_state::process_commands() } -void ldplayer_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ldplayer_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -351,7 +351,7 @@ void pr8210_state::add_command(uint8_t command) } -void pr8210_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pr8210_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -391,7 +391,7 @@ void pr8210_state::device_timer(emu_timer &timer, device_timer_id id, int param, // others to the parent class default: - ldplayer_state::device_timer(timer, id, param, ptr); + ldplayer_state::device_timer(timer, id, param); break; } } diff --git a/src/mame/drivers/m68705prg.cpp b/src/mame/drivers/m68705prg.cpp index 5bb9359813c..a7a5df71bf3 100644 --- a/src/mame/drivers/m68705prg.cpp +++ b/src/mame/drivers/m68705prg.cpp @@ -191,15 +191,15 @@ protected: m_mcu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } - 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 { switch (id) { case TIMER_INPUT_POLL: - input_poll_callback(ptr, param); + input_poll_callback(param); break; default: - driver_device::device_timer(timer, id, param, ptr); + driver_device::device_timer(timer, id, param); } } diff --git a/src/mame/drivers/mdisk.cpp b/src/mame/drivers/mdisk.cpp index cfda2eb1090..067457d713e 100644 --- a/src/mame/drivers/mdisk.cpp +++ b/src/mame/drivers/mdisk.cpp @@ -130,7 +130,7 @@ void mdisk_state::fdc_side_w(uint8_t data) void mdisk_state::machine_start() { // timer to switch rom to ram - m_rom_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(mdisk_state::rom_timer_callback), this), nullptr); + m_rom_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(mdisk_state::rom_timer_callback), this)); // register for save states save_item(NAME(m_uart1_rxrdy)); diff --git a/src/mame/drivers/megadriv.cpp b/src/mame/drivers/megadriv.cpp index c5e7dd0aee3..6bdb5332d8b 100644 --- a/src/mame/drivers/megadriv.cpp +++ b/src/mame/drivers/megadriv.cpp @@ -287,7 +287,7 @@ void md_cons_state::machine_start() // setup timers for 6 button pads for (int i = 0; i < 3; i++) - m_io_timeout[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(md_base_state::io_timeout_timer_callback),this), (void*)(uintptr_t)i); + m_io_timeout[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(md_base_state::io_timeout_timer_callback),this)); m_vdp->stop_timers(); diff --git a/src/mame/drivers/megadriv_acbl.cpp b/src/mame/drivers/megadriv_acbl.cpp index 8583408f97e..5c0250dd0b5 100644 --- a/src/mame/drivers/megadriv_acbl.cpp +++ b/src/mame/drivers/megadriv_acbl.cpp @@ -1084,7 +1084,7 @@ void md_boot_6button_state::machine_start() // Setup timers for 6 button pads for (int i = 0; i < 3; i++) - m_io_timeout[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(md_base_state::io_timeout_timer_callback),this), (void*)(uintptr_t)i); + m_io_timeout[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(md_base_state::io_timeout_timer_callback),this)); } void md_boot_6button_state::megadrvb_6b(machine_config &config) diff --git a/src/mame/drivers/megadriv_rad.cpp b/src/mame/drivers/megadriv_rad.cpp index 6d56d1812c1..0ef0949cdbc 100644 --- a/src/mame/drivers/megadriv_rad.cpp +++ b/src/mame/drivers/megadriv_rad.cpp @@ -363,7 +363,7 @@ void megadriv_radica_6button_state::machine_start() // setup timers for 6 button pads for (int i = 0; i < 3; i++) - m_io_timeout[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(md_base_state::io_timeout_timer_callback),this), (void*)(uintptr_t)i); + m_io_timeout[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(md_base_state::io_timeout_timer_callback),this)); save_item(NAME(m_bank)); } @@ -395,7 +395,7 @@ void megadriv_ra145_state::machine_start() // setup timers for 6 button pads for (int i = 0; i < 3; i++) - m_io_timeout[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(md_base_state::io_timeout_timer_callback),this), (void*)(uintptr_t)i); + m_io_timeout[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(md_base_state::io_timeout_timer_callback),this)); m_a1630a = 0; save_item(NAME(m_a1630a)); diff --git a/src/mame/drivers/mekd1.cpp b/src/mame/drivers/mekd1.cpp index bd5e09a041b..9bdb9604e9d 100644 --- a/src/mame/drivers/mekd1.cpp +++ b/src/mame/drivers/mekd1.cpp @@ -150,7 +150,7 @@ private: DECLARE_WRITE_LINE_MEMBER(write_f11_clock); DECLARE_WRITE_LINE_MEMBER(write_f13_clock); - 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_bit_rate_timer; emu_timer *m_bit_rate_half_timer; @@ -277,7 +277,7 @@ WRITE_LINE_MEMBER(mekd1_state::pia0_cb2_w) // This is a tape reader control line. } -void mekd1_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mekd1_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/mekd5.cpp b/src/mame/drivers/mekd5.cpp index dbea468ce45..5e80af3d563 100644 --- a/src/mame/drivers/mekd5.cpp +++ b/src/mame/drivers/mekd5.cpp @@ -139,7 +139,7 @@ private: bool keypad_key_pressed(); - 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; uint8_t m_segment; uint8_t m_digit; virtual void machine_start() override; @@ -240,7 +240,7 @@ INPUT_PORTS_END ************************************************************/ -void mekd5_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mekd5_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index c09951cd743..8cdbbb48816 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -128,7 +128,7 @@ void metro_state::cpu_space_map(address_map &map) } -void metro_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void metro_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/mgolf.cpp b/src/mame/drivers/mgolf.cpp index 1bb5ab14d7c..d8a2d4cc6d9 100644 --- a/src/mame/drivers/mgolf.cpp +++ b/src/mame/drivers/mgolf.cpp @@ -52,7 +52,7 @@ private: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_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; void cpu_map(address_map &map); /* devices */ @@ -146,12 +146,12 @@ void mgolf_state::update_plunger( ) } -void mgolf_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mgolf_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_INTERRUPT: - interrupt_callback(ptr, param); + interrupt_callback(param); break; default: throw emu_fatalerror("Unknown id in mgolf_state::device_timer"); diff --git a/src/mame/drivers/mjsister.cpp b/src/mame/drivers/mjsister.cpp index 2176fc5c144..d69d9a19e7e 100644 --- a/src/mame/drivers/mjsister.cpp +++ b/src/mame/drivers/mjsister.cpp @@ -41,7 +41,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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 @@ -160,12 +160,12 @@ MC6845_UPDATE_ROW( mjsister_state::crtc_update_row ) * *************************************/ -void mjsister_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mjsister_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { case TIMER_DAC: - dac_callback(ptr, param); + dac_callback(param); break; default: throw emu_fatalerror("Unknown id in mjsister_state::device_timer"); diff --git a/src/mame/drivers/mlanding.cpp b/src/mame/drivers/mlanding.cpp index 533022851e6..1ed2502a22a 100644 --- a/src/mame/drivers/mlanding.cpp +++ b/src/mame/drivers/mlanding.cpp @@ -103,7 +103,7 @@ protected: virtual void machine_start() override; virtual void machine_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 @@ -424,7 +424,7 @@ u32 mlanding_state::exec_dma() } -void mlanding_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mlanding_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp index 2fbf1e2b21e..57b9d8bfcda 100644 --- a/src/mame/drivers/model2.cpp +++ b/src/mame/drivers/model2.cpp @@ -135,15 +135,15 @@ void model2_state::timers_w(offs_t offset, u32 data, u32 mem_mask) m_timerrun[offset] = 1; } +template <int TNum> TIMER_DEVICE_CALLBACK_MEMBER(model2_state::model2_timer_cb) { - int tnum = (int)(uintptr_t)ptr; - int bit = tnum + 2; + int bit = TNum + 2; - if(m_timerrun[tnum] == 0) + if(m_timerrun[TNum] == 0) return; - m_timers[tnum]->reset(); + m_timers[TNum]->reset(); m_intreq |= (1<<bit); if(m_intena & 1<<bit) @@ -151,8 +151,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(model2_state::model2_timer_cb) //printf("%08x %08x (%08x)\n",m_intreq,m_intena,1<<bit); model2_check_irq_state(); - m_timervals[tnum] = 0xfffff; - m_timerrun[tnum] = 0; + m_timervals[TNum] = 0xfffff; + m_timerrun[TNum] = 0; } void model2_state::machine_start() @@ -2459,17 +2459,13 @@ void model2_state::scsp_irq(offs_t offset, u8 data) void model2_state::model2_timers(machine_config &config) { timer_device &timer0(TIMER(config, "timer0")); - timer0.configure_generic(FUNC(model2_state::model2_timer_cb)); - timer0.set_ptr((void *)(uintptr_t)0); + timer0.configure_generic(FUNC(model2_state::model2_timer_cb<0>)); timer_device &timer1(TIMER(config, "timer1")); - timer1.configure_generic(FUNC(model2_state::model2_timer_cb)); - timer1.set_ptr((void *)(uintptr_t)1); + timer1.configure_generic(FUNC(model2_state::model2_timer_cb<1>)); timer_device &timer2(TIMER(config, "timer2")); - timer2.configure_generic(FUNC(model2_state::model2_timer_cb)); - timer2.set_ptr((void *)(uintptr_t)2); + timer2.configure_generic(FUNC(model2_state::model2_timer_cb<2>)); timer_device &timer3(TIMER(config, "timer3")); - timer3.configure_generic(FUNC(model2_state::model2_timer_cb)); - timer3.set_ptr((void *)(uintptr_t)3); + timer3.configure_generic(FUNC(model2_state::model2_timer_cb<3>)); } void model2_state::model2_screen(machine_config &config) diff --git a/src/mame/drivers/myb3k.cpp b/src/mame/drivers/myb3k.cpp index 482f354533a..968d8f079a1 100644 --- a/src/mame/drivers/myb3k.cpp +++ b/src/mame/drivers/myb3k.cpp @@ -209,7 +209,7 @@ private: { TIMER_ID_KEY_INTERRUPT }; - 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; /* Status bits */ enum @@ -281,7 +281,7 @@ void myb3k_state::kbd_set_data_and_interrupt(u8 data) { timer_set(attotime::from_msec(1), TIMER_ID_KEY_INTERRUPT); } -void myb3k_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void myb3k_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/namcona1.cpp b/src/mame/drivers/namcona1.cpp index adab767cbab..85d58445d4d 100644 --- a/src/mame/drivers/namcona1.cpp +++ b/src/mame/drivers/namcona1.cpp @@ -1013,7 +1013,7 @@ void namcona1_state::scanline_interrupt(int scanline) } } -void namcona1_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void namcona1_state::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_SCANLINE) { diff --git a/src/mame/drivers/nds.cpp b/src/mame/drivers/nds.cpp index da6acaaa177..0e7086c74a5 100644 --- a/src/mame/drivers/nds.cpp +++ b/src/mame/drivers/nds.cpp @@ -810,7 +810,7 @@ void nds_state::dma_exec(int ch) #endif // printf("settng DMA timer %d for %d cycs (tmr %x)\n", ch, cnt, (uint32_t)m_dma_timer[ch]); // m_dma_timer[ch]->adjust(ATTOTIME_IN_CYCLES(0, cnt), ch); - dma_complete(nullptr, ch); + dma_complete(ch); } TIMER_CALLBACK_MEMBER(nds_state::handle_irq) diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp index cb17c4652b4..0cf719a6184 100644 --- a/src/mame/drivers/newbrain.cpp +++ b/src/mame/drivers/newbrain.cpp @@ -777,7 +777,7 @@ void newbrain_state::machine_reset() // device_timer - handler timer events //------------------------------------------------- -void newbrain_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void newbrain_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/news_38xx.cpp b/src/mame/drivers/news_38xx.cpp index d10fe4a1bde..c41ad15c505 100644 --- a/src/mame/drivers/news_38xx.cpp +++ b/src/mame/drivers/news_38xx.cpp @@ -113,7 +113,7 @@ protected: u32 bus_error_r(); void timer_w(u8 data); - void timer(void *ptr, s32 param); + void timer(s32 param); // devices // required_device<r3000a_device> m_cpu; @@ -297,7 +297,7 @@ void news_38xx_state::timer_w(u8 data) m_iop->set_input_line(INPUT_LINE_IRQ6, CLEAR_LINE); } -void news_38xx_state::timer(void *ptr, s32 param) +void news_38xx_state::timer(s32 param) { if (param) m_iop->set_input_line(INPUT_LINE_IRQ6, ASSERT_LINE); diff --git a/src/mame/drivers/news_68k.cpp b/src/mame/drivers/news_68k.cpp index e5629c29186..e7da0b70e6d 100644 --- a/src/mame/drivers/news_68k.cpp +++ b/src/mame/drivers/news_68k.cpp @@ -106,7 +106,7 @@ protected: template <irq_number Number> void irq_w(int state); void int_check(); - void timer(void *ptr, s32 param); + void timer(s32 param); void timer_w(u8 data); u32 bus_error_r(); @@ -297,7 +297,7 @@ void news_68k_state::timer_w(u8 data) m_cpu->set_input_line(INPUT_LINE_IRQ6, CLEAR_LINE); } -void news_68k_state::timer(void *ptr, s32 param) +void news_68k_state::timer(s32 param) { m_cpu->set_input_line(INPUT_LINE_IRQ6, ASSERT_LINE); } diff --git a/src/mame/drivers/news_r3k.cpp b/src/mame/drivers/news_r3k.cpp index 20bae67c430..6f2d13f0122 100644 --- a/src/mame/drivers/news_r3k.cpp +++ b/src/mame/drivers/news_r3k.cpp @@ -123,7 +123,7 @@ protected: u32 bus_error(); void itimer_w(u8 data); - void itimer(void *ptr, s32 param); + void itimer(s32 param); u8 debug_r() { return m_debug; } void debug_w(u8 data); @@ -360,7 +360,7 @@ void news_r3k_state::itimer_w(u8 data) m_itimer->adjust(attotime::from_ticks(ticks, 800), 0, attotime::from_ticks(ticks, 800)); } -void news_r3k_state::itimer(void *ptr, s32 param) +void news_r3k_state::itimer(s32 param) { irq_w<TIMER>(ASSERT_LINE); } diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp index a9a06161ce6..fe8f6b9066f 100644 --- a/src/mame/drivers/next.cpp +++ b/src/mame/drivers/next.cpp @@ -660,7 +660,7 @@ void next_state::phy_w(offs_t offset, uint32_t data, uint32_t mem_mask) logerror("phy_w %d %08x (%08x)\n", offset, phy[offset], maincpu->pc()); } -void next_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void next_state::device_timer(emu_timer &timer, device_timer_id id, int param) { irq_set(29, true); timer_data = timer_next_data; diff --git a/src/mame/drivers/nexus3d.cpp b/src/mame/drivers/nexus3d.cpp index 81c218bb886..c93ef70cd4b 100644 --- a/src/mame/drivers/nexus3d.cpp +++ b/src/mame/drivers/nexus3d.cpp @@ -290,7 +290,7 @@ INPUT_PORTS_END void nexus3d_state::machine_start() { - m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(nexus3d_state::timercb),this), 0); + m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(nexus3d_state::timercb),this)); } diff --git a/src/mame/drivers/nightmare.cpp b/src/mame/drivers/nightmare.cpp index 5dda8921429..2435048f900 100644 --- a/src/mame/drivers/nightmare.cpp +++ b/src/mame/drivers/nightmare.cpp @@ -249,7 +249,7 @@ protected: void nightmare_sound_io_map(address_map &map); uint32_t screen_update_nightmare(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - 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 machine_start() override; virtual void machine_reset() override; @@ -263,7 +263,7 @@ protected: int m_reset; }; -void nightmare_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nightmare_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp index 68598ce5146..e5356d7340d 100644 --- a/src/mame/drivers/notetaker.cpp +++ b/src/mame/drivers/notetaker.cpp @@ -243,15 +243,15 @@ private: void ep_io(address_map &map); void ep_mem(address_map &map); - 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 notetaker_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void notetaker_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_FIFOCLK: - timer_fifoclk(ptr, param); + timer_fifoclk(param); break; default: throw emu_fatalerror("Unknown id in notetaker_state::device_timer"); diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp index 81d6de79a4c..5b7edb0bf2f 100644 --- a/src/mame/drivers/octopus.cpp +++ b/src/mame/drivers/octopus.cpp @@ -233,7 +233,7 @@ private: void octopus_sub_mem(address_map &map); void octopus_vram(address_map &map); - 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; required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; @@ -369,7 +369,7 @@ static INPUT_PORTS_START( octopus ) PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) INPUT_PORTS_END -void octopus_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void octopus_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/drivers/olyboss.cpp b/src/mame/drivers/olyboss.cpp index d715c8931b7..9cb0e724cd4 100644 --- a/src/mame/drivers/olyboss.cpp +++ b/src/mame/drivers/olyboss.cpp @@ -84,7 +84,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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: u8 keyboard_read(); @@ -149,7 +149,7 @@ void olyboss_state::machine_reset() m_timer->adjust(attotime::from_hz(30), 0, attotime::from_hz(30)); // unknown timer freq, possibly com2651 BRCLK } -void olyboss_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void olyboss_state::device_timer(emu_timer &timer, device_timer_id id, int param) { m_timstate = !m_timstate; if(m_pic) diff --git a/src/mame/drivers/olytext.cpp b/src/mame/drivers/olytext.cpp index ebcb69b614d..d22c9706e20 100644 --- a/src/mame/drivers/olytext.cpp +++ b/src/mame/drivers/olytext.cpp @@ -51,7 +51,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp index 45c04850f61..d27d80ab357 100644 --- a/src/mame/drivers/parodius.cpp +++ b/src/mame/drivers/parodius.cpp @@ -66,7 +66,7 @@ void parodius_state::sound_nmi_callback( int param ) } #endif -void parodius_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void parodius_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp index 9c5f86d943d..bd36671052e 100644 --- a/src/mame/drivers/pc88va.cpp +++ b/src/mame/drivers/pc88va.cpp @@ -374,24 +374,24 @@ uint32_t pc88va_state::screen_update_pc88va(screen_device &screen, bitmap_rgb32 return 0; } -void pc88va_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pc88va_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_PC8801FD_UPD765_TC_TO_ZERO: - pc8801fd_upd765_tc_to_zero(ptr, param); + pc8801fd_upd765_tc_to_zero(param); break; case TIMER_T3_MOUSE_CALLBACK: - t3_mouse_callback(ptr, param); + t3_mouse_callback(param); break; case TIMER_PC88VA_FDC_TIMER: - pc88va_fdc_timer(ptr, param); + pc88va_fdc_timer(param); break; case TIMER_PC88VA_FDC_MOTOR_START_0: - pc88va_fdc_motor_start_0(ptr, param); + pc88va_fdc_motor_start_0(param); break; case TIMER_PC88VA_FDC_MOTOR_START_1: - pc88va_fdc_motor_start_1(ptr, param); + pc88va_fdc_motor_start_1(param); break; default: throw emu_fatalerror("Unknown id in pc88va_state::device_timer"); diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index 7a3b798aa95..eccc464a64e 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -946,7 +946,7 @@ template <unsigned port> u8 pc9801vm_state::fdc_2hd_2dd_ctrl_r() return res; } -void pc9801vm_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pc9801vm_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/pcfx.cpp b/src/mame/drivers/pcfx.cpp index 6d0caeb387f..eb829b1dbaf 100644 --- a/src/mame/drivers/pcfx.cpp +++ b/src/mame/drivers/pcfx.cpp @@ -35,7 +35,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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 @@ -141,12 +141,12 @@ uint16_t pcfx_state::pad_r(offs_t offset) return res; } -void pcfx_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pcfx_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_PAD_FUNC: - pad_func(ptr, param); + pad_func(param); break; default: throw emu_fatalerror("Unknown id in pcfx_state::device_timer"); diff --git a/src/mame/drivers/pcxt.cpp b/src/mame/drivers/pcxt.cpp index 1a02af6f5d9..55be7372fdd 100644 --- a/src/mame/drivers/pcxt.cpp +++ b/src/mame/drivers/pcxt.cpp @@ -83,7 +83,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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: int m_lastvalue; @@ -509,7 +509,7 @@ static INPUT_PORTS_START( tetriskr ) PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -void pcxt_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pcxt_state::device_timer(emu_timer &timer, device_timer_id id, int param) { m_cvsd->digit_w(BIT(m_samples->as_u8(m_vaddr), m_bit)); m_cvsd->clock_w(1); diff --git a/src/mame/drivers/pentagon.cpp b/src/mame/drivers/pentagon.cpp index 20cc5666c12..e6ec41cd886 100644 --- a/src/mame/drivers/pentagon.cpp +++ b/src/mame/drivers/pentagon.cpp @@ -34,7 +34,7 @@ public: protected: virtual void machine_reset() override; virtual void video_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: enum @@ -130,15 +130,15 @@ void pentagon_state::pentagon_scr2_w(offs_t offset, uint8_t data) *((uint8_t*)m_bank4->base() + offset) = data; } -void pentagon_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pentagon_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_IRQ_ON: - irq_on(ptr, param); + irq_on(param); break; case TIMER_IRQ_OFF: - irq_off(ptr, param); + irq_off(param); break; default: throw emu_fatalerror("Unknown id in pentagon_state::device_timer"); diff --git a/src/mame/drivers/pokemini.cpp b/src/mame/drivers/pokemini.cpp index 895b92ca1d9..a8dec9f3038 100644 --- a/src/mame/drivers/pokemini.cpp +++ b/src/mame/drivers/pokemini.cpp @@ -51,7 +51,7 @@ protected: TIMER_PRC }; - 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 video_start() override; virtual void machine_start() override; @@ -1696,7 +1696,7 @@ void pokemini_state::machine_start() } -void pokemini_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pokemini_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/popper.cpp b/src/mame/drivers/popper.cpp index 2df587d50d6..b1f44889f48 100644 --- a/src/mame/drivers/popper.cpp +++ b/src/mame/drivers/popper.cpp @@ -76,7 +76,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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<z80_device> m_maincpu; @@ -291,7 +291,7 @@ void popper_state::popper_palette(palette_device &palette) const // VIDEO EMULATION //************************************************************************** -void popper_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void popper_state::device_timer(emu_timer &timer, device_timer_id id, int param) { int y = m_screen->vpos(); diff --git a/src/mame/drivers/positron.cpp b/src/mame/drivers/positron.cpp index 78535d35fab..92e9c5ef7fd 100644 --- a/src/mame/drivers/positron.cpp +++ b/src/mame/drivers/positron.cpp @@ -72,7 +72,7 @@ private: virtual void machine_reset() override; virtual void machine_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; // disassembly override offs_t os9_dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms); @@ -179,7 +179,7 @@ void positron_state::machine_reset() } -void positron_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void positron_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/prof80.cpp b/src/mame/drivers/prof80.cpp index bbc7d3d3aea..9a8d531226a 100644 --- a/src/mame/drivers/prof80.cpp +++ b/src/mame/drivers/prof80.cpp @@ -404,7 +404,7 @@ static void prof80_floppies(device_slot_interface &device) // device_timer - handler timer events //------------------------------------------------- -void prof80_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void prof80_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/psion5.cpp b/src/mame/drivers/psion5.cpp index 60e4caab063..66f579fd57e 100644 --- a/src/mame/drivers/psion5.cpp +++ b/src/mame/drivers/psion5.cpp @@ -127,7 +127,7 @@ void psion5mx_state::check_interrupts() m_maincpu->set_input_line(ARM7_IRQ_LINE, m_pending_ints & m_int_mask & IRQ_IRQ_MASK ? ASSERT_LINE : CLEAR_LINE); } -void psion5mx_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void psion5mx_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/ptcsol.cpp b/src/mame/drivers/ptcsol.cpp index 5ff8af1b042..803c734cda2 100644 --- a/src/mame/drivers/ptcsol.cpp +++ b/src/mame/drivers/ptcsol.cpp @@ -195,7 +195,7 @@ private: void io_map(address_map &map); void mem_map(address_map &map); - 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 machine_reset() override; virtual void machine_start() override; u8 m_sol20_fa = 0U; @@ -240,12 +240,12 @@ cassette_image_device *sol20_state::cassette_device_image() } -void sol20_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sol20_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_SOL20_CASSETTE_TC: - sol20_cassette_tc(ptr, param); + sol20_cassette_tc(param); break; default: throw emu_fatalerror("Unknown id in sol20_state::device_timer"); diff --git a/src/mame/drivers/pwrview.cpp b/src/mame/drivers/pwrview.cpp index fe1830656fe..604f2336bb9 100644 --- a/src/mame/drivers/pwrview.cpp +++ b/src/mame/drivers/pwrview.cpp @@ -67,7 +67,7 @@ private: 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; required_device<i80186_cpu_device> m_maincpu; required_device<pit8253_device> m_pit; @@ -110,7 +110,7 @@ void pwrview_state::device_reset() m_tmrkbd->adjust(attotime::from_hz(9600*16), 0, attotime::from_hz(9600*16)); // kbd baud is guess } -void pwrview_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pwrview_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp index 6a9f3c76298..695a43681f3 100644 --- a/src/mame/drivers/rabbit.cpp +++ b/src/mame/drivers/rabbit.cpp @@ -135,7 +135,7 @@ private: void rabbit_map(address_map &map); virtual void video_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; required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; @@ -570,7 +570,7 @@ void rabbit_state::rombank_w(uint32_t data) #define BLITCMDLOG 0 #define BLITLOG 0 -void rabbit_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void rabbit_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index 8f8800e4236..ebe370d969d 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -508,7 +508,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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 rainbow8088_base_map(address_map &map); void rainbow8088_base_io(address_map &map); @@ -1280,7 +1280,7 @@ void rainbow_modelb_state::machine_reset() } // Simulate AC_OK signal (power good) and RESET after ~ 108 ms. -void rainbow_base_state::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void rainbow_base_state::device_timer(emu_timer &timer, device_timer_id tid, int param) { switch (tid) { diff --git a/src/mame/drivers/rollerg.cpp b/src/mame/drivers/rollerg.cpp index fac7639efcc..7ee72145885 100644 --- a/src/mame/drivers/rollerg.cpp +++ b/src/mame/drivers/rollerg.cpp @@ -54,7 +54,7 @@ void rollerg_state::soundirq_w(uint8_t data) m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80 } -void rollerg_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void rollerg_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/rtpc.cpp b/src/mame/drivers/rtpc.cpp index 17ef1ebdd66..4d04c90107f 100644 --- a/src/mame/drivers/rtpc.cpp +++ b/src/mame/drivers/rtpc.cpp @@ -165,7 +165,7 @@ protected: void crrb_w(u8 data); void dia_w(u8 data); - void mcu_timer(timer_device &timer, void *ptr, s32 param) + void mcu_timer(timer_device &timer, s32 param) { m_mcu_p3 ^= 0x10; m_mcu->set_input_line(MCS51_T0_LINE, BIT(m_mcu_p3, 4)); diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp index ad320720555..d959014c361 100644 --- a/src/mame/drivers/s11.cpp +++ b/src/mame/drivers/s11.cpp @@ -150,7 +150,7 @@ static INPUT_PORTS_START( s11 ) PORT_CONFSETTING( 0x10, "English" ) INPUT_PORTS_END -void s11_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void s11_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp index e5c096680a8..b32e96f5ac2 100644 --- a/src/mame/drivers/s6.cpp +++ b/src/mame/drivers/s6.cpp @@ -91,7 +91,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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: void dig0_w(u8 data); @@ -432,7 +432,7 @@ void s6_state::machine_reset() m_io_outputs[i] = 0; } -void s6_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void s6_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp index be570224b9e..42e573c0e7b 100644 --- a/src/mame/drivers/s6a.cpp +++ b/src/mame/drivers/s6a.cpp @@ -79,7 +79,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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: u8 sound_r(); @@ -357,7 +357,7 @@ void s6a_state::machine_reset() m_io_outputs[i] = 0; } -void s6a_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void s6a_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp index 88ea6010ba7..fb42e00dfca 100644 --- a/src/mame/drivers/s7.cpp +++ b/src/mame/drivers/s7.cpp @@ -106,7 +106,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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: void dig0_w(u8 data); @@ -618,7 +618,7 @@ WRITE_LINE_MEMBER( s7_state::pia_irq ) } } -void s7_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void s7_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp index 2d1b46f4edf..b27a9e3c076 100644 --- a/src/mame/drivers/s8.cpp +++ b/src/mame/drivers/s8.cpp @@ -98,7 +98,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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: u8 sound_r(); @@ -317,7 +317,7 @@ WRITE_LINE_MEMBER( s8_state::pia_irq ) } } -void s8_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void s8_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp index 4695344d5be..b26f34f465f 100644 --- a/src/mame/drivers/s8a.cpp +++ b/src/mame/drivers/s8a.cpp @@ -64,7 +64,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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: void dig0_w(u8 data); @@ -234,7 +234,7 @@ WRITE_LINE_MEMBER( s8a_state::pia_irq ) } } -void s8a_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void s8a_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp index 6881099da31..63065eceff8 100644 --- a/src/mame/drivers/s9.cpp +++ b/src/mame/drivers/s9.cpp @@ -78,7 +78,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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: void dig0_w(u8 data); @@ -308,7 +308,7 @@ WRITE_LINE_MEMBER( s9_state::pia_irq ) } } -void s9_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void s9_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp index 74f2e9ee9d4..faa9a5d639c 100644 --- a/src/mame/drivers/samcoupe.cpp +++ b/src/mame/drivers/samcoupe.cpp @@ -88,7 +88,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_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: required_device<cpu_device> m_maincpu; @@ -510,15 +510,15 @@ TIMER_CALLBACK_MEMBER(samcoupe_state::sam_video_update_callback) // MACHINE EMULATION //************************************************************************** -void samcoupe_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void samcoupe_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_IRQ_OFF: - irq_off(ptr, param); + irq_off(param); break; case TIMER_VIDEO_UPDATE: - sam_video_update_callback(ptr, param); + sam_video_update_callback(param); break; default: throw emu_fatalerror("Unknown id in samcoupe_state::device_timer"); diff --git a/src/mame/drivers/scv.cpp b/src/mame/drivers/scv.cpp index 54d5e9cc4af..4d00ebf8da0 100644 --- a/src/mame/drivers/scv.cpp +++ b/src/mame/drivers/scv.cpp @@ -38,7 +38,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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: void porta_w(uint8_t data); @@ -265,7 +265,7 @@ void scv_state::scv_palette(palette_device &palette) const } -void scv_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void scv_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp index 1d6599d0300..17896479296 100644 --- a/src/mame/drivers/segahang.cpp +++ b/src/mame/drivers/segahang.cpp @@ -319,7 +319,7 @@ void segahang_state::machine_reset() // device_timer - handle device timers //------------------------------------------------- -void segahang_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void segahang_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp index 44790c6739d..13f1b77ed51 100644 --- a/src/mame/drivers/segaorun.cpp +++ b/src/mame/drivers/segaorun.cpp @@ -553,7 +553,7 @@ void segaorun_state::machine_reset() // device_timer - handle device timers //------------------------------------------------- -void segaorun_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void segaorun_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp index e1b00d96672..62c13911ec9 100644 --- a/src/mame/drivers/segas16a.cpp +++ b/src/mame/drivers/segas16a.cpp @@ -626,7 +626,7 @@ void segas16a_state::machine_reset() // device_timer - handle device timers //------------------------------------------------- -void segas16a_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void segas16a_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index a8d5ea9558f..d0a10852800 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -1302,7 +1302,7 @@ void segas16b_state::machine_reset() // device_timer - handle device timers //------------------------------------------------- -void segas16b_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void segas16b_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp index e4336241a63..295f5931122 100644 --- a/src/mame/drivers/segas18.cpp +++ b/src/mame/drivers/segas18.cpp @@ -153,7 +153,7 @@ void segas18_state::init_generic(segas18_rom_board rom_board) * *************************************/ -void segas18_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void segas18_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index eb0f2c48b9a..aaf803ca4b8 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -597,7 +597,7 @@ void segaxbd_state::smgp_excs_w(offs_t offset, uint16_t data, uint16_t mem_mask) // device_timer - handle device timers //------------------------------------------------- -void segaxbd_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void segaxbd_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp index 06d9a48e61b..1826f285477 100644 --- a/src/mame/drivers/segaybd.cpp +++ b/src/mame/drivers/segaybd.cpp @@ -171,7 +171,7 @@ void segaybd_state::machine_reset() // device_timer - handle device timers //------------------------------------------------- -void segaybd_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void segaybd_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp index de470e9425e..7715bfba2a4 100644 --- a/src/mame/drivers/seta2.cpp +++ b/src/mame/drivers/seta2.cpp @@ -690,7 +690,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 void tra_complete() override; virtual void tra_callback() override; @@ -755,7 +755,7 @@ void funcube_touchscreen_device::device_reset() m_tx_cb(1); } -void funcube_touchscreen_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void funcube_touchscreen_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(!id) { uint8_t button_state = m_btn->read(); diff --git a/src/mame/drivers/simpsons.cpp b/src/mame/drivers/simpsons.cpp index c0f7e7aadb3..ed1bbd21738 100644 --- a/src/mame/drivers/simpsons.cpp +++ b/src/mame/drivers/simpsons.cpp @@ -149,7 +149,7 @@ void simpsons_state::z80_bankswitch_w(uint8_t data) } -void simpsons_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void simpsons_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/sitcom.cpp b/src/mame/drivers/sitcom.cpp index be152e87490..2fb6e85e692 100644 --- a/src/mame/drivers/sitcom.cpp +++ b/src/mame/drivers/sitcom.cpp @@ -126,7 +126,7 @@ protected: virtual void update_ppi_pa(uint8_t data) override; virtual void update_ppi_pb(uint8_t data) 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 machine_start() override; virtual void machine_reset() override; @@ -302,7 +302,7 @@ INPUT_CHANGED_MEMBER( sitcom_timer_state::update_speed ) } } -void sitcom_timer_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sitcom_timer_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -310,7 +310,7 @@ void sitcom_timer_state::device_timer(emu_timer &timer, device_timer_id id, int m_shutter = false; break; default: - sitcom_state::device_timer(timer, id, param, ptr); + sitcom_state::device_timer(timer, id, param); } } diff --git a/src/mame/drivers/slapshot.cpp b/src/mame/drivers/slapshot.cpp index 6bd98ed409a..3bf2b166275 100644 --- a/src/mame/drivers/slapshot.cpp +++ b/src/mame/drivers/slapshot.cpp @@ -147,7 +147,7 @@ Region byte at offset 0x031: INTERRUPTS ***********************************************************/ -void slapshot_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void slapshot_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/socrates.cpp b/src/mame/drivers/socrates.cpp index b0ae7db0581..519cc22d5b2 100644 --- a/src/mame/drivers/socrates.cpp +++ b/src/mame/drivers/socrates.cpp @@ -214,7 +214,7 @@ protected: void socrates_io(address_map &map); void socrates_mem(address_map &map); - 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; }; @@ -386,18 +386,18 @@ void socrates_state::machine_reset() m_speech_load_settings_count = 0; } -void socrates_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void socrates_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_KBMCU_SIM: - kbmcu_sim_cb(ptr, param); + kbmcu_sim_cb(param); break; case TIMER_CLEAR_SPEECH: - clear_speech_cb(ptr, param); + clear_speech_cb(param); break; case TIMER_CLEAR_IRQ: - clear_irq_cb(ptr, param); + clear_irq_cb(param); break; default: throw emu_fatalerror("Unknown id in socrates_state::device_timer"); diff --git a/src/mame/drivers/spacefb.cpp b/src/mame/drivers/spacefb.cpp index 073a26ca9fa..938be5ad45c 100644 --- a/src/mame/drivers/spacefb.cpp +++ b/src/mame/drivers/spacefb.cpp @@ -128,12 +128,12 @@ *************************************/ -void spacefb_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void spacefb_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { case TIMER_INTERRUPT: - interrupt_callback(ptr, param); + interrupt_callback(param); break; default: throw emu_fatalerror("Unknown id in spacefb_state::device_timer"); diff --git a/src/mame/drivers/special_gambl.cpp b/src/mame/drivers/special_gambl.cpp index f81628ffdd1..13c4599a39f 100644 --- a/src/mame/drivers/special_gambl.cpp +++ b/src/mame/drivers/special_gambl.cpp @@ -66,7 +66,7 @@ protected: }; void machine_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; void dice_palette(palette_device &palette) const; u32 screen_update_dice(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -122,7 +122,7 @@ static INPUT_PORTS_START(dice) PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_SERVICE3) PORT_NAME("RAM Test") PORT_CHANGED_MEMBER(DEVICE_SELF, dinaris_state, ram_test, 0) INPUT_PORTS_END -void dinaris_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void dinaris_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp index f3a6dde65a3..ae9a91a45ba 100644 --- a/src/mame/drivers/spectrum.cpp +++ b/src/mame/drivers/spectrum.cpp @@ -743,7 +743,7 @@ static GFXDECODE_START( gfx_spectrum ) GFXDECODE_ENTRY( "maincpu", 0x3d00, spectrum_charlayout, 0, 8 ) GFXDECODE_END -void spectrum_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void spectrum_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/spg2xx_vii.cpp b/src/mame/drivers/spg2xx_vii.cpp index 5ab0146d6a3..5693353c94c 100644 --- a/src/mame/drivers/spg2xx_vii.cpp +++ b/src/mame/drivers/spg2xx_vii.cpp @@ -29,7 +29,7 @@ private: virtual void machine_reset() override; static const device_timer_id TIMER_CTRL_POLL = 0; - 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 vii_portb_w(uint16_t data); @@ -48,7 +48,7 @@ private: }; -void vii_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void vii_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/spg2xx_wiwi.cpp b/src/mame/drivers/spg2xx_wiwi.cpp index 0940fc0190c..93fa6986288 100644 --- a/src/mame/drivers/spg2xx_wiwi.cpp +++ b/src/mame/drivers/spg2xx_wiwi.cpp @@ -48,7 +48,7 @@ protected: void machine_start() override; void machine_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 uint16_t porta_r(); virtual void porta_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override; @@ -110,7 +110,7 @@ protected: void machine_start() override; void machine_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 uint16_t porta_r() override; virtual void porta_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override; @@ -121,7 +121,7 @@ private: emu_timer *m_pulse_timer2; }; -void spg2xx_game_marc101_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void spg2xx_game_marc101_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -132,7 +132,7 @@ void spg2xx_game_marc101_state::device_timer(emu_timer &timer, device_timer_id i } } -void spg2xx_game_marc250_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void spg2xx_game_marc250_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/sprint4.cpp b/src/mame/drivers/sprint4.cpp index 71319932808..80ef418d1ae 100644 --- a/src/mame/drivers/sprint4.cpp +++ b/src/mame/drivers/sprint4.cpp @@ -78,7 +78,7 @@ private: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_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; void sprint4_palette(palette_device &palette) const; TILE_GET_INFO_MEMBER(tile_info); @@ -138,12 +138,12 @@ READ_LINE_MEMBER(sprint4_state::collision_flipflop_r) } -void sprint4_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sprint4_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_NMI: - nmi_callback(ptr, param); + nmi_callback(param); break; default: throw emu_fatalerror("Unknown id in sprint4_state::device_timer"); diff --git a/src/mame/drivers/subhuntr.cpp b/src/mame/drivers/subhuntr.cpp index 991b07684c0..af122902cb3 100644 --- a/src/mame/drivers/subhuntr.cpp +++ b/src/mame/drivers/subhuntr.cpp @@ -60,7 +60,7 @@ public: protected: enum { TIMER_VIDEO }; - 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 machine_start() override; virtual void machine_reset() override; @@ -107,12 +107,12 @@ private: ***************************************************************************/ -void subhuntr_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void subhuntr_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_VIDEO: - video_callback(ptr, param); + video_callback(param); break; default: throw emu_fatalerror("Unknown id in subhuntr_state::device_timer"); diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp index 94393031d67..b54fd89a7ff 100644 --- a/src/mame/drivers/sun4.cpp +++ b/src/mame/drivers/sun4.cpp @@ -545,7 +545,7 @@ public: protected: virtual void machine_reset() override; virtual void machine_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; static const device_timer_id TIMER_0 = 0; static const device_timer_id TIMER_1 = 1; @@ -1021,7 +1021,7 @@ WRITE_LINE_MEMBER( sun4_base_state::scc2_int ) m_maincpu->set_input_line(SPARC_IRQ12, ((m_scc1_int || m_scc2_int) && (m_irq_reg & 0x01)) ? ASSERT_LINE : CLEAR_LINE); } -void sun4_base_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sun4_base_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/svision.cpp b/src/mame/drivers/svision.cpp index 7839c59c02d..d4b2dea971c 100644 --- a/src/mame/drivers/svision.cpp +++ b/src/mame/drivers/svision.cpp @@ -52,7 +52,7 @@ TIMER_CALLBACK_MEMBER(svision_state::svision_pet_timer) TIMER_DEVICE_CALLBACK_MEMBER(svision_state::svision_pet_timer_dev) { - svision_pet_timer(ptr,param); + svision_pet_timer(param); } WRITE_LINE_MEMBER(svision_state::sound_irq_w) diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp index 43d51e032ad..2ad7217729c 100644 --- a/src/mame/drivers/swyft.cpp +++ b/src/mame/drivers/swyft.cpp @@ -378,7 +378,7 @@ private: void swyft_mem(address_map &map); - //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); }; diff --git a/src/mame/drivers/symbolics.cpp b/src/mame/drivers/symbolics.cpp index 42471abfb01..e09bbf40e5c 100644 --- a/src/mame/drivers/symbolics.cpp +++ b/src/mame/drivers/symbolics.cpp @@ -111,7 +111,7 @@ private: void m68k_mem(address_map &map); - // 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; }; uint16_t symbolics_state::buserror_r() @@ -281,12 +281,12 @@ INPUT_PORTS_END /****************************************************************************** Machine Drivers ******************************************************************************/ -/*void symbolics_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +/*void symbolics_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_OUTFIFO_READ: - outfifo_read_cb(ptr, param); + outfifo_read_cb(param); break; default: throw emu_fatalerror("Unknown id in symbolics_state::device_timer"); diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp index c990acd541b..b590e7f6126 100644 --- a/src/mame/drivers/taito_f2.cpp +++ b/src/mame/drivers/taito_f2.cpp @@ -528,7 +528,7 @@ driftout 8000 0000/8 0000 0000 The first control changes from 8000 to 0000 ******************************************************************/ -void taitof2_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void taitof2_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp index c9fb676644e..1315d52aa26 100644 --- a/src/mame/drivers/taito_f3.cpp +++ b/src/mame/drivers/taito_f3.cpp @@ -424,7 +424,7 @@ GFXDECODE_END /******************************************************************************/ -void taito_f3_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void taito_f3_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp index b92047991fe..e77955c018f 100644 --- a/src/mame/drivers/taito_z.cpp +++ b/src/mame/drivers/taito_z.cpp @@ -1320,7 +1320,7 @@ void dblaxle_state::dblaxle_cpua_ctrl_w(offs_t offset, u16 data, u16 mem_mask) INTERRUPTS ***********************************************************/ -void sci_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sci_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp index e8c96494dab..31b92084f0b 100644 --- a/src/mame/drivers/tandy2k.cpp +++ b/src/mame/drivers/tandy2k.cpp @@ -961,7 +961,7 @@ void tandy2k_state::device_reset_after_children() m_pc_keyboard->enable(0); } -void tandy2k_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tandy2k_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/techno.cpp b/src/mame/drivers/techno.cpp index 4ff80f55fdf..f6af05fbd3e 100644 --- a/src/mame/drivers/techno.cpp +++ b/src/mame/drivers/techno.cpp @@ -80,7 +80,7 @@ private: void audio_map(address_map &map); void cpu_space_map(address_map &map); - 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 machine_start() override; virtual void machine_reset() override; @@ -314,7 +314,7 @@ static INPUT_PORTS_START( techno ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_BACKSPACE) PORT_NAME("Fix top left target middle") INPUT_PORTS_END -void techno_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void techno_state::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == IRQ_ADVANCE_TIMER) { diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp index ec2bfcd8f34..f254973d3c8 100644 --- a/src/mame/drivers/tehkanwc.cpp +++ b/src/mame/drivers/tehkanwc.cpp @@ -161,7 +161,7 @@ void tehkanwc_state::sound_command_w(uint8_t data) m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -void tehkanwc_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tehkanwc_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/tekigw.cpp b/src/mame/drivers/tekigw.cpp index 8e76dcb6e57..8c63b079572 100644 --- a/src/mame/drivers/tekigw.cpp +++ b/src/mame/drivers/tekigw.cpp @@ -102,7 +102,7 @@ protected: // novram data out handler void nov_do(int state); - void buserror(void *ptr, s32 param); + void buserror(s32 param); required_device<ns32016_device> m_cpu; required_device<ns32081_device> m_fpu; @@ -490,7 +490,7 @@ void tekigw_state_base::nov_do(int state) m_nmr &= ~NOV_NDAT; } -void tekigw_state_base::buserror(void *ptr, s32 param) +void tekigw_state_base::buserror(s32 param) { if (m_scr & SCR_BERRE) { diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp index 77ba8526a6d..734e9378f37 100644 --- a/src/mame/drivers/thayers.cpp +++ b/src/mame/drivers/thayers.cpp @@ -114,14 +114,14 @@ private: void thayers_io_map(address_map &map); void thayers_map(address_map &map); - 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; }; static const uint8_t led_map[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x77, 0x7c, 0x39, 0x5e, 0x79, 0x00 }; /* Interrupts */ -void thayers_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void thayers_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/ti990_4.cpp b/src/mame/drivers/ti990_4.cpp index c5057109f78..08d2bba45bf 100644 --- a/src/mame/drivers/ti990_4.cpp +++ b/src/mame/drivers/ti990_4.cpp @@ -78,7 +78,7 @@ private: void memmap(address_map &map); void hold_load(); - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + void device_timer(emu_timer &timer, device_timer_id id, int param) override; int m_intlines; int m_int_level; emu_timer* m_nmi_timer; @@ -107,7 +107,7 @@ void ti990_4_state::hold_load() /* LOAD interrupt trigger callback */ -void ti990_4_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ti990_4_state::device_timer(emu_timer &timer, device_timer_id id, int param) { m_maincpu->set_input_line(INT_9900_LOAD, CLEAR_LINE); logerror("ti990_4: Released LOAD interrupt\n"); diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp index 5058839ae76..7b3ab550c02 100644 --- a/src/mame/drivers/ti99_4x.cpp +++ b/src/mame/drivers/ti99_4x.cpp @@ -163,7 +163,7 @@ private: // Used by EVPC DECLARE_WRITE_LINE_MEMBER( video_interrupt_evpc_in ); - 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 crumap(address_map &map); void memmap(address_map &map); @@ -723,7 +723,7 @@ WRITE_LINE_MEMBER( ti99_4x_state::gromclk_in ) /* Used by the EVPC */ -void ti99_4x_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ti99_4x_state::device_timer(emu_timer &timer, device_timer_id id, int param) { // Pulse it if (m_datamux != nullptr) diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp index a0ca3cf7f1e..96c3d83672d 100644 --- a/src/mame/drivers/tickee.cpp +++ b/src/mame/drivers/tickee.cpp @@ -102,7 +102,7 @@ private: void rapidfir_map(address_map &map); void tickee_map(address_map &map); - 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; }; @@ -133,18 +133,18 @@ inline void tickee_state::get_crosshair_xy(int player, int &x, int &y) * *************************************/ -void tickee_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tickee_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_TRIGGER_GUN_INTERRUPT: - trigger_gun_interrupt(ptr, param); + trigger_gun_interrupt(param); break; case TIMER_CLEAR_GUN_INTERRUPT: - clear_gun_interrupt(ptr, param); + clear_gun_interrupt(param); break; case TIMER_SETUP_GUN_INTERRUPTS: - setup_gun_interrupts(ptr, param); + setup_gun_interrupts(param); break; default: throw emu_fatalerror("Unknown id in tickee_state::device_timer"); diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp index 5b7d7f59c12..167a83dfa9a 100644 --- a/src/mame/drivers/tm990189.cpp +++ b/src/mame/drivers/tm990189.cpp @@ -496,7 +496,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; required_device<tms9902_device> m_tms9902; }; @@ -514,7 +514,7 @@ void tm990_189_rs232_image_device::device_start() { } -void tm990_189_rs232_image_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tm990_189_rs232_image_device::device_timer(emu_timer &timer, device_timer_id id, int param) { uint8_t buf; if (/*m_rs232_rts &&*/ /*(mame_ftell(m_rs232_fp) < mame_fsize(m_rs232_fp))*/1) diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp index d0ca713e0c2..d8fa8e346c7 100644 --- a/src/mame/drivers/tmc1800.cpp +++ b/src/mame/drivers/tmc1800.cpp @@ -728,7 +728,7 @@ void tmc2000_state::machine_reset() // OSCOM Nano -void nano_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nano_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -927,7 +927,7 @@ ROM_END /* Driver Initialization */ -void tmc1800_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tmc1800_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp index 9b35c6a03bf..a42f0bbfb8c 100644 --- a/src/mame/drivers/tmnt.cpp +++ b/src/mame/drivers/tmnt.cpp @@ -253,7 +253,7 @@ void tmnt_state::sound_nmi_callback( int param ) } #endif -void tmnt_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tmnt_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/trucocl.cpp b/src/mame/drivers/trucocl.cpp index d49474ec615..d4b9471c233 100644 --- a/src/mame/drivers/trucocl.cpp +++ b/src/mame/drivers/trucocl.cpp @@ -50,7 +50,7 @@ void trucocl_state::irq_enable_w(uint8_t data) } -void trucocl_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void trucocl_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp index 3d4ec230bf1..b5c7006874c 100644 --- a/src/mame/drivers/tubep.cpp +++ b/src/mame/drivers/tubep.cpp @@ -235,7 +235,7 @@ void tubep_state::tubep_sound_portmap(address_map &map) } -void tubep_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tubep_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -243,10 +243,10 @@ void tubep_state::device_timer(emu_timer &timer, device_timer_id id, int param, m_mcu->set_input_line(0, ASSERT_LINE); break; case TIMER_TUBEP_SCANLINE: - tubep_scanline_callback(ptr, param); + tubep_scanline_callback(param); break; case TIMER_RJAMMER_SCANLINE: - rjammer_scanline_callback(ptr, param); + rjammer_scanline_callback(param); break; default: throw emu_fatalerror("Unknown id in tubep_state::device_timer"); diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp index da6d7b381cb..2252f1ab6f7 100644 --- a/src/mame/drivers/tugboat.cpp +++ b/src/mame/drivers/tugboat.cpp @@ -57,7 +57,7 @@ protected: virtual void video_start() override; virtual void machine_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<cpu_device> m_maincpu; @@ -212,7 +212,7 @@ void tugboat_state::ctrl_w(uint8_t data) m_ctrl = data; } -void tugboat_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tugboat_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/tv912.cpp b/src/mame/drivers/tv912.cpp index ee6de0a9b73..9d7c50b2148 100644 --- a/src/mame/drivers/tv912.cpp +++ b/src/mame/drivers/tv912.cpp @@ -123,7 +123,7 @@ private: virtual void machine_start() override; virtual void machine_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; required_device<cpu_device> m_maincpu; required_device<tms9927_device> m_crtc; @@ -249,7 +249,7 @@ void tv912_state::output_40c(u8 data) m_dispram_bank->set_entry(BIT(data, 0)); } -void tv912_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tv912_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/tv990.cpp b/src/mame/drivers/tv990.cpp index 86c8d119502..6b7dc4f6d54 100644 --- a/src/mame/drivers/tv990.cpp +++ b/src/mame/drivers/tv990.cpp @@ -78,7 +78,7 @@ private: virtual void machine_reset() override; virtual void machine_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_post_load() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -120,7 +120,7 @@ void tv990_state::machine_start() save_item(NAME(m_height)); } -void tv990_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tv990_state::device_timer(emu_timer &timer, device_timer_id id, int param) { m_rowtimer->adjust(m_screen->time_until_pos(m_screen->vpos() + m_rowh)); m_maincpu->set_input_line(M68K_IRQ_6, ASSERT_LINE); diff --git a/src/mame/drivers/uchroma68.cpp b/src/mame/drivers/uchroma68.cpp index ca7eef4524e..84acf52ff13 100644 --- a/src/mame/drivers/uchroma68.cpp +++ b/src/mame/drivers/uchroma68.cpp @@ -174,7 +174,7 @@ private: virtual void machine_start() override; virtual void machine_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; uint8_t mc6847_videoram_r(offs_t offset); uint8_t pia_pa_r(); @@ -249,7 +249,7 @@ INPUT_PORTS_END ************************************************************/ -void uchroma68_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void uchroma68_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/ultratnk.cpp b/src/mame/drivers/ultratnk.cpp index 86e7adb4e29..da9e350aebb 100644 --- a/src/mame/drivers/ultratnk.cpp +++ b/src/mame/drivers/ultratnk.cpp @@ -48,12 +48,12 @@ READ_LINE_MEMBER(ultratnk_state::joystick_r) } -void ultratnk_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ultratnk_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_NMI: - nmi_callback(ptr, param); + nmi_callback(param); break; default: throw emu_fatalerror("Unknown id in ultratnk_state::device_timer"); diff --git a/src/mame/drivers/unichamp.cpp b/src/mame/drivers/unichamp.cpp index 23823937d90..ad634ee6a0f 100644 --- a/src/mame/drivers/unichamp.cpp +++ b/src/mame/drivers/unichamp.cpp @@ -68,7 +68,7 @@ public: protected: virtual void machine_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: required_device<cp1610_cpu_device> m_maincpu; @@ -138,7 +138,7 @@ static INPUT_PORTS_START( unichamp ) INPUT_PORTS_END -void unichamp_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void unichamp_state::device_timer(emu_timer &timer, device_timer_id id, int param) { //TODO should we add an explicit Reset button in there just like the controller? } diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp index 70474cdc283..4ecb1689a21 100644 --- a/src/mame/drivers/vegas.cpp +++ b/src/mame/drivers/vegas.cpp @@ -301,7 +301,7 @@ namespace { *************************************/ #define LOG_TIMEKEEPER (0) -#define LOG_SIO (0) +#define LOG_SIO (1) /************************************* * diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp index 480eaab77e1..b8bc826ec2f 100644 --- a/src/mame/drivers/vendetta.cpp +++ b/src/mame/drivers/vendetta.cpp @@ -165,7 +165,7 @@ void vendetta_state::_5fe0_w(uint8_t data) m_k053246->k053246_set_objcha_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); } -void vendetta_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void vendetta_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/vidbrain.cpp b/src/mame/drivers/vidbrain.cpp index cb544d36788..f52bb6ff9be 100644 --- a/src/mame/drivers/vidbrain.cpp +++ b/src/mame/drivers/vidbrain.cpp @@ -373,7 +373,7 @@ uint8_t vidbrain_state::memory_read_byte(offs_t offset) // device_timer - handler timer events //------------------------------------------------- -void vidbrain_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void vidbrain_state::device_timer(emu_timer &timer, device_timer_id id, int param) { m_uv->ext_int_w(0); m_smi->ext_int_w(0); diff --git a/src/mame/drivers/videopin.cpp b/src/mame/drivers/videopin.cpp index 5815f98bca3..c937bac16e8 100644 --- a/src/mame/drivers/videopin.cpp +++ b/src/mame/drivers/videopin.cpp @@ -49,12 +49,12 @@ void videopin_state::update_plunger() } -void videopin_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void videopin_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_INTERRUPT: - interrupt_callback(ptr, param); + interrupt_callback(param); break; default: throw emu_fatalerror("Unknown id in videopin_state::device_timer"); diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp index 2af2f9b018c..438f828451f 100644 --- a/src/mame/drivers/vis.cpp +++ b/src/mame/drivers/vis.cpp @@ -25,7 +25,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 void dack16_w(int line, uint16_t data) override; virtual void device_add_mconfig(machine_config &config) override; private: @@ -81,7 +81,7 @@ void vis_audio_device::dack16_w(int line, uint16_t data) m_isa->drq7_w(CLEAR_LINE); } -void vis_audio_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void vis_audio_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(((m_samples < 2) && (m_mode & 8)) || !m_samples) return; diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp index 7dff5700c6c..5a7249897c0 100644 --- a/src/mame/drivers/vk100.cpp +++ b/src/mame/drivers/vk100.cpp @@ -277,7 +277,7 @@ private: void vk100_io(address_map &map); void vk100_mem(address_map &map); - 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; }; // vram access functions: @@ -349,12 +349,12 @@ void vk100_state::vram_write(uint8_t data) m_vram[(EA<<1)] = (block&0xFF00)>>8; // '' } -void vk100_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void vk100_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_EXECUTE_VG: - execute_vg(ptr, param); + execute_vg(param); break; default: throw emu_fatalerror("Unknown id in vk100_state::device_timer"); diff --git a/src/mame/drivers/votrhv.cpp b/src/mame/drivers/votrhv.cpp index 7b55a278f6b..22d55df8bf2 100644 --- a/src/mame/drivers/votrhv.cpp +++ b/src/mame/drivers/votrhv.cpp @@ -109,7 +109,7 @@ public: static const device_timer_id TIMER_SCAN = 1; private: // overrides - 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 mem_map(address_map &map); @@ -391,7 +391,7 @@ INPUT_PORTS_END Timer and machine/start/reset handlers ******************************************************************************/ -void votrhv_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void votrhv_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/drivers/vp415.cpp b/src/mame/drivers/vp415.cpp index eec82774aa7..fa623b81ac8 100644 --- a/src/mame/drivers/vp415.cpp +++ b/src/mame/drivers/vp415.cpp @@ -105,7 +105,7 @@ void vp415_state::machine_start() m_drive_2ppr_timer = timer_alloc(DRIVE_2PPR_ID); } -void vp415_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void vp415_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/wgp.cpp b/src/mame/drivers/wgp.cpp index 9e55d552a45..d63ec5779f1 100644 --- a/src/mame/drivers/wgp.cpp +++ b/src/mame/drivers/wgp.cpp @@ -435,7 +435,7 @@ void wgp_state::cpua_ctrl_w(u16 data)/* assumes Z80 sandwiched between 68Ks */ INTERRUPTS ***********************************************************/ -void wgp_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void wgp_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp index 024d24920fd..60d828fdaf5 100644 --- a/src/mame/drivers/wicat.cpp +++ b/src/mame/drivers/wicat.cpp @@ -110,7 +110,7 @@ private: required_device<fd1795_device> m_fdc; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; } - 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 main_mem(address_map &map); void video_io(address_map &map); @@ -305,7 +305,7 @@ void wicat_state::machine_reset() elem = 0; } -void wicat_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void wicat_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp index 8f91c08a839..76dbca4a6c5 100644 --- a/src/mame/drivers/wolfpack.cpp +++ b/src/mame/drivers/wolfpack.cpp @@ -14,12 +14,12 @@ #include "speaker.h" -void wolfpack_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void wolfpack_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_PERIODIC: - periodic_callback(ptr, param); + periodic_callback(param); break; default: throw emu_fatalerror("Unknown id in wolfpack_state::device_timer"); diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp index 103d24a48d0..f4eaa2bb492 100644 --- a/src/mame/drivers/wpc_an.cpp +++ b/src/mame/drivers/wpc_an.cpp @@ -114,7 +114,7 @@ private: // driver_device overrides virtual void machine_reset() override; virtual void machine_start() override { m_digits.resolve(); } - 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; static const device_timer_id TIMER_VBLANK = 0; static const device_timer_id TIMER_IRQ = 1; @@ -276,7 +276,7 @@ static INPUT_PORTS_START( wpc_an ) INPUT_PORTS_END -void wpc_an_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void wpc_an_state::device_timer(emu_timer &timer, device_timer_id id, int param) { int x; switch(id) diff --git a/src/mame/drivers/wpc_dot.cpp b/src/mame/drivers/wpc_dot.cpp index 1477b0a7a17..17b92cdaa43 100644 --- a/src/mame/drivers/wpc_dot.cpp +++ b/src/mame/drivers/wpc_dot.cpp @@ -137,7 +137,7 @@ static INPUT_PORTS_START( wpc_dot ) PORT_DIPSETTING(0xf0,"USA 2") INPUT_PORTS_END -void wpc_dot_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void wpc_dot_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index c2cb97c606f..d782e63a6e8 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -147,24 +147,24 @@ static constexpr uint32_t adpcm_clock[2] = { 8000000, 4000000 }; static constexpr uint32_t adpcm_div[4] = { 1024, 768, 512, /* Reserved */512 }; -void x68k_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void x68k_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_X68K_LED: - led_callback(ptr, param); + led_callback(param); break; case TIMER_X68K_SCC_ACK: - scc_ack(ptr, param); + scc_ack(param); break; case TIMER_MD_6BUTTON_PORT1_TIMEOUT: - md_6button_port1_timeout(ptr, param); + md_6button_port1_timeout(param); break; case TIMER_MD_6BUTTON_PORT2_TIMEOUT: - md_6button_port2_timeout(ptr, param); + md_6button_port2_timeout(param); break; case TIMER_X68K_BUS_ERROR: - bus_error(ptr, param); + bus_error(param); break; case TIMER_X68K_FDC_TC: m_upd72065->tc_w(ASSERT_LINE); diff --git a/src/mame/includes/abc80.h b/src/mame/includes/abc80.h index 6ec3a5cd7e2..709fc64d6c5 100644 --- a/src/mame/includes/abc80.h +++ b/src/mame/includes/abc80.h @@ -128,7 +128,7 @@ public: HEAD = 0xfe20 }; - 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 machine_start() override; diff --git a/src/mame/includes/alesis.h b/src/mame/includes/alesis.h index 9efc395235e..901840d81c6 100644 --- a/src/mame/includes/alesis.h +++ b/src/mame/includes/alesis.h @@ -34,7 +34,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_add_mconfig(machine_config &config) override; private: diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 68f27a5110a..37d89dc163f 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -545,7 +545,7 @@ protected: virtual void machine_reset() override; // device_t overrides - 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 custom_chip_reset(); diff --git a/src/mame/includes/amstrad.h b/src/mame/includes/amstrad.h index 8e01700a185..8dfbac38b8b 100644 --- a/src/mame/includes/amstrad.h +++ b/src/mame/includes/amstrad.h @@ -104,7 +104,7 @@ protected: }; virtual void video_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: required_device<z80_device> m_maincpu; diff --git a/src/mame/includes/apexc.h b/src/mame/includes/apexc.h index b94c56afbaa..fa68bd3ef43 100644 --- a/src/mame/includes/apexc.h +++ b/src/mame/includes/apexc.h @@ -36,7 +36,7 @@ public: protected: virtual void machine_start() override; virtual void video_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; void check_inputs(); diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h index 15c0bb33c56..796c6456696 100644 --- a/src/mame/includes/apollo.h +++ b/src/mame/includes/apollo.h @@ -690,7 +690,7 @@ private: // 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; // serial overrides virtual void rcv_complete() override; // Rx completed receiving byte diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h index cda9dc3195a..19093b5ff3b 100644 --- a/src/mame/includes/artmagic.h +++ b/src/mame/includes/artmagic.h @@ -94,5 +94,5 @@ public: void stonebal_tms_map(address_map &map); void tms_map(address_map &map); protected: - 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; }; diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h index fd9dcd43459..60b5fb36da3 100644 --- a/src/mame/includes/asterix.h +++ b/src/mame/includes/asterix.h @@ -68,7 +68,7 @@ public: void main_map(address_map &map); void sound_map(address_map &map); protected: - 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; }; #endif // MAME_INCLUDES_ASTERIX_H diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index ad3b786df8b..7931c94341c 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -186,7 +186,7 @@ public: protected: virtual void machine_start() override; virtual void video_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; }; class seawolf2_state : public astrocde_state diff --git a/src/mame/includes/atarist.h b/src/mame/includes/atarist.h index 74edcfe33c8..776e97257be 100644 --- a/src/mame/includes/atarist.h +++ b/src/mame/includes/atarist.h @@ -339,7 +339,7 @@ protected: void st_map(address_map &map); void keyboard(machine_config &config); - 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 machine_start() override; virtual void video_start() override; @@ -438,7 +438,7 @@ public: void ste(machine_config &config); void ste_map(address_map &map); protected: - 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 machine_start() override; virtual void video_start() override; }; diff --git a/src/mame/includes/bebox.h b/src/mame/includes/bebox.h index 8d5c6aa8100..b42c2afece0 100644 --- a/src/mame/includes/bebox.h +++ b/src/mame/includes/bebox.h @@ -64,7 +64,7 @@ protected: TIMER_GET_DEVICES }; - 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_array<ppc_device, 2> m_ppc; diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h index ed2f18b2037..7a4efd2a1e4 100644 --- a/src/mame/includes/blstroid.h +++ b/src/mame/includes/blstroid.h @@ -40,7 +40,7 @@ protected: virtual void machine_reset() override; virtual void video_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: TIMER_DEVICE_CALLBACK_MEMBER(scanline_update); diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h index 11f842bc16d..1d053fa502e 100644 --- a/src/mame/includes/btoads.h +++ b/src/mame/includes/btoads.h @@ -41,7 +41,7 @@ public: protected: // device overrides - 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; // driver_device overrides virtual void machine_start() override; diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index dbaf665dcb2..933d2257a67 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -134,7 +134,7 @@ public: void tokio_sound_map(address_map &map); void tokio_subcpu_map(address_map &map); protected: - 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; }; diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index 74b2f787de0..7acb338f914 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -85,7 +85,7 @@ public: void capbowl_map(address_map &map); void sound_map(address_map &map); protected: - 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; }; #endif // MAME_INCLUDES_CAPBOWL_H diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h index a75e93eb298..271f33df6d5 100644 --- a/src/mame/includes/cidelsa.h +++ b/src/mame/includes/cidelsa.h @@ -79,7 +79,7 @@ public: void destryera_map(address_map &map); protected: - 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 machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/coco.h b/src/mame/includes/coco.h index 63b04da84cc..f0e334eb481 100644 --- a/src/mame/includes/coco.h +++ b/src/mame/includes/coco.h @@ -132,7 +132,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; // changed handlers virtual void pia1_pa_changed(uint8_t data); diff --git a/src/mame/includes/comx35.h b/src/mame/includes/comx35.h index 1cff50e38bb..4c63d32f418 100644 --- a/src/mame/includes/comx35.h +++ b/src/mame/includes/comx35.h @@ -54,7 +54,7 @@ public: required_ioport m_d6; required_ioport m_modifiers; - 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 machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index fc9e190e7af..1c95f71f7c9 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -46,7 +46,7 @@ protected: virtual void machine_start() override; virtual void video_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: required_region_ptr<u16> m_palrom; diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index 9a6a34a9185..dfec7634038 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -58,7 +58,7 @@ public: void gondo(machine_config &config); protected: - 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 machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/electron.h b/src/mame/includes/electron.h index 77752b9a38e..93838cfb286 100644 --- a/src/mame/includes/electron.h +++ b/src/mame/includes/electron.h @@ -106,7 +106,7 @@ protected: virtual void machine_reset() override; virtual void video_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; required_device<cpu_device> m_maincpu; required_device<input_merger_device> m_irqs; diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index f78fe681830..26b1db965ef 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -87,7 +87,7 @@ private: void cpu_map(address_map &map); - 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; }; #endif // MAME_INCLUDES_FGOAL_H diff --git a/src/mame/includes/fmtowns.h b/src/mame/includes/fmtowns.h index d4956a80617..06546b5f424 100644 --- a/src/mame/includes/fmtowns.h +++ b/src/mame/includes/fmtowns.h @@ -280,7 +280,7 @@ private: optional_shared_ptr<uint16_t> m_nvram16; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - 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; uint8_t towns_system_r(offs_t offset); void towns_system_w(offs_t offset, uint8_t data); diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index 402a6e01641..eab82b11e25 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -91,7 +91,7 @@ private: void fuuki16_sound_io_map(address_map &map); void fuuki16_sound_map(address_map &map); - 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; }; #endif // MAME_INCLUDES_FUUKIFG2_H diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 190013533a2..2ccf3ab6336 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -107,7 +107,7 @@ private: void fuuki32_sound_io_map(address_map &map); void fuuki32_sound_map(address_map &map); - 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; }; #endif // MAME_INCLUDES_FUUKIFG3_H diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index e20565a61c4..8002d34b955 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -56,7 +56,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_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; required_device<cpu_device> m_maincpu; required_device<via6522_device> m_via_0; diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index fe3bd36a723..47d4d6d42e8 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -81,7 +81,7 @@ public: virtual void driver_init() override; protected: - 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 machine_start() override; virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index 5e2af434618..0d81689e83e 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -78,7 +78,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_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: enum diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h index d5f7f92314f..05a98addc62 100644 --- a/src/mame/includes/gunbustr.h +++ b/src/mame/includes/gunbustr.h @@ -77,7 +77,7 @@ private: void gunbustr_map(address_map &map); - 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; }; #endif // MAME_INCLUDES_GUNBUSTR_H diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h index bd4ff85c18f..f9f29d076e2 100644 --- a/src/mame/includes/hyhoo.h +++ b/src/mame/includes/hyhoo.h @@ -52,5 +52,5 @@ private: void hyhoo_io_map(address_map &map); void hyhoo_map(address_map &map); - 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; }; diff --git a/src/mame/includes/intv.h b/src/mame/includes/intv.h index abe0eb81386..a2f55166f43 100644 --- a/src/mame/includes/intv.h +++ b/src/mame/includes/intv.h @@ -149,7 +149,7 @@ private: ioport_port *m_intv_keyboard[10]; - 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; }; #endif // MAME_INCLUDES_INTV_H diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index f156cd05e03..085b3812d68 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -222,7 +222,7 @@ protected: void sound3812_map(address_map &map); void sstrike_map(address_map &map); - 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; }; class grmatch_state : public itech8_state @@ -247,7 +247,7 @@ protected: TIMER_PALETTE = TIMER_BASE_LAST+1, }; - 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 palette_w(uint8_t data); void xscroll_w(uint8_t data); diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h index 99a3807d626..3fce2fb382f 100644 --- a/src/mame/includes/jaguar.h +++ b/src/mame/includes/jaguar.h @@ -111,7 +111,7 @@ protected: virtual void sound_start() override; virtual void video_start() override; virtual void device_postload(); - 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 video_config(machine_config &config, const XTAL clock); diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index 66aa0a955c9..ab5656a7b27 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -76,7 +76,7 @@ protected: virtual void machine_start() override; uint32_t screen_update_laserbat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - 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; // video functions TIMER_CALLBACK_MEMBER(video_line); diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h index f0c6b267fb7..423d29f4ee3 100644 --- a/src/mame/includes/lethalj.h +++ b/src/mame/includes/lethalj.h @@ -59,7 +59,7 @@ private: void lethalj_map(address_map &map); virtual void machine_start() override { m_lamps.resolve(); } - 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 video_start() override; required_device<tms34010_device> m_maincpu; diff --git a/src/mame/includes/lynx.h b/src/mame/includes/lynx.h index f63fb202f33..dc8262dae21 100644 --- a/src/mame/includes/lynx.h +++ b/src/mame/includes/lynx.h @@ -49,7 +49,7 @@ protected: virtual void machine_reset() override; virtual void video_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_post_load() override; private: diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index 8967f58df2a..e494314282f 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -130,7 +130,7 @@ private: void ppan_portmap(address_map &map); void sound_map(address_map &map); - 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; }; #endif // MAME_INCLUDES_M92_H diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index 9bce32eda64..2d8f36a2a8b 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -180,7 +180,7 @@ private: void ymf278_map(address_map &map); virtual void machine_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; /* devices */ required_device<cpu_device> m_maincpu; diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index a76a2d0dc60..d52d72c0d27 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -70,7 +70,7 @@ protected: virtual void video_start() override; virtual void video_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 planes diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h index b5e3f95cad2..d8df0a45b45 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -198,5 +198,5 @@ private: void midvplus_map(address_map &map); void midvunit_map(address_map &map); - 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; }; diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h index ae474389950..827513138ef 100644 --- a/src/mame/includes/midyunit.h +++ b/src/mame/includes/midyunit.h @@ -175,7 +175,7 @@ private: void main_map(address_map &map); void yawdim_sound_map(address_map &map); - 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 dma_draw(uint16_t command); void init_generic(int bpp, int sound, int prot_start, int prot_end); void term2_init_common(write16s_delegate hack_w); diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index 9509cc81594..f5ef4b6a2c5 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -222,7 +222,7 @@ protected: u32 screen_update_model2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); // DECLARE_WRITE_LINE_MEMBER(screen_vblank_model2); // DECLARE_WRITE_LINE_MEMBER(sound_ready_w); - TIMER_DEVICE_CALLBACK_MEMBER(model2_timer_cb); + template <int TNum> TIMER_DEVICE_CALLBACK_MEMBER(model2_timer_cb); void scsp_irq(offs_t offset, u8 data); void model2_3d_frame_start( void ); diff --git a/src/mame/includes/mpu4.h b/src/mame/includes/mpu4.h index 687721721f6..cd7bf1410c8 100644 --- a/src/mame/includes/mpu4.h +++ b/src/mame/includes/mpu4.h @@ -235,7 +235,7 @@ public: void mpu4base(machine_config &config); protected: - 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 mpu4_memmap(address_map &map); void lamp_extend_small(int data); diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index 66b8657f41d..4c8cfacbd7b 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -85,7 +85,7 @@ protected: u16 gfxram_r(offs_t offset); void gfxram_w(offs_t offset, u16 data, u16 mem_mask = ~0); - 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; u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h index 0cccef036be..2e4b03d8119 100644 --- a/src/mame/includes/nbmj8688.h +++ b/src/mame/includes/nbmj8688.h @@ -158,7 +158,7 @@ private: void secolove_map(address_map &map); void seiha_io_map(address_map &map); - 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; }; #endif // MAME_INCLUDES_NBMJ8688_H diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h index b89fb7891ce..d7ab4e581b2 100644 --- a/src/mame/includes/nbmj8891.h +++ b/src/mame/includes/nbmj8891.h @@ -155,5 +155,5 @@ private: void taiwanmb_io_map(address_map &map); void taiwanmb_map(address_map &map); - 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; }; diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h index 099fb4c82e0..522e585a94c 100644 --- a/src/mame/includes/nbmj8900.h +++ b/src/mame/includes/nbmj8900.h @@ -90,7 +90,7 @@ private: void ohpaipee_map(address_map &map); void togenkyo_map(address_map &map); - 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; }; #endif // MAME_INCLUDES_NBMJ8900_H diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index e9989a7590c..97e1db9f96c 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -116,5 +116,5 @@ private: void triplew1_map(address_map &map); void triplew2_map(address_map &map); - 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; }; diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index 6e52c5a5fb5..7266b7cd576 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -79,7 +79,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_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: required_device<tmpz84c011_device> m_maincpu; diff --git a/src/mame/includes/newbrain.h b/src/mame/includes/newbrain.h index 381b8e53682..23a288049c9 100644 --- a/src/mame/includes/newbrain.h +++ b/src/mame/includes/newbrain.h @@ -79,7 +79,7 @@ private: void newbrain_iorq(address_map &map); void newbrain_mreq(address_map &map); - 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 machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/next.h b/src/mame/includes/next.h index e179365a785..13ea7c7129e 100644 --- a/src/mame/includes/next.h +++ b/src/mame/includes/next.h @@ -193,7 +193,7 @@ private: virtual void machine_start() override; virtual void machine_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 timer_start(); void timer_update(); diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index f001d067763..b279de0ad2e 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -109,5 +109,5 @@ private: void niyanpai_map(address_map &map); void zokumahj_map(address_map &map); - 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; }; diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h index 81769d70731..8599d3a369b 100644 --- a/src/mame/includes/parodius.h +++ b/src/mame/includes/parodius.h @@ -69,7 +69,7 @@ public: void parodius_map(address_map &map); void parodius_sound_map(address_map &map); protected: - 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; }; #endif // MAME_INCLUDES_PARODIUS_H diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h index 56014ed5a71..44afbb109c3 100644 --- a/src/mame/includes/pastelg.h +++ b/src/mame/includes/pastelg.h @@ -55,7 +55,7 @@ private: bool m_flipscreen_old; emu_timer *m_blitter_timer; - void blitter_timer_callback(void *ptr, s32 param); + void blitter_timer_callback(s32 param); void vramflip(); void gfxdraw(); diff --git a/src/mame/includes/pc4.h b/src/mame/includes/pc4.h index bb5008a7003..b3e50848503 100644 --- a/src/mame/includes/pc4.h +++ b/src/mame/includes/pc4.h @@ -33,7 +33,7 @@ protected: virtual void machine_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: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/pc88va.h b/src/mame/includes/pc88va.h index 94ffc3696ab..9d1140b4446 100644 --- a/src/mame/includes/pc88va.h +++ b/src/mame/includes/pc88va.h @@ -87,7 +87,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_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: required_device<cpu_device> m_maincpu; diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h index c33282530df..6d689326e36 100644 --- a/src/mame/includes/pc9801.h +++ b/src/mame/includes/pc9801.h @@ -382,7 +382,7 @@ public: void init_pc9801vm_kanji(); protected: - 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 pc9801rs_io(address_map &map); void pc9801rs_map(address_map &map); diff --git a/src/mame/includes/pmd85.h b/src/mame/includes/pmd85.h index 2ee987945c6..7741c6dcdf2 100644 --- a/src/mame/includes/pmd85.h +++ b/src/mame/includes/pmd85.h @@ -131,7 +131,7 @@ private: void mato_update_memory(); void c2717_update_memory(); void common_driver_init(); - 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; required_device<cpu_device> m_maincpu; required_region_ptr<u8> m_rom; diff --git a/src/mame/includes/pocketc.h b/src/mame/includes/pocketc.h index 23bb199dae3..19e969bbb67 100644 --- a/src/mame/includes/pocketc.h +++ b/src/mame/includes/pocketc.h @@ -38,7 +38,7 @@ protected: virtual void machine_start() override; virtual void machine_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 pocketc_palette(palette_device &palette) const; diff --git a/src/mame/includes/prof80.h b/src/mame/includes/prof80.h index 08d89ec8f30..28622f85b64 100644 --- a/src/mame/includes/prof80.h +++ b/src/mame/includes/prof80.h @@ -68,7 +68,7 @@ private: required_ioport m_j4; required_ioport m_j5; - 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 machine_start() override; enum diff --git a/src/mame/includes/psion5.h b/src/mame/includes/psion5.h index 0427b7c31d5..51613ee835f 100644 --- a/src/mame/includes/psion5.h +++ b/src/mame/includes/psion5.h @@ -48,7 +48,7 @@ protected: virtual void machine_start() override; virtual void machine_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: void palette_init(palette_device &palette); diff --git a/src/mame/includes/rmnimbus.h b/src/mame/includes/rmnimbus.h index 141026a06d7..4b7886f4f99 100644 --- a/src/mame/includes/rmnimbus.h +++ b/src/mame/includes/rmnimbus.h @@ -210,7 +210,7 @@ private: int m_scsi_req; int m_scsi_reqlat; - 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; enum { diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h index a26c07dd43a..91e64c35352 100644 --- a/src/mame/includes/rollerg.h +++ b/src/mame/includes/rollerg.h @@ -62,7 +62,7 @@ private: void rollerg_map(address_map &map); void rollerg_sound_map(address_map &map); - 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; }; #endif // MAME_INCLUDES_ROLLERG_H diff --git a/src/mame/includes/s11.h b/src/mame/includes/s11.h index ce622dd697d..8bd831bcaf4 100644 --- a/src/mame/includes/s11.h +++ b/src/mame/includes/s11.h @@ -111,7 +111,7 @@ public: protected: virtual void machine_start() override { m_digits.resolve(); } - 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 machine_reset() override; // devices diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index 22af51fca06..98f242a69ff 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -191,7 +191,7 @@ private: void sindbadm_portmap(address_map &map); void sindbadm_sound_map(address_map &map); - 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_vblank_latch_clear_timer; }; diff --git a/src/mame/includes/segahang.h b/src/mame/includes/segahang.h index 7456b330193..089004e80d4 100644 --- a/src/mame/includes/segahang.h +++ b/src/mame/includes/segahang.h @@ -121,7 +121,7 @@ private: virtual void video_start() override; virtual void machine_start() override { m_lamps.resolve(); } virtual void machine_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; // devices required_device<m68000_device> m_maincpu; diff --git a/src/mame/includes/segaorun.h b/src/mame/includes/segaorun.h index 316569dfe7a..75d10637bb2 100644 --- a/src/mame/includes/segaorun.h +++ b/src/mame/includes/segaorun.h @@ -119,7 +119,7 @@ protected: // device overrides virtual void machine_reset() override; virtual void video_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; // internal helpers void update_main_irqs(); diff --git a/src/mame/includes/segas16a.h b/src/mame/includes/segas16a.h index 8138704c46a..3e9c93d2d49 100644 --- a/src/mame/includes/segas16a.h +++ b/src/mame/includes/segas16a.h @@ -138,7 +138,7 @@ private: virtual void video_start() override; virtual void machine_start() override { m_lamps.resolve(); } virtual void machine_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; // I8751 simulations void dumpmtmt_i8751_sim(); diff --git a/src/mame/includes/segas16b.h b/src/mame/includes/segas16b.h index 4c15b7b595c..e541c0341f6 100644 --- a/src/mame/includes/segas16b.h +++ b/src/mame/includes/segas16b.h @@ -211,7 +211,7 @@ protected: virtual void video_start() override; virtual void machine_start() override { m_lamps.resolve(); } virtual void machine_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; // internal helpers void init_generic(segas16b_rom_board rom_board); diff --git a/src/mame/includes/segas18.h b/src/mame/includes/segas18.h index 2474fa28b58..cc3aaf5acb6 100644 --- a/src/mame/includes/segas18.h +++ b/src/mame/includes/segas18.h @@ -140,7 +140,7 @@ private: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_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; // internal helpers void init_generic(segas18_rom_board rom_board); diff --git a/src/mame/includes/segaxbd.h b/src/mame/includes/segaxbd.h index 23fe42c982f..ed124677cdc 100644 --- a/src/mame/includes/segaxbd.h +++ b/src/mame/includes/segaxbd.h @@ -93,7 +93,7 @@ protected: // device overrides // virtual void machine_reset(); virtual void video_start(); - 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; // internal helpers void update_main_irqs(); diff --git a/src/mame/includes/segaybd.h b/src/mame/includes/segaybd.h index 8e37ee9fa8d..a8f2c04f9da 100644 --- a/src/mame/includes/segaybd.h +++ b/src/mame/includes/segaybd.h @@ -110,7 +110,7 @@ private: // device overrides virtual void machine_reset() override; virtual void video_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; // internal helpers void update_irqs(); diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h index aa5fc8b0e6d..6fa9d0a46bd 100644 --- a/src/mame/includes/simpsons.h +++ b/src/mame/includes/simpsons.h @@ -81,7 +81,7 @@ private: void main_map(address_map &map); void z80_map(address_map &map); - 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; }; #endif // MAME_INCLUDES_SIMPSONS_H diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h index e08769ba5e7..a92e4ec825d 100644 --- a/src/mame/includes/slapshot.h +++ b/src/mame/includes/slapshot.h @@ -48,7 +48,7 @@ protected: virtual void machine_start() override; virtual void video_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: struct slapshot_tempsprite diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h index 34c41e0e94b..d21dcb43c8e 100644 --- a/src/mame/includes/snes.h +++ b/src/mame/includes/snes.h @@ -322,7 +322,7 @@ protected: virtual void machine_start() override; virtual void machine_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; enum { diff --git a/src/mame/includes/sorcerer.h b/src/mame/includes/sorcerer.h index cf3192714c8..3cf2e5a9e35 100644 --- a/src/mame/includes/sorcerer.h +++ b/src/mame/includes/sorcerer.h @@ -113,7 +113,7 @@ protected: emu_timer *m_serial_timer; emu_timer *m_cassette_timer; cass_data_t m_cass_data; - 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; required_device<z80_device> m_maincpu; required_region_ptr<u8> m_rom; required_shared_ptr<u8> m_pcg; diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index 9c21e114baf..0bd4aa88f15 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -97,7 +97,7 @@ private: void spacefb_main_io_map(address_map &map); void spacefb_main_map(address_map &map); - 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; }; #endif // MAME_INCLUDES_SPACEFB diff --git a/src/mame/includes/spectrum.h b/src/mame/includes/spectrum.h index 6248a21653a..dda18643898 100644 --- a/src/mame/includes/spectrum.h +++ b/src/mame/includes/spectrum.h @@ -102,7 +102,7 @@ public: protected: virtual void machine_reset() override; virtual void video_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; // until machine/spec_snqk.cpp gets somehow disentangled virtual void plus3_update_memory() { } diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index 9bd052528d7..7bf95ee841f 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -52,7 +52,7 @@ protected: virtual void machine_start() override; virtual void machine_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: DECLARE_WRITE_LINE_MEMBER(stfight_adpcm_int); diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index 819c63ac7fd..05ea7e4d9f2 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -289,7 +289,7 @@ protected: void yesnoj_map(address_map &map); void yuyugogo_map(address_map &map); - 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; }; #endif // MAME_INCLUDES_TAITO_F2_H diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index b7abf603d00..6fb396c1a68 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -139,7 +139,7 @@ protected: TIMER_F3_INTERRUPT3 }; - 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(void) override; virtual void machine_start() override; diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index 3e1b64634fd..9e8be273f4f 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -227,7 +227,7 @@ protected: TIMER_TAITOZ_INTERRUPT6, }; - 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 machine_start() override; virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/includes/tandy2k.h b/src/mame/includes/tandy2k.h index eb3c829b7b0..3715510ac7d 100644 --- a/src/mame/includes/tandy2k.h +++ b/src/mame/includes/tandy2k.h @@ -144,7 +144,7 @@ private: virtual void machine_start() override; virtual void machine_reset() override; virtual void device_reset_after_children() 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; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index 4ea239b148f..6de7591faa7 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -85,7 +85,7 @@ private: void draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect); void set_collision(int index); - 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 tank8_cpu_map(address_map &map); required_device<cpu_device> m_maincpu; diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index b2687200539..207f69b43d5 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -44,7 +44,7 @@ protected: virtual void machine_start() override; virtual void video_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: required_device<cpu_device> m_maincpu; diff --git a/src/mame/includes/ti85.h b/src/mame/includes/ti85.h index 20b9ebee4b8..c176abe0737 100644 --- a/src/mame/includes/ti85.h +++ b/src/mame/includes/ti85.h @@ -197,7 +197,7 @@ private: TIMER_CALLBACK_MEMBER(ti83_timer2_callback); //crystal timers - 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 ti83pse_count(uint8_t timer, uint8_t data); emu_timer *m_crystal_timer1; diff --git a/src/mame/includes/tmc1800.h b/src/mame/includes/tmc1800.h index ce026df557e..a9e43909d63 100644 --- a/src/mame/includes/tmc1800.h +++ b/src/mame/includes/tmc1800.h @@ -77,7 +77,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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; required_device<cdp1861_device> m_vdc; /* keyboard state */ @@ -195,7 +195,7 @@ public: void nano_map(address_map &map); protected: - 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 machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index 45c2eb6ddac..f83dcad1491 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -202,7 +202,7 @@ protected: void tmnt_audio_map(address_map &map); void tmnt_main_map(address_map &map); - 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; }; class glfgreat_state : public tmnt_state diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index c182ebbbd55..b09b0bdcd67 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -53,7 +53,7 @@ public: void init_triplhnt(); protected: - 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 machine_start() override; virtual void video_start() override; diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h index 879984fd705..3a70d961a5c 100644 --- a/src/mame/includes/trucocl.h +++ b/src/mame/includes/trucocl.h @@ -33,7 +33,7 @@ protected: virtual void machine_reset() override; virtual void video_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: int m_cur_dac_address; diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index 0ff5652079b..37a49e4cf29 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -117,7 +117,7 @@ protected: void tubep_sound_map(address_map &map); void tubep_sound_portmap(address_map &map); - 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; }; class rjammer_state : public tubep_state diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index 1ed8cc35ac5..47c66510b46 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -39,7 +39,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_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: enum diff --git a/src/mame/includes/vectrex.h b/src/mame/includes/vectrex.h index 93e7a4fd98e..a656a3f9e28 100644 --- a/src/mame/includes/vectrex.h +++ b/src/mame/includes/vectrex.h @@ -81,7 +81,7 @@ protected: void vectrex_base(machine_config &config); - 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 configure_imager(bool reset_refresh, const double *imager_angles); void vectrex_configuration(); @@ -141,6 +141,7 @@ private: attotime m_vector_start_time; uint8_t m_cb2; void (vectrex_base_state::*vector_add_point_function)(int, int, rgb_t, int); + void *m_signal_ptr = nullptr; required_device<mc1408_device> m_dac; required_device<ay8910_device> m_ay8912; diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h index 78e8d11bccd..c26e304afe1 100644 --- a/src/mame/includes/vendetta.h +++ b/src/mame/includes/vendetta.h @@ -42,7 +42,7 @@ public: protected: virtual void machine_start() override; virtual void machine_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/mame/includes/vidbrain.h b/src/mame/includes/vidbrain.h index 520fc1dee66..7e4e7ef647c 100644 --- a/src/mame/includes/vidbrain.h +++ b/src/mame/includes/vidbrain.h @@ -64,7 +64,7 @@ private: required_ioport m_joy4_x; required_ioport m_joy4_y; - 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 machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index 73ddc3131af..50b41a9a4b0 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -44,7 +44,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_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: enum diff --git a/src/mame/includes/vp415.h b/src/mame/includes/vp415.h index 86f3a88687b..af67093e3a6 100644 --- a/src/mame/includes/vp415.h +++ b/src/mame/includes/vp415.h @@ -77,9 +77,9 @@ public: static const char *const SWITCHES_TAG; private: - void machine_reset() override; - void machine_start() override; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void machine_reset() override; + virtual void machine_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index 7b6f64f5e1e..71180601585 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -56,7 +56,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_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_post_load() override; private: diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index f616e7cb7d3..f9b60489ab0 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -70,7 +70,7 @@ private: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_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; void wolfpack_palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/wpc_dot.h b/src/mame/includes/wpc_dot.h index 910fbe82ad6..3d84d923376 100644 --- a/src/mame/includes/wpc_dot.h +++ b/src/mame/includes/wpc_dot.h @@ -46,7 +46,7 @@ protected: // driver_device overrides virtual void machine_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; static const device_timer_id TIMER_VBLANK = 0; static const device_timer_id TIMER_IRQ = 1; diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h index 45a68de4305..5ecb8a82a74 100644 --- a/src/mame/includes/x68k.h +++ b/src/mame/includes/x68k.h @@ -340,7 +340,7 @@ public: static rgb_t GGGGGRRRRRBBBBBI(uint32_t raw); protected: - 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 machine_start() override; virtual void machine_reset() override; void set_bus_error(uint32_t address, bool write, uint16_t mem_mask); diff --git a/src/mame/includes/xbox_pci.h b/src/mame/includes/xbox_pci.h index b0fc2aae613..a8a782def1f 100644 --- a/src/mame/includes/xbox_pci.h +++ b/src/mame/includes/xbox_pci.h @@ -228,7 +228,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_config_complete() 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 config_map(address_map &map) override; @@ -296,7 +296,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 void config_map(address_map &map) override; diff --git a/src/mame/includes/xbox_usb.h b/src/mame/includes/xbox_usb.h index 414d34c1d95..6f8e8184577 100644 --- a/src/mame/includes/xbox_usb.h +++ b/src/mame/includes/xbox_usb.h @@ -362,7 +362,7 @@ public: void start(); void reset(); - void timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + void timer(emu_timer &timer, device_timer_id id, int param); uint32_t read(offs_t offset); void write(offs_t offset, uint32_t data); diff --git a/src/mame/includes/z80ne.h b/src/mame/includes/z80ne.h index aace88013c9..92b66d0e343 100644 --- a/src/mame/includes/z80ne.h +++ b/src/mame/includes/z80ne.h @@ -118,7 +118,7 @@ protected: TIMER_CALLBACK_MEMBER(z80ne_cassette_tc); TIMER_CALLBACK_MEMBER(z80ne_kbd_scan); - 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; memory_passthrough_handler *m_rom_shadow_tap; required_device<ay31015_device> m_uart; diff --git a/src/mame/includes/zx.h b/src/mame/includes/zx.h index e3d9f8ab34e..9fb51c0b641 100644 --- a/src/mame/includes/zx.h +++ b/src/mame/includes/zx.h @@ -112,7 +112,7 @@ private: uint16_t m_ula_char_buffer; double m_cassette_cur_level; - 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 drop_sync(); void recalc_hsync(); diff --git a/src/mame/machine/3dom2.cpp b/src/mame/machine/3dom2.cpp index 4e3927f72f5..bbe7638ad46 100644 --- a/src/mame/machine/3dom2.cpp +++ b/src/mame/machine/3dom2.cpp @@ -314,7 +314,7 @@ void m2_bda_device::device_add_mconfig(machine_config &config) // device_timer - device-specific timers //------------------------------------------------- -void m2_bda_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void m2_bda_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -864,7 +864,7 @@ void m2_vdu_device::device_reset() // device_timer - device-specific timers //------------------------------------------------- -void m2_vdu_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void m2_vdu_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -1571,7 +1571,7 @@ void m2_cde_device::device_post_load() // device_timer - a timer //------------------------------------------------- -void m2_cde_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void m2_cde_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/3dom2.h b/src/mame/machine/3dom2.h index 3326afe4c74..b4eac8df956 100644 --- a/src/mame/machine/3dom2.h +++ b/src/mame/machine/3dom2.h @@ -164,7 +164,7 @@ protected: virtual void device_reset() override; virtual void device_post_load() override; virtual void device_add_mconfig(machine_config &config) 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 base_addr @@ -400,7 +400,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; private: enum timer_id @@ -525,7 +525,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: diff --git a/src/mame/machine/amiga.cpp b/src/mame/machine/amiga.cpp index 62da9267548..2a5d6a39702 100644 --- a/src/mame/machine/amiga.cpp +++ b/src/mame/machine/amiga.cpp @@ -227,18 +227,18 @@ uint32_t amiga_state::rom_mirror32_r(offs_t offset, uint32_t mem_mask) return m_maincpu->space(AS_PROGRAM).read_dword(offset + 0xf80000, mem_mask); } -void amiga_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void amiga_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_SCANLINE: - scanline_callback(ptr, param); + scanline_callback(param); break; case TIMER_AMIGA_IRQ: - amiga_irq_proc(ptr, param); + amiga_irq_proc(param); break; case TIMER_AMIGA_BLITTER: - amiga_blitter_proc(ptr, param); + amiga_blitter_proc(param); break; case TIMER_SERIAL: serial_shift(); diff --git a/src/mame/machine/amstrad.cpp b/src/mame/machine/amstrad.cpp index 68b2dc8a408..696e824892a 100644 --- a/src/mame/machine/amstrad.cpp +++ b/src/mame/machine/amstrad.cpp @@ -221,18 +221,18 @@ TIMER_CALLBACK_MEMBER(amstrad_state::amstrad_pc2_low) } -void amstrad_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void amstrad_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_PC2_LOW: - amstrad_pc2_low(ptr, param); + amstrad_pc2_low(param); break; case TIMER_VIDEO_UPDATE: - amstrad_video_update_timer(ptr, param); + amstrad_video_update_timer(param); break; case TIMER_SET_RESOLUTION: - cb_set_resolution(ptr, param); + cb_set_resolution(param); break; default: throw emu_fatalerror("Unknown id in amstrad_state::device_timer"); diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp index d1b21259db1..1b4f63013f1 100644 --- a/src/mame/machine/apollo.cpp +++ b/src/mame/machine/apollo.cpp @@ -1307,10 +1307,10 @@ void apollo_stdio_device::device_reset() } void apollo_stdio_device::device_timer(emu_timer &timer, device_timer_id id, - int param, void *ptr) + int param) { // FIXME? -// device_serial_interface::device_timer(timer, id, param, ptr); +// device_serial_interface::device_timer(timer, id, param); } void apollo_stdio_device::rcv_complete() // Rx completed receiving byte diff --git a/src/mame/machine/archimedes_keyb.cpp b/src/mame/machine/archimedes_keyb.cpp index d360ab27840..6b1a2e55f6a 100644 --- a/src/mame/machine/archimedes_keyb.cpp +++ b/src/mame/machine/archimedes_keyb.cpp @@ -337,7 +337,7 @@ void archimedes_keyboard_device::tra_callback() m_kout(transmit_register_get_data_bit()); } -void archimedes_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void archimedes_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // Mouse quadrature signals // Increase Decrease diff --git a/src/mame/machine/archimedes_keyb.h b/src/mame/machine/archimedes_keyb.h index 08ed90eb655..821d929bd07 100644 --- a/src/mame/machine/archimedes_keyb.h +++ b/src/mame/machine/archimedes_keyb.h @@ -36,7 +36,7 @@ protected: virtual void device_resolve_objects() 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; // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/mame/machine/asic65.cpp b/src/mame/machine/asic65.cpp index 6f9a021edd6..52c080ed0a9 100644 --- a/src/mame/machine/asic65.cpp +++ b/src/mame/machine/asic65.cpp @@ -169,7 +169,7 @@ void asic65_device::reset_line(int state) * *************************************/ -void asic65_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void asic65_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/asic65.h b/src/mame/machine/asic65.h index 61fdac9d26f..3c333e8497b 100644 --- a/src/mame/machine/asic65.h +++ b/src/mame/machine/asic65.h @@ -55,7 +55,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) 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: u8 m_asic65_type; diff --git a/src/mame/machine/atarigen.cpp b/src/mame/machine/atarigen.cpp index 057af93511c..604c7c240c6 100644 --- a/src/mame/machine/atarigen.cpp +++ b/src/mame/machine/atarigen.cpp @@ -35,13 +35,13 @@ void atarigen_state::machine_reset() } -void atarigen_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void atarigen_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { - // unhalt the CPU that was passed as a pointer + // unhalt the CPU case TID_UNHALT_CPU: - reinterpret_cast<device_t *>(ptr)->execute().set_input_line(INPUT_LINE_HALT, CLEAR_LINE); + m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); break; } } @@ -69,8 +69,8 @@ void atarigen_state::halt_until_hblank_0(device_t &device, screen_device &screen hblank += width; // halt and set a timer to wake up - device.execute().set_input_line(INPUT_LINE_HALT, ASSERT_LINE); - timer_set(screen.scan_period() * (hblank - hpos) / width, TID_UNHALT_CPU, 0, (void *)&device); + m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); + timer_set(screen.scan_period() * (hblank - hpos) / width, TID_UNHALT_CPU); } diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index 2110928411f..e03c3e43136 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -28,7 +28,7 @@ protected: // users must call through to these virtual void machine_start() override; virtual void machine_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; // video helpers void halt_until_hblank_0(device_t &device, screen_device &screen); diff --git a/src/mame/machine/atariscom.cpp b/src/mame/machine/atariscom.cpp index 7165482d2f6..4c55b43a1ee 100644 --- a/src/mame/machine/atariscom.cpp +++ b/src/mame/machine/atariscom.cpp @@ -81,7 +81,7 @@ void atari_sound_comm_device::device_reset() // calbacks //------------------------------------------------- -void atari_sound_comm_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void atari_sound_comm_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/atariscom.h b/src/mame/machine/atariscom.h index 6b1d96917d5..abc0f8931e8 100644 --- a/src/mame/machine/atariscom.h +++ b/src/mame/machine/atariscom.h @@ -69,7 +69,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: // timer IDs diff --git a/src/mame/machine/bebox.cpp b/src/mame/machine/bebox.cpp index b08d6835014..97998b73473 100644 --- a/src/mame/machine/bebox.cpp +++ b/src/mame/machine/bebox.cpp @@ -726,7 +726,7 @@ void bebox_state::scsi53c810_pci_write(int function, int offset, uint32_t data, } -void bebox_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void bebox_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/bublbobl.cpp b/src/mame/machine/bublbobl.cpp index 4cab1e64a47..59784418ca3 100644 --- a/src/mame/machine/bublbobl.cpp +++ b/src/mame/machine/bublbobl.cpp @@ -127,7 +127,7 @@ uint8_t bublbobl_state::tokiob_mcu_r() } -void bublbobl_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void bublbobl_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/cmi_mkbd.cpp b/src/mame/machine/cmi_mkbd.cpp index 2128f88c5b1..126b8da9e93 100644 --- a/src/mame/machine/cmi_mkbd.cpp +++ b/src/mame/machine/cmi_mkbd.cpp @@ -79,7 +79,7 @@ void cmi_music_keyboard_device::device_start() m_scnd = 0; } -void cmi_music_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cmi_music_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/cmi_mkbd.h b/src/mame/machine/cmi_mkbd.h index 653083ce939..e1ab74bd6ac 100644 --- a/src/mame/machine/cmi_mkbd.h +++ b/src/mame/machine/cmi_mkbd.h @@ -38,7 +38,7 @@ protected: virtual ioport_constructor device_input_ports() const override; virtual void device_resolve_objects() 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; private: void cmi10_u20_a_w(u8 data); diff --git a/src/mame/machine/coco.cpp b/src/mame/machine/coco.cpp index eace77d208e..f7c49070ce8 100644 --- a/src/mame/machine/coco.cpp +++ b/src/mame/machine/coco.cpp @@ -190,7 +190,7 @@ void coco_state::device_reset() // device_timer //------------------------------------------------- -void coco_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void coco_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/machine/cuda.cpp b/src/mame/machine/cuda.cpp index 52194dbee55..83f8f126494 100644 --- a/src/mame/machine/cuda.cpp +++ b/src/mame/machine/cuda.cpp @@ -395,8 +395,8 @@ void cuda_device::device_start() write_via_clock.resolve_safe(); write_via_data.resolve_safe(); - m_timer = timer_alloc(0, nullptr); - m_prog_timer = timer_alloc(1, nullptr); + m_timer = timer_alloc(0); + m_prog_timer = timer_alloc(1); save_item(NAME(ddrs[0])); save_item(NAME(ddrs[1])); save_item(NAME(ddrs[2])); @@ -457,7 +457,7 @@ void cuda_device::device_reset() last_adb = 0; } -void cuda_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void cuda_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == 0) { diff --git a/src/mame/machine/cuda.h b/src/mame/machine/cuda.h index 37c5a164729..c786622a21b 100644 --- a/src/mame/machine/cuda.h +++ b/src/mame/machine/cuda.h @@ -87,7 +87,7 @@ protected: required_device<cpu_device> m_maincpu; - 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: uint8_t ddrs[3]; diff --git a/src/mame/machine/dc_g2if.cpp b/src/mame/machine/dc_g2if.cpp index fa3d63d105e..a75bf4b0f37 100644 --- a/src/mame/machine/dc_g2if.cpp +++ b/src/mame/machine/dc_g2if.cpp @@ -121,7 +121,7 @@ void dc_g2if_device::device_reset() } } -void dc_g2if_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void dc_g2if_device::device_timer(emu_timer &timer, device_timer_id id, int param) { u8 channel = (u8)id; bool dma_result = (param == 1); diff --git a/src/mame/machine/dc_g2if.h b/src/mame/machine/dc_g2if.h index f8c83600263..5cf0888b563 100644 --- a/src/mame/machine/dc_g2if.h +++ b/src/mame/machine/dc_g2if.h @@ -35,7 +35,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; private: required_address_space m_host_space; diff --git a/src/mame/machine/dec_lk201.cpp b/src/mame/machine/dec_lk201.cpp index 3230a3b1dda..4bf0ad985bc 100644 --- a/src/mame/machine/dec_lk201.cpp +++ b/src/mame/machine/dec_lk201.cpp @@ -572,7 +572,7 @@ void lk201_device::device_reset() m_led_hold = 0; // led11 } -void lk201_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void lk201_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/dec_lk201.h b/src/mame/machine/dec_lk201.h index 87a7e45a65d..59881d309a4 100644 --- a/src/mame/machine/dec_lk201.h +++ b/src/mame/machine/dec_lk201.h @@ -67,7 +67,7 @@ protected: virtual ioport_constructor device_input_ports() 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_serial overrides virtual void rcv_complete() override; // Rx completed receiving byte diff --git a/src/mame/machine/decopincpu.cpp b/src/mame/machine/decopincpu.cpp index 38e9d5c2d06..518149d0395 100644 --- a/src/mame/machine/decopincpu.cpp +++ b/src/mame/machine/decopincpu.cpp @@ -58,7 +58,7 @@ static INPUT_PORTS_START( decocpu1 ) PORT_CONFSETTING( 0x10, "English" ) INPUT_PORTS_END -void decocpu_type1_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void decocpu_type1_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/machine/decopincpu.h b/src/mame/machine/decopincpu.h index ba3ae40cc06..5455d2fb37a 100644 --- a/src/mame/machine/decopincpu.h +++ b/src/mame/machine/decopincpu.h @@ -62,7 +62,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; virtual ioport_constructor device_input_ports() const 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 decocpu1_map(address_map &map); diff --git a/src/mame/machine/dmac_0266.cpp b/src/mame/machine/dmac_0266.cpp index e3343baa8e0..8b873924cfa 100644 --- a/src/mame/machine/dmac_0266.cpp +++ b/src/mame/machine/dmac_0266.cpp @@ -124,7 +124,7 @@ void dmac_0266_device::control_w(u32 data) soft_reset(); } -void dmac_0266_device::dma_check(void *ptr, s32 param) +void dmac_0266_device::dma_check(s32 param) { // check req active if (!m_req_state) diff --git a/src/mame/machine/dmac_0266.h b/src/mame/machine/dmac_0266.h index 83150106d5d..fec9ddbccef 100644 --- a/src/mame/machine/dmac_0266.h +++ b/src/mame/machine/dmac_0266.h @@ -40,7 +40,7 @@ protected: // dma logic void soft_reset(); - void dma_check(void *ptr, s32 param); + void dma_check(s32 param); private: required_address_space m_bus; diff --git a/src/mame/machine/dmac_0448.cpp b/src/mame/machine/dmac_0448.cpp index 578c09fafd8..95c64e9f530 100644 --- a/src/mame/machine/dmac_0448.cpp +++ b/src/mame/machine/dmac_0448.cpp @@ -79,7 +79,7 @@ void dmac_0448_device::set_irq_line(int number, int state) m_irq_check->adjust(attotime::zero); } -void dmac_0448_device::irq_check(void *ptr, s32 param) +void dmac_0448_device::irq_check(s32 param) { bool const out_int_stat = bool(m_gstat & 0x55); @@ -115,7 +115,7 @@ void dmac_0448_device::cctl_w(u8 data) m_dma_check->adjust(attotime::zero); } -void dmac_0448_device::dma_check(void *ptr, s32 param) +void dmac_0448_device::dma_check(s32 param) { bool active = false; diff --git a/src/mame/machine/dmac_0448.h b/src/mame/machine/dmac_0448.h index e85e8b1ecff..de755b03dbe 100644 --- a/src/mame/machine/dmac_0448.h +++ b/src/mame/machine/dmac_0448.h @@ -53,8 +53,8 @@ protected: void cmap_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_channel[m_gsel].cmap[m_channel[m_gsel].ctag]); } void gsel_w(u8 data) { m_gsel = data; } - void irq_check(void *ptr = nullptr, s32 param = 0); - void dma_check(void *ptr = nullptr, s32 param = 0); + void irq_check(s32 param = 0); + void dma_check(s32 param = 0); required_address_space m_bus; diff --git a/src/mame/machine/egret.cpp b/src/mame/machine/egret.cpp index e9276c05352..f62c8484821 100644 --- a/src/mame/machine/egret.cpp +++ b/src/mame/machine/egret.cpp @@ -399,7 +399,7 @@ void egret_device::device_start() } #endif - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); save_item(NAME(ddrs[0])); save_item(NAME(ddrs[1])); save_item(NAME(ddrs[2])); @@ -468,7 +468,7 @@ void egret_device::device_reset() last_adb = 0; } -void egret_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void egret_device::device_timer(emu_timer &timer, device_timer_id id, int param) { onesec |= 0x40; diff --git a/src/mame/machine/egret.h b/src/mame/machine/egret.h index b4ea5882b0d..d58d2e5d00f 100644 --- a/src/mame/machine/egret.h +++ b/src/mame/machine/egret.h @@ -98,7 +98,7 @@ protected: required_device<cpu_device> m_maincpu; - 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: uint8_t ddrs[3]; diff --git a/src/mame/machine/elan_eu3a05commonsys.cpp b/src/mame/machine/elan_eu3a05commonsys.cpp index 38713b8789c..638bbe6e459 100644 --- a/src/mame/machine/elan_eu3a05commonsys.cpp +++ b/src/mame/machine/elan_eu3a05commonsys.cpp @@ -228,7 +228,7 @@ void elan_eu3a05commonsys_device::map(address_map &map) } -void elan_eu3a05commonsys_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void elan_eu3a05commonsys_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/elan_eu3a05commonsys.h b/src/mame/machine/elan_eu3a05commonsys.h index 07016ad1207..647e250bfcd 100644 --- a/src/mame/machine/elan_eu3a05commonsys.h +++ b/src/mame/machine/elan_eu3a05commonsys.h @@ -31,7 +31,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; required_device<m6502_device> m_cpu; required_device<address_map_bank_device> m_bank; diff --git a/src/mame/machine/electron.cpp b/src/mame/machine/electron.cpp index f27d8092ec6..6b4aa221100 100644 --- a/src/mame/machine/electron.cpp +++ b/src/mame/machine/electron.cpp @@ -25,18 +25,18 @@ void electron_state::waitforramsync() } -void electron_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void electron_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_TAPE_HANDLER: - electron_tape_timer_handler(ptr, param); + electron_tape_timer_handler(param); break; case TIMER_SETUP_BEEP: - setup_beep(ptr, param); + setup_beep(param); break; case TIMER_SCANLINE_INTERRUPT: - electron_scanline_interrupt(ptr, param); + electron_scanline_interrupt(param); break; default: throw emu_fatalerror("Unknown id in electron_state::device_timer"); diff --git a/src/mame/machine/esqpanel.cpp b/src/mame/machine/esqpanel.cpp index 7629fc3c8f2..338c7be5712 100644 --- a/src/mame/machine/esqpanel.cpp +++ b/src/mame/machine/esqpanel.cpp @@ -484,7 +484,7 @@ void esqpanel_device::device_stop() m_external_panel_server = nullptr; } -void esqpanel_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void esqpanel_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (ESQPANEL_EXTERNAL_TIMER_ID == id) { diff --git a/src/mame/machine/esqpanel.h b/src/mame/machine/esqpanel.h index 77ffc6f9daf..f902266afee 100644 --- a/src/mame/machine/esqpanel.h +++ b/src/mame/machine/esqpanel.h @@ -40,7 +40,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_stop() 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; // serial overrides virtual void rcv_complete() override; // Rx completed receiving byte diff --git a/src/mame/machine/esqvfd.cpp b/src/mame/machine/esqvfd.cpp index b8c2ad44f31..5e2797cbd6e 100644 --- a/src/mame/machine/esqvfd.cpp +++ b/src/mame/machine/esqvfd.cpp @@ -140,7 +140,7 @@ void esqvfd_device::device_reset() memset(m_dirty, 1, sizeof(m_attrs)); } -void esqvfd_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void esqvfd_device::device_timer(emu_timer &timer, device_timer_id id, int param) { } diff --git a/src/mame/machine/esqvfd.h b/src/mame/machine/esqvfd.h index 3b0e008ed5e..fdaf87f6665 100644 --- a/src/mame/machine/esqvfd.h +++ b/src/mame/machine/esqvfd.h @@ -48,7 +48,7 @@ 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; output_helper::ptr m_vfds; int m_cursx, m_cursy; diff --git a/src/mame/machine/f5220_kbd.cpp b/src/mame/machine/f5220_kbd.cpp index 8cd25c89967..91c590e402d 100644 --- a/src/mame/machine/f5220_kbd.cpp +++ b/src/mame/machine/f5220_kbd.cpp @@ -227,7 +227,7 @@ void f5220_kbd_device::device_reset() // device_timer - device-specific timer //------------------------------------------------- -void f5220_kbd_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void f5220_kbd_device::device_timer(emu_timer &timer, device_timer_id id, int param) { logerror("Reset\n"); diff --git a/src/mame/machine/f5220_kbd.h b/src/mame/machine/f5220_kbd.h index 6673d124fd2..2d3d22d1ef2 100644 --- a/src/mame/machine/f5220_kbd.h +++ b/src/mame/machine/f5220_kbd.h @@ -36,7 +36,7 @@ protected: virtual ioport_constructor device_input_ports() 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_matrix_keyboard_interface overrides virtual void key_make(uint8_t row, uint8_t column) override; diff --git a/src/mame/machine/fidel_clockdiv.cpp b/src/mame/machine/fidel_clockdiv.cpp index 13ec96c2ee1..0f0d9ebc85f 100644 --- a/src/mame/machine/fidel_clockdiv.cpp +++ b/src/mame/machine/fidel_clockdiv.cpp @@ -23,7 +23,7 @@ TODO: void fidel_clockdiv_state::machine_start() { // dummy timer for cpu divider - m_div_timer = machine().scheduler().timer_alloc(timer_expired_delegate(), this); + m_div_timer = machine().scheduler().timer_alloc(timer_expired_delegate()); } diff --git a/src/mame/machine/fm_scsi.cpp b/src/mame/machine/fm_scsi.cpp index f84738e3ec0..c370c232964 100644 --- a/src/mame/machine/fm_scsi.cpp +++ b/src/mame/machine/fm_scsi.cpp @@ -117,7 +117,7 @@ int fmscsi_device::get_scsi_cmd_len(uint8_t cbyte) //return 6; } -void fmscsi_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void fmscsi_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/machine/fm_scsi.h b/src/mame/machine/fm_scsi.h index c9b9e55d831..5b3b06866f0 100644 --- a/src/mame/machine/fm_scsi.h +++ b/src/mame/machine/fm_scsi.h @@ -42,7 +42,7 @@ protected: // device-level overrides (none are required, but these are common) 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 device state goes here diff --git a/src/mame/machine/hp2640_tape.cpp b/src/mame/machine/hp2640_tape.cpp index ad22cc1c884..45fcc5caff7 100644 --- a/src/mame/machine/hp2640_tape.cpp +++ b/src/mame/machine/hp2640_tape.cpp @@ -311,7 +311,7 @@ void hp2640_tape_device::device_reset() m_cell_timer->reset(); } -void hp2640_tape_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hp2640_tape_device::device_timer(emu_timer &timer, device_timer_id id, int param) { LOG("TMR %d @%s\n" , id , machine().time().to_string()); diff --git a/src/mame/machine/hp2640_tape.h b/src/mame/machine/hp2640_tape.h index 38733094dd5..9c6ff7e382a 100644 --- a/src/mame/machine/hp2640_tape.h +++ b/src/mame/machine/hp2640_tape.h @@ -38,7 +38,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; private: devcb_write_line m_irq_handler; diff --git a/src/mame/machine/hp9845_printer.cpp b/src/mame/machine/hp9845_printer.cpp index accbc049141..c3b17acfaec 100644 --- a/src/mame/machine/hp9845_printer.cpp +++ b/src/mame/machine/hp9845_printer.cpp @@ -186,7 +186,7 @@ void hp9845_printer_device::device_reset() m_sts_handler(true); } -void hp9845_printer_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hp9845_printer_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_busy = false; update_fsm(); diff --git a/src/mame/machine/hp9845_printer.h b/src/mame/machine/hp9845_printer.h index d42c00c01cb..ce8fce69084 100644 --- a/src/mame/machine/hp9845_printer.h +++ b/src/mame/machine/hp9845_printer.h @@ -31,7 +31,7 @@ public: 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; // PPU access uint16_t printer_r(offs_t offset); diff --git a/src/mame/machine/hpc3.cpp b/src/mame/machine/hpc3.cpp index 4d2acb27b0c..dcab7432baa 100644 --- a/src/mame/machine/hpc3.cpp +++ b/src/mame/machine/hpc3.cpp @@ -218,7 +218,7 @@ void hpc3_device::map(address_map &map) map(0x00060000, 0x0007ffff).rw(FUNC(hpc3_device::bbram_r), FUNC(hpc3_device::bbram_w)); } -void hpc3_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hpc3_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -1109,7 +1109,7 @@ void hpc3_device::eeprom_w(uint32_t data) m_eeprom_clk_cb(BIT(data, 2)); } -void hpc3_device::enet_transmit(void *ptr, int param) +void hpc3_device::enet_transmit(int param) { // save the first transmit buffer descriptor pointer // TODO: not sure how cpfbdp and ppfbdp work, perhaps round-robin? diff --git a/src/mame/machine/hpc3.h b/src/mame/machine/hpc3.h index b9599e043f6..508f707bc30 100644 --- a/src/mame/machine/hpc3.h +++ b/src/mame/machine/hpc3.h @@ -71,7 +71,7 @@ protected: virtual void device_resolve_objects() 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 space_config_vector memory_space_config() const override; @@ -119,7 +119,7 @@ protected: void scsi_drq(bool state, int channel); //void scsi_dma(int channel); - void enet_transmit(void *ptr = nullptr, int param = 0); + void enet_transmit(int param = 0); void enet_misc_w(u32 data); bool enet_rx_bc_dec(unsigned const count = 1); diff --git a/src/mame/machine/ibm6580_fdc.cpp b/src/mame/machine/ibm6580_fdc.cpp index 9feceae1a1f..5abc6573705 100644 --- a/src/mame/machine/ibm6580_fdc.cpp +++ b/src/mame/machine/ibm6580_fdc.cpp @@ -69,7 +69,7 @@ void dw_fdc_device::device_reset() m_p1 = m_p2 = m_t0 = m_t1 = 0; } -void dw_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void dw_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_mcu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } diff --git a/src/mame/machine/ibm6580_fdc.h b/src/mame/machine/ibm6580_fdc.h index 33b860e146a..b5c9fa8b6fc 100644 --- a/src/mame/machine/ibm6580_fdc.h +++ b/src/mame/machine/ibm6580_fdc.h @@ -26,9 +26,9 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; - void device_start() override; - void device_reset() override; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; private: uint8_t m_bus, m_t0, m_t1, m_p1, m_p2; diff --git a/src/mame/machine/iteagle_fpga.cpp b/src/mame/machine/iteagle_fpga.cpp index 52278b7bf90..fd54ccd8ec6 100644 --- a/src/mame/machine/iteagle_fpga.cpp +++ b/src/mame/machine/iteagle_fpga.cpp @@ -103,7 +103,7 @@ void iteagle_fpga_device::device_start() // RAM defaults to base address 0x000e0000 bank_infos[2].adr = 0x000e0000 & (~(bank_infos[2].size - 1)); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(0); // Switch IO m_in_cb.resolve_all_safe(0xffff); @@ -207,7 +207,7 @@ void iteagle_fpga_device::update_sequence_eg1(uint32_t data) //------------------------------------------------- // device_timer - called when our device timer expires //------------------------------------------------- -void iteagle_fpga_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void iteagle_fpga_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { //int beamy = m_screen->vpos(); //const rectangle &visarea = m_screen->visible_area(); diff --git a/src/mame/machine/iteagle_fpga.h b/src/mame/machine/iteagle_fpga.h index 9cfacc63484..692fd531324 100644 --- a/src/mame/machine/iteagle_fpga.h +++ b/src/mame/machine/iteagle_fpga.h @@ -64,7 +64,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 void device_add_mconfig(machine_config &config) override; private: diff --git a/src/mame/machine/jaleco_ms32_sysctrl.cpp b/src/mame/machine/jaleco_ms32_sysctrl.cpp index c9007080a66..17884d9efec 100644 --- a/src/mame/machine/jaleco_ms32_sysctrl.cpp +++ b/src/mame/machine/jaleco_ms32_sysctrl.cpp @@ -197,7 +197,7 @@ void jaleco_ms32_sysctrl_device::flush_scanline_timer(int current_scanline) m_timer_scanline->adjust(m_screen->time_until_pos(next_scanline), next_scanline); } -void jaleco_ms32_sysctrl_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void jaleco_ms32_sysctrl_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/jaleco_ms32_sysctrl.h b/src/mame/machine/jaleco_ms32_sysctrl.h index d765965d633..8f10db9a887 100644 --- a/src/mame/machine/jaleco_ms32_sysctrl.h +++ b/src/mame/machine/jaleco_ms32_sysctrl.h @@ -51,7 +51,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; private: required_device<screen_device> m_screen; diff --git a/src/mame/machine/k573dio.cpp b/src/mame/machine/k573dio.cpp index 63f100d561d..0838ac404b1 100644 --- a/src/mame/machine/k573dio.cpp +++ b/src/mame/machine/k573dio.cpp @@ -179,7 +179,7 @@ void k573dio_device::device_add_mconfig(machine_config &config) DS2401(config, digital_id); } -void k573dio_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void k573dio_device::device_timer(emu_timer &timer, device_timer_id id, int param) { } diff --git a/src/mame/machine/k573dio.h b/src/mame/machine/k573dio.h index 1aa2b897368..682b8095523 100644 --- a/src/mame/machine/k573dio.h +++ b/src/mame/machine/k573dio.h @@ -75,7 +75,7 @@ protected: virtual void device_reset() override; virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) 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: memory_share_creator<uint16_t> ram; diff --git a/src/mame/machine/k573kara.cpp b/src/mame/machine/k573kara.cpp index b2663f196f3..3f38fa3ac66 100644 --- a/src/mame/machine/k573kara.cpp +++ b/src/mame/machine/k573kara.cpp @@ -112,7 +112,7 @@ void k573kara_device::device_add_mconfig(machine_config &config) duart_chan0.out_rts_callback().set("rs232_chan0", FUNC(rs232_port_device::write_rts)); } -void k573kara_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void k573kara_device::device_timer(emu_timer &timer, device_timer_id id, int param) { } diff --git a/src/mame/machine/k573kara.h b/src/mame/machine/k573kara.h index 57e53e16223..c551b5b088a 100644 --- a/src/mame/machine/k573kara.h +++ b/src/mame/machine/k573kara.h @@ -20,7 +20,7 @@ protected: virtual void device_reset() override; virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) 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: uint16_t uart_r(offs_t offset); diff --git a/src/mame/machine/k7659kb.cpp b/src/mame/machine/k7659kb.cpp index c8ce5f6725e..f5aaadde9a9 100644 --- a/src/mame/machine/k7659kb.cpp +++ b/src/mame/machine/k7659kb.cpp @@ -224,7 +224,7 @@ void k7659_keyboard_device::device_reset() m_timer->adjust(attotime::from_hz(200), 0, attotime::from_hz(200)); } -void k7659_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void k7659_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param) { uint8_t retVal = 0;//m_lookup; uint8_t a1 = ioport("A1")->read(); diff --git a/src/mame/machine/k7659kb.h b/src/mame/machine/k7659kb.h index 14b9794dd80..f48ea303d62 100644 --- a/src/mame/machine/k7659kb.h +++ b/src/mame/machine/k7659kb.h @@ -39,7 +39,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/mame/machine/kaneko_calc3.cpp b/src/mame/machine/kaneko_calc3.cpp index c3f79df2d11..5daf0485142 100644 --- a/src/mame/machine/kaneko_calc3.cpp +++ b/src/mame/machine/kaneko_calc3.cpp @@ -95,7 +95,7 @@ void kaneko_calc3_device::reset_run_timer() m_runtimer->adjust(attotime::from_hz(59.1854)); } -void kaneko_calc3_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void kaneko_calc3_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/machine/kaneko_calc3.h b/src/mame/machine/kaneko_calc3.h index 3ae8b0b78a7..ca9fc97f8ef 100644 --- a/src/mame/machine/kaneko_calc3.h +++ b/src/mame/machine/kaneko_calc3.h @@ -33,7 +33,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; private: required_device<cpu_device> m_maincpu; diff --git a/src/mame/machine/kc_keyb.cpp b/src/mame/machine/kc_keyb.cpp index 5fceb7fc8f9..e2de504f367 100644 --- a/src/mame/machine/kc_keyb.cpp +++ b/src/mame/machine/kc_keyb.cpp @@ -491,7 +491,7 @@ ioport_constructor kc_keyboard_device::device_input_ports() const // device_timer - handler timer events //------------------------------------------------- -void kc_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void kc_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/machine/kc_keyb.h b/src/mame/machine/kc_keyb.h index 3e4e53f1856..13ebee7f9e1 100644 --- a/src/mame/machine/kc_keyb.h +++ b/src/mame/machine/kc_keyb.h @@ -37,7 +37,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 add_pulse_to_transmit_buffer(int pulse_state, int pulse_number = 1); void add_bit(int bit); diff --git a/src/mame/machine/lynx.cpp b/src/mame/machine/lynx.cpp index 0292ea3ecb9..c00a1accdac 100644 --- a/src/mame/machine/lynx.cpp +++ b/src/mame/machine/lynx.cpp @@ -533,21 +533,21 @@ void lynx_state::blit_lines() } } -void lynx_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void lynx_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_BLITTER: - blitter_timer(ptr, param); + blitter_timer(param); break; case TIMER_SHOT: - timer_shot(ptr, param); + timer_shot(param); break; case TIMER_UART_LOOPBACK: - uart_loopback_timer(ptr, param); + uart_loopback_timer(param); break; case TIMER_UART: - uart_timer(ptr, param); + uart_timer(param); break; default: throw emu_fatalerror("Unknown id in lynx_state::device_timer"); diff --git a/src/mame/machine/m24_kbd.cpp b/src/mame/machine/m24_kbd.cpp index 13eb7cfc103..bc19f619453 100644 --- a/src/mame/machine/m24_kbd.cpp +++ b/src/mame/machine/m24_kbd.cpp @@ -225,7 +225,7 @@ void m24_keyboard_device::device_reset() m_kbcdata = true; } -void m24_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void m24_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_mcu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); m_out_data(1); diff --git a/src/mame/machine/m24_kbd.h b/src/mame/machine/m24_kbd.h index 5f882503cbb..69083734950 100644 --- a/src/mame/machine/m24_kbd.h +++ b/src/mame/machine/m24_kbd.h @@ -19,9 +19,9 @@ public: DECLARE_WRITE_LINE_MEMBER(data_w); protected: - void device_start() override; - void device_reset() override; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_start() override; + virtual void device_reset() 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 void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; diff --git a/src/mame/machine/m3comm.cpp b/src/mame/machine/m3comm.cpp index e1d74fc0ae3..ccd7a84ff74 100644 --- a/src/mame/machine/m3comm.cpp +++ b/src/mame/machine/m3comm.cpp @@ -194,7 +194,7 @@ uint16_t swapb16(uint16_t data) } -void m3comm_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void m3comm_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(id != TIMER_IRQ5) return; diff --git a/src/mame/machine/m3comm.h b/src/mame/machine/m3comm.h index f4fd23c1578..529c0bec578 100644 --- a/src/mame/machine/m3comm.h +++ b/src/mame/machine/m3comm.h @@ -45,7 +45,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_reset_after_children() 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; private: diff --git a/src/mame/machine/mace.cpp b/src/mame/machine/mace.cpp index 75f7fdef799..d2a1f8c12c3 100644 --- a/src/mame/machine/mace.cpp +++ b/src/mame/machine/mace.cpp @@ -440,7 +440,7 @@ void mace_device::rtc_w(offs_t offset, uint64_t data, uint64_t mem_mask) // TIMERS //************************************************************************** -void mace_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mace_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_UST) { diff --git a/src/mame/machine/mace.h b/src/mame/machine/mace.h index bac2e2cb8ca..74ed78030c8 100644 --- a/src/mame/machine/mace.h +++ b/src/mame/machine/mace.h @@ -35,7 +35,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) 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; static const device_timer_id TIMER_MSC = 0; static const device_timer_id TIMER_UST = 1; diff --git a/src/mame/machine/macrtc.cpp b/src/mame/machine/macrtc.cpp index b375098daf1..19e0909c8d5 100644 --- a/src/mame/machine/macrtc.cpp +++ b/src/mame/machine/macrtc.cpp @@ -79,7 +79,7 @@ void rtc3430042_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void rtc3430042_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void rtc3430042_device::device_timer(emu_timer &timer, device_timer_id id, int param) { advance_seconds(); } diff --git a/src/mame/machine/macrtc.h b/src/mame/machine/macrtc.h index df8dfce0ff1..bb19f49828f 100644 --- a/src/mame/machine/macrtc.h +++ b/src/mame/machine/macrtc.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; // device_rtc_interface overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; diff --git a/src/mame/machine/maple-dc.cpp b/src/mame/machine/maple-dc.cpp index f2db34fd867..60f7008d243 100644 --- a/src/mame/machine/maple-dc.cpp +++ b/src/mame/machine/maple-dc.cpp @@ -68,7 +68,7 @@ void maple_dc_device::device_reset() dma_endflag = false; } -void maple_dc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void maple_dc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { timer.adjust(attotime::never); diff --git a/src/mame/machine/maple-dc.h b/src/mame/machine/maple-dc.h index 19d0a3c7718..deb405b58d3 100644 --- a/src/mame/machine/maple-dc.h +++ b/src/mame/machine/maple-dc.h @@ -49,7 +49,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: enum { diff --git a/src/mame/machine/mapledev.cpp b/src/mame/machine/mapledev.cpp index 4279f21eb71..b2a6d11135d 100644 --- a/src/mame/machine/mapledev.cpp +++ b/src/mame/machine/mapledev.cpp @@ -26,7 +26,7 @@ void maple_device::maple_reset() device_reset(); } -void maple_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void maple_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(id != TIMER_ID) return; diff --git a/src/mame/machine/mapledev.h b/src/mame/machine/mapledev.h index cbf020a8470..77f4d95a991 100644 --- a/src/mame/machine/mapledev.h +++ b/src/mame/machine/mapledev.h @@ -26,7 +26,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; void reply_ready(); void reply_ready_with_delay(); diff --git a/src/mame/machine/mct_adr.cpp b/src/mame/machine/mct_adr.cpp index 9de43725ea9..81dc3db6907 100644 --- a/src/mame/machine/mct_adr.cpp +++ b/src/mame/machine/mct_adr.cpp @@ -185,7 +185,7 @@ void mct_adr_device::device_reset() m_interval_timer->adjust(attotime::from_msec(1), 0, attotime::from_msec(1)); - irq_check(nullptr, 0); + irq_check(0); } void mct_adr_device::set_irq_line(int irq, int state) diff --git a/src/mame/machine/megadriv.cpp b/src/mame/machine/megadriv.cpp index 320fd0677fb..c0a76898b71 100644 --- a/src/mame/machine/megadriv.cpp +++ b/src/mame/machine/megadriv.cpp @@ -79,7 +79,7 @@ void md_base_state::megadriv_68k_YM2612_write(offs_t offset, uint8_t data, uint8 // this is used by 6 button pads and gets installed in machine_start for drivers requiring it TIMER_CALLBACK_MEMBER(md_base_state::io_timeout_timer_callback) { - m_io_stage[(int)(uintptr_t)ptr] = -1; + m_io_stage[(int)param] = -1; } @@ -366,7 +366,7 @@ void md_base_state::megadrive_io_write_data_port_6button(offs_t offset, uint16_t if (((m_megadrive_io_data_regs[portnum]&0x40)==0x00) && ((data&0x40) == 0x40)) { m_io_stage[portnum]++; - m_io_timeout[portnum]->adjust(m_maincpu->cycles_to_attotime(8192)); + m_io_timeout[portnum]->adjust(m_maincpu->cycles_to_attotime(8192), portnum); } } diff --git a/src/mame/machine/micro3d.cpp b/src/mame/machine/micro3d.cpp index 8d8b60f1659..5b4758b8767 100644 --- a/src/mame/machine/micro3d.cpp +++ b/src/mame/machine/micro3d.cpp @@ -125,12 +125,12 @@ static inline int64_t normalised_multiply(int32_t a, int32_t b) return result >> 14; } -void micro3d_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void micro3d_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_MAC_DONE: - mac_done_callback(ptr, param); + mac_done_callback(param); break; default: throw emu_fatalerror("Unknown id in micro3d_state::device_timer"); diff --git a/src/mame/machine/midikbd.cpp b/src/mame/machine/midikbd.cpp index b1611d7703a..5fd3cbdb85c 100644 --- a/src/mame/machine/midikbd.cpp +++ b/src/mame/machine/midikbd.cpp @@ -13,7 +13,7 @@ midi_keyboard_device::midi_keyboard_device(const machine_config &mconfig, const { } -void midi_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void midi_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(!id) { diff --git a/src/mame/machine/midikbd.h b/src/mame/machine/midikbd.h index 494612bbe65..f9cdc05fed3 100644 --- a/src/mame/machine/midikbd.h +++ b/src/mame/machine/midikbd.h @@ -20,7 +20,7 @@ protected: void device_start() override; void tra_callback() override; void tra_complete() override; - 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: void push_tx(uint8_t data) { ++m_head %= 16; m_buffer[m_head] = data; } diff --git a/src/mame/machine/mie.cpp b/src/mame/machine/mie.cpp index 1d39098ef36..9ea80066912 100644 --- a/src/mame/machine/mie.cpp +++ b/src/mame/machine/mie.cpp @@ -143,7 +143,7 @@ void mie_device::control_w(offs_t offset, uint8_t data) } } -void mie_device::device_timer(emu_timer &_timer, device_timer_id id, int param, void *ptr) +void mie_device::device_timer(emu_timer &_timer, device_timer_id id, int param) { timer->adjust(attotime::never); if(control & CTRL_RXB) { diff --git a/src/mame/machine/mie.h b/src/mame/machine/mie.h index fbcd1e65836..ef8694a3197 100644 --- a/src/mame/machine/mie.h +++ b/src/mame/machine/mie.h @@ -83,7 +83,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/mame/machine/mm1kb.cpp b/src/mame/machine/mm1kb.cpp index c411afc615b..800b73c5b30 100644 --- a/src/mame/machine/mm1kb.cpp +++ b/src/mame/machine/mm1kb.cpp @@ -247,7 +247,7 @@ void mm1_keyboard_device::shut_down_mm1() // device_timer - handler timer events //------------------------------------------------- -void mm1_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mm1_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param) { // handle scan timer uint8_t data = 0xff; diff --git a/src/mame/machine/mm1kb.h b/src/mame/machine/mm1kb.h index 0924ac4836b..5d019c3daa4 100644 --- a/src/mame/machine/mm1kb.h +++ b/src/mame/machine/mm1kb.h @@ -48,7 +48,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; // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/mame/machine/mpu4.cpp b/src/mame/machine/mpu4.cpp index 19d00599b6f..00e59359ef8 100644 --- a/src/mame/machine/mpu4.cpp +++ b/src/mame/machine/mpu4.cpp @@ -693,7 +693,7 @@ void mpu4_state::ic24_setup() } -void mpu4_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mpu4_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/machine/naomig1.cpp b/src/mame/machine/naomig1.cpp index f40958fa50b..716714e1da2 100644 --- a/src/mame/machine/naomig1.cpp +++ b/src/mame/machine/naomig1.cpp @@ -58,7 +58,7 @@ void naomi_g1_device::device_reset() set_ext_irq(CLEAR_LINE); } -void naomi_g1_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void naomi_g1_device::device_timer(emu_timer &timer, device_timer_id id, int param) { timer.adjust(attotime::never); if(!gdst) diff --git a/src/mame/machine/naomig1.h b/src/mame/machine/naomig1.h index 3c2e2dcfd91..32560d4eab9 100644 --- a/src/mame/machine/naomig1.h +++ b/src/mame/machine/naomig1.h @@ -57,7 +57,7 @@ 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 void dma_get_position(uint8_t *&base, uint32_t &limit, bool to_maincpu) = 0; virtual void dma_advance(uint32_t size) = 0; diff --git a/src/mame/machine/nb1412m2.cpp b/src/mame/machine/nb1412m2.cpp index 75d396e2c16..9e4ea2761d3 100644 --- a/src/mame/machine/nb1412m2.cpp +++ b/src/mame/machine/nb1412m2.cpp @@ -184,7 +184,7 @@ void nb1412m2_device::device_reset() m_dac_timer->adjust(attotime::never); } -void nb1412m2_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nb1412m2_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/nb1412m2.h b/src/mame/machine/nb1412m2.h index afdbc30a8f4..ca6074c3ccb 100644 --- a/src/mame/machine/nb1412m2.h +++ b/src/mame/machine/nb1412m2.h @@ -39,7 +39,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 space_config_vector memory_space_config() const override; private: diff --git a/src/mame/machine/nb1413m3.cpp b/src/mame/machine/nb1413m3.cpp index 00f99cd24ac..b4eaff9cff0 100644 --- a/src/mame/machine/nb1413m3.cpp +++ b/src/mame/machine/nb1413m3.cpp @@ -103,12 +103,12 @@ void nb1413m3_device::device_reset() DEVICE HANDLERS *****************************************************************************/ -void nb1413m3_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nb1413m3_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_CB: - timer_callback(ptr, param); + timer_callback(param); break; default: throw emu_fatalerror("Unknown id in nb1413m3_device::device_timer"); diff --git a/src/mame/machine/nb1413m3.h b/src/mame/machine/nb1413m3.h index b2b53160d5e..63586ac182e 100644 --- a/src/mame/machine/nb1413m3.h +++ b/src/mame/machine/nb1413m3.h @@ -180,7 +180,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: diff --git a/src/mame/machine/nextkbd.cpp b/src/mame/machine/nextkbd.cpp index f19aee60ce5..eadc0606563 100644 --- a/src/mame/machine/nextkbd.cpp +++ b/src/mame/machine/nextkbd.cpp @@ -124,7 +124,7 @@ void nextkbd_device::update_mouse(bool force_update) send(); } -void nextkbd_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nextkbd_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(!fifo_empty()) send(); diff --git a/src/mame/machine/nextkbd.h b/src/mame/machine/nextkbd.h index b5578f71e09..60e6d84735e 100644 --- a/src/mame/machine/nextkbd.h +++ b/src/mame/machine/nextkbd.h @@ -35,7 +35,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 ioport_constructor device_input_ports() const override; private: diff --git a/src/mame/machine/p2000t_mdcr.cpp b/src/mame/machine/p2000t_mdcr.cpp index 568364de3cf..8e6fa4d2a83 100644 --- a/src/mame/machine/p2000t_mdcr.cpp +++ b/src/mame/machine/p2000t_mdcr.cpp @@ -132,7 +132,7 @@ void mdcr_device::device_post_load() m_cassette->seek(m_save_tape_time, SEEK_SET); } -void mdcr_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mdcr_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (!m_recording && m_cassette->motor_on()) { diff --git a/src/mame/machine/p2000t_mdcr.h b/src/mame/machine/p2000t_mdcr.h index 9b312ed42d7..d114414e257 100644 --- a/src/mame/machine/p2000t_mdcr.h +++ b/src/mame/machine/p2000t_mdcr.h @@ -75,7 +75,7 @@ protected: virtual void device_start() override; virtual void device_pre_save() 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; virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp index f026f37cfd1..288bdb476ac 100644 --- a/src/mame/machine/pc1512kb.cpp +++ b/src/mame/machine/pc1512kb.cpp @@ -256,7 +256,7 @@ void pc1512_keyboard_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void pc1512_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pc1512_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (!m_clock_in) { diff --git a/src/mame/machine/pc1512kb.h b/src/mame/machine/pc1512kb.h index bbd6fb441f9..538f8c51998 100644 --- a/src/mame/machine/pc1512kb.h +++ b/src/mame/machine/pc1512kb.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; // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/mame/machine/pc80s31k.cpp b/src/mame/machine/pc80s31k.cpp index eb05acb8cfd..7ecafea85a8 100644 --- a/src/mame/machine/pc80s31k.cpp +++ b/src/mame/machine/pc80s31k.cpp @@ -295,7 +295,7 @@ void pc80s31_device::device_add_mconfig(machine_config &config) // device_timer - device-specific timers //------------------------------------------------- -void pc80s31_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pc80s31_device::device_timer(emu_timer &timer, device_timer_id id, int param) { assert(id == 0); diff --git a/src/mame/machine/pc80s31k.h b/src/mame/machine/pc80s31k.h index b21d2845daf..e1050f60799 100644 --- a/src/mame/machine/pc80s31k.h +++ b/src/mame/machine/pc80s31k.h @@ -38,7 +38,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual const tiny_rom_entry *device_rom_region() const 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 fdc_io(address_map &map); diff --git a/src/mame/machine/pc9801_kbd.cpp b/src/mame/machine/pc9801_kbd.cpp index a5e715cc5c2..12dc4eaa2e9 100644 --- a/src/mame/machine/pc9801_kbd.cpp +++ b/src/mame/machine/pc9801_kbd.cpp @@ -265,7 +265,7 @@ void pc9801_kbd_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void pc9801_kbd_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pc9801_kbd_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if(id == RX_TIMER) { diff --git a/src/mame/machine/pc9801_kbd.h b/src/mame/machine/pc9801_kbd.h index 3c5c811c9d1..80c8aaa81d2 100644 --- a/src/mame/machine/pc9801_kbd.h +++ b/src/mame/machine/pc9801_kbd.h @@ -37,7 +37,7 @@ protected: virtual void device_validity_check(validity_checker &valid) 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; devcb_write_line m_write_irq; diff --git a/src/mame/machine/pce220_ser.cpp b/src/mame/machine/pce220_ser.cpp index a6459ebac6c..7854fdc8c09 100644 --- a/src/mame/machine/pce220_ser.cpp +++ b/src/mame/machine/pce220_ser.cpp @@ -88,7 +88,7 @@ void pce220_serial_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void pce220_serial_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pce220_serial_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_SEND && m_enabled) { diff --git a/src/mame/machine/pce220_ser.h b/src/mame/machine/pce220_ser.h index c3d7e5af21e..4a5f13be782 100644 --- a/src/mame/machine/pce220_ser.h +++ b/src/mame/machine/pce220_ser.h @@ -59,7 +59,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 device state diff --git a/src/mame/machine/pmd85.cpp b/src/mame/machine/pmd85.cpp index 93a9edacc8b..c2895d0a7d3 100644 --- a/src/mame/machine/pmd85.cpp +++ b/src/mame/machine/pmd85.cpp @@ -620,12 +620,12 @@ void pmd85_state::mato_io_w(offs_t offset, uint8_t data) } } -void pmd85_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pmd85_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_CASSETTE: - cassette_timer_callback(ptr, param); + cassette_timer_callback(param); break; default: throw emu_fatalerror("Unknown id in pmd85_state::device_timer"); diff --git a/src/mame/machine/pocketc.cpp b/src/mame/machine/pocketc.cpp index 48ac3aa3d08..3530366960d 100644 --- a/src/mame/machine/pocketc.cpp +++ b/src/mame/machine/pocketc.cpp @@ -14,7 +14,7 @@ READ_LINE_MEMBER(pocketc_state::brk_r) return BIT(m_extra->read(), 0); } -void pocketc_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pocketc_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/psxcd.cpp b/src/mame/machine/psxcd.cpp index 6c9580c3bd0..0d903ebc874 100644 --- a/src/mame/machine/psxcd.cpp +++ b/src/mame/machine/psxcd.cpp @@ -116,6 +116,7 @@ void psxcd_device::device_start() { m_timers[i] = timer_alloc(i); m_timerinuse[i] = false; + m_results[i] = nullptr; } save_item(NAME(cmdbuf)); @@ -145,8 +146,8 @@ void psxcd_device::device_stop() { for (int i = 0; i < MAX_PSXCD_TIMERS; i++) { - if(m_timerinuse[i] && m_timers[i]->ptr()) - delete (command_result *)m_timers[i]->ptr(); + if(m_timerinuse[i] && m_results[i]) + delete m_results[i]; } while(res_queue) { @@ -163,8 +164,8 @@ void psxcd_device::device_reset() for (int i = 0; i < MAX_PSXCD_TIMERS; i++) { - if(m_timerinuse[i] && m_timers[i]->ptr()) - delete (command_result *)m_timers[i]->ptr(); + if(m_timerinuse[i] && m_results[i]) + delete m_results[i]; m_timers[i]->adjust(attotime::never, 0, attotime::never); m_timerinuse[i] = false; } @@ -1182,7 +1183,7 @@ void psxcd_device::stop_read() m_spu->flush_cdda(sector); } -void psxcd_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void psxcd_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { if (!m_timerinuse[tid]) { @@ -1197,7 +1198,7 @@ void psxcd_device::device_timer(emu_timer &timer, device_timer_id tid, int param { verboselog(*this, 1, "psxcd: event cmd complete\n"); - cmd_complete((command_result *)ptr); + cmd_complete(m_results[tid]); break; } @@ -1225,7 +1226,7 @@ int psxcd_device::add_system_event(int type, uint64_t t, command_result *ptr) if(!m_timerinuse[i]) { m_timers[i]->adjust(attotime::from_hz(hz), type, attotime::never); - m_timers[i]->set_ptr(ptr); + m_results[i] = ptr; m_timerinuse[i] = true; return i; } diff --git a/src/mame/machine/psxcd.h b/src/mame/machine/psxcd.h index b8146a3bc42..9e5dc1a12bc 100644 --- a/src/mame/machine/psxcd.h +++ b/src/mame/machine/psxcd.h @@ -35,7 +35,7 @@ protected: virtual void device_start() override; virtual void device_stop() 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: @@ -149,6 +149,7 @@ private: uint32_t m_sysclock; emu_timer *m_timers[MAX_PSXCD_TIMERS]; bool m_timerinuse[MAX_PSXCD_TIMERS]; + command_result *m_results[MAX_PSXCD_TIMERS]; devcb_write_line m_irq_handler; required_device<cpu_device> m_maincpu; diff --git a/src/mame/machine/qx10kbd.cpp b/src/mame/machine/qx10kbd.cpp index 9692f9b13a5..a3ffff7c637 100644 --- a/src/mame/machine/qx10kbd.cpp +++ b/src/mame/machine/qx10kbd.cpp @@ -37,7 +37,7 @@ WRITE_LINE_MEMBER(qx10_keyboard_device::input_txd) m_rxd = state; } -void qx10_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void qx10_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param) { m_clk_state = !m_clk_state; } diff --git a/src/mame/machine/qx10kbd.h b/src/mame/machine/qx10kbd.h index 84961e060d7..84cfd0be77c 100644 --- a/src/mame/machine/qx10kbd.h +++ b/src/mame/machine/qx10kbd.h @@ -22,7 +22,7 @@ public: protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) 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_start() override; private: diff --git a/src/mame/machine/rmnimbus.cpp b/src/mame/machine/rmnimbus.cpp index d4b4bbfed43..9805cb0a4ef 100644 --- a/src/mame/machine/rmnimbus.cpp +++ b/src/mame/machine/rmnimbus.cpp @@ -1669,7 +1669,7 @@ WRITE_LINE_MEMBER(rmnimbus_state::nimbus_msm5205_vck) external_int(EXTERNAL_INT_MSM5205,state); } -void rmnimbus_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void rmnimbus_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/machine/saa7191.cpp b/src/mame/machine/saa7191.cpp index 7298cc8b1d1..96a2e72315b 100644 --- a/src/mame/machine/saa7191.cpp +++ b/src/mame/machine/saa7191.cpp @@ -71,7 +71,7 @@ void saa7191_device::device_reset() m_input_clock->adjust(attotime::never); } -void saa7191_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void saa7191_device::device_timer(emu_timer &timer, device_timer_id id, int param) { } diff --git a/src/mame/machine/saa7191.h b/src/mame/machine/saa7191.h index 34e9bec42fb..51a16b43a3b 100644 --- a/src/mame/machine/saa7191.h +++ b/src/mame/machine/saa7191.h @@ -39,7 +39,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: void reg_w(uint8_t data); diff --git a/src/mame/machine/sgi.cpp b/src/mame/machine/sgi.cpp index 2abbec6849d..21eb109832d 100644 --- a/src/mame/machine/sgi.cpp +++ b/src/mame/machine/sgi.cpp @@ -721,7 +721,7 @@ void sgi_mc_device::write(offs_t offset, uint32_t data, uint32_t mem_mask) } } -void sgi_mc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sgi_mc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_RPSS) { diff --git a/src/mame/machine/sgi.h b/src/mame/machine/sgi.h index 3e4ae444707..0f5fd99e670 100644 --- a/src/mame/machine/sgi.h +++ b/src/mame/machine/sgi.h @@ -41,7 +41,7 @@ protected: virtual void device_resolve_objects() 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; static const device_timer_id TIMER_RPSS = 0; static const device_timer_id TIMER_DMA = 1; diff --git a/src/mame/machine/snes.cpp b/src/mame/machine/snes.cpp index 23e474e11ee..c5aa0ad203c 100644 --- a/src/mame/machine/snes.cpp +++ b/src/mame/machine/snes.cpp @@ -52,30 +52,30 @@ void snes_state::scpu_irq_refresh() } -void snes_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void snes_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_NMI_TICK: - snes_nmi_tick(ptr, param); + snes_nmi_tick(param); break; case TIMER_HIRQ_TICK: - snes_hirq_tick_callback(ptr, param); + snes_hirq_tick_callback(param); break; case TIMER_RESET_OAM_ADDRESS: - snes_reset_oam_address(ptr, param); + snes_reset_oam_address(param); break; case TIMER_RESET_HDMA: - snes_reset_hdma(ptr, param); + snes_reset_hdma(param); break; case TIMER_UPDATE_IO: - snes_update_io(ptr, param); + snes_update_io(param); break; case TIMER_SCANLINE_TICK: - snes_scanline_tick(ptr, param); + snes_scanline_tick(param); break; case TIMER_HBLANK_TICK: - snes_hblank_tick(ptr, param); + snes_hblank_tick(param); break; default: throw emu_fatalerror("Unknown id in snes_state::device_timer"); diff --git a/src/mame/machine/sorcerer.cpp b/src/mame/machine/sorcerer.cpp index 84a696c1040..e134321e63a 100644 --- a/src/mame/machine/sorcerer.cpp +++ b/src/mame/machine/sorcerer.cpp @@ -28,15 +28,15 @@ TIMER_CALLBACK_MEMBER(sorcerer_state::serial_tc) } -void sorcerer_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void sorcerer_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_SERIAL: - serial_tc(ptr, param); + serial_tc(param); break; case TIMER_CASSETTE: - cassette_tc(ptr, param); + cassette_tc(param); break; default: throw emu_fatalerror("Unknown id in sorcerer_state::device_timer"); diff --git a/src/mame/machine/stfight.cpp b/src/mame/machine/stfight.cpp index e3f3d01a193..c20c656e0d5 100644 --- a/src/mame/machine/stfight.cpp +++ b/src/mame/machine/stfight.cpp @@ -109,7 +109,7 @@ void stfight_state::stfight_bank_w(uint8_t data) * CPU 1 timed interrupt - 60Hz??? */ -void stfight_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void stfight_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/ti85.cpp b/src/mame/machine/ti85.cpp index d3c3bb93636..a9c473ba3c5 100644 --- a/src/mame/machine/ti85.cpp +++ b/src/mame/machine/ti85.cpp @@ -71,7 +71,7 @@ TIMER_CALLBACK_MEMBER(ti85_state::ti83_timer2_callback) } } -void ti85_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ti85_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/upd65031.cpp b/src/mame/machine/upd65031.cpp index e9dffbfb359..f8dcbbf4797 100644 --- a/src/mame/machine/upd65031.cpp +++ b/src/mame/machine/upd65031.cpp @@ -283,7 +283,7 @@ void upd65031_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void upd65031_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void upd65031_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/upd65031.h b/src/mame/machine/upd65031.h index 153f6a1faf8..730da988e09 100644 --- a/src/mame/machine/upd65031.h +++ b/src/mame/machine/upd65031.h @@ -49,7 +49,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: inline void interrupt_refresh(); diff --git a/src/mame/machine/vectrex.cpp b/src/mame/machine/vectrex.cpp index e314e488ed8..bb945b53203 100644 --- a/src/mame/machine/vectrex.cpp +++ b/src/mame/machine/vectrex.cpp @@ -48,30 +48,30 @@ static const double unknown_game_angles[3] = {0,0.16666666, 0.33333333}; -void vectrex_base_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void vectrex_base_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_VECTREX_IMAGER_CHANGE_COLOR: - vectrex_imager_change_color(ptr, param); + vectrex_imager_change_color(param); break; case TIMER_UPDATE_LEVEL: - update_level(ptr, param); + update_level(param); break; case TIMER_VECTREX_IMAGER_EYE: - vectrex_imager_eye(ptr, param); + vectrex_imager_eye(param); break; case TIMER_LIGHTPEN_TRIGGER: - lightpen_trigger(ptr, param); + lightpen_trigger(param); break; case TIMER_VECTREX_REFRESH: - vectrex_refresh(ptr, param); + vectrex_refresh(param); break; case TIMER_VECTREX_ZERO_INTEGRATORS: - vectrex_zero_integrators(ptr, param); + vectrex_zero_integrators(param); break; case TIMER_UPDATE_SIGNAL: - update_signal(ptr, param); + update_signal(param); break; default: fatalerror("Unknown id in vectrex_base_state::device_timer"); @@ -232,8 +232,7 @@ TIMER_CALLBACK_MEMBER(vectrex_base_state::vectrex_imager_change_color) TIMER_CALLBACK_MEMBER(vectrex_base_state::update_level) { - if (ptr) - * (uint8_t *) ptr = param; + m_imager_pinlevel = param; } @@ -258,7 +257,7 @@ TIMER_CALLBACK_MEMBER(vectrex_base_state::vectrex_imager_eye) m_via6522_0->write_ca1(1); m_via6522_0->write_ca1(0); m_imager_pinlevel |= 0x80; - timer_set(attotime::from_double(rtime / 360.0), TIMER_UPDATE_LEVEL, 0, &m_imager_pinlevel); + timer_set(attotime::from_double(rtime / 360.0), TIMER_UPDATE_LEVEL, 0); } } } diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp index c4b7adc66bb..413fe8373a0 100644 --- a/src/mame/machine/victor9k_fdc.cpp +++ b/src/mame/machine/victor9k_fdc.cpp @@ -341,7 +341,7 @@ void victor_9000_fdc_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void victor_9000_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void victor_9000_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/victor9k_fdc.h b/src/mame/machine/victor9k_fdc.h index 13077427979..67105ba4318 100644 --- a/src/mame/machine/victor9k_fdc.h +++ b/src/mame/machine/victor9k_fdc.h @@ -46,7 +46,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/mame/machine/vino.cpp b/src/mame/machine/vino.cpp index 4d4085ebd8e..ef9d72acc68 100644 --- a/src/mame/machine/vino.cpp +++ b/src/mame/machine/vino.cpp @@ -146,7 +146,7 @@ void vino_device::device_add_mconfig(machine_config &config) IMAGE_AVIVIDEO(config, m_avivideo); } -void vino_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void vino_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == TIMER_FETCH_CHA || id == TIMER_FETCH_CHB) fetch_pixel((int)id); diff --git a/src/mame/machine/vino.h b/src/mame/machine/vino.h index b1f0d2e0cd7..f88e406bc38 100644 --- a/src/mame/machine/vino.h +++ b/src/mame/machine/vino.h @@ -37,7 +37,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) 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: static constexpr device_timer_id TIMER_FETCH_CHA = 0; diff --git a/src/mame/machine/wpc.cpp b/src/mame/machine/wpc.cpp index ce4a29d981d..1d996aafdfc 100644 --- a/src/mame/machine/wpc.cpp +++ b/src/mame/machine/wpc.cpp @@ -54,7 +54,7 @@ void wpc_device::device_reset() m_alpha_pos = 0; } -void wpc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void wpc_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/machine/wpc.h b/src/mame/machine/wpc.h index 6bdb718aea7..a7419aa9100 100644 --- a/src/mame/machine/wpc.h +++ b/src/mame/machine/wpc.h @@ -111,7 +111,7 @@ 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; private: uint8_t m_shift_addr_high; diff --git a/src/mame/machine/wpc_lamp.cpp b/src/mame/machine/wpc_lamp.cpp index feee50cc926..8aaa2455285 100644 --- a/src/mame/machine/wpc_lamp.cpp +++ b/src/mame/machine/wpc_lamp.cpp @@ -57,7 +57,7 @@ void wpc_lamp_device::device_reset() timer->adjust(attotime::from_hz(60), 0, attotime::from_hz(60)); } -void wpc_lamp_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void wpc_lamp_device::device_timer(emu_timer &timer, device_timer_id id, int param) { for(int i=0; i<64; i++) { uint8_t s = state[i]; diff --git a/src/mame/machine/wpc_lamp.h b/src/mame/machine/wpc_lamp.h index e41ff339b0a..85ff587c0da 100644 --- a/src/mame/machine/wpc_lamp.h +++ b/src/mame/machine/wpc_lamp.h @@ -27,7 +27,7 @@ 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; void update(); }; diff --git a/src/mame/machine/wpc_out.cpp b/src/mame/machine/wpc_out.cpp index d23bbb83269..9de9b6988ac 100644 --- a/src/mame/machine/wpc_out.cpp +++ b/src/mame/machine/wpc_out.cpp @@ -132,7 +132,7 @@ void wpc_out_device::device_reset() timer->adjust(attotime::from_hz(10), 0, attotime::from_hz(10)); } -void wpc_out_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void wpc_out_device::device_timer(emu_timer &timer, device_timer_id id, int param) { gi_update(); for(int i=0; i<gi_count; i++) { diff --git a/src/mame/machine/wpc_out.h b/src/mame/machine/wpc_out.h index cbbb3b7ce72..91602f0ba54 100644 --- a/src/mame/machine/wpc_out.h +++ b/src/mame/machine/wpc_out.h @@ -45,7 +45,7 @@ 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; void gi_update(); }; diff --git a/src/mame/machine/xbox_pci.cpp b/src/mame/machine/xbox_pci.cpp index cebd51f9dd7..6027ab02591 100644 --- a/src/mame/machine/xbox_pci.cpp +++ b/src/mame/machine/xbox_pci.cpp @@ -757,10 +757,10 @@ void mcpx_ohci_device::device_config_complete() } } -void mcpx_ohci_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mcpx_ohci_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (ohci_usb) - ohci_usb->timer(timer, id, param, ptr); + ohci_usb->timer(timer, id, param); } uint32_t mcpx_ohci_device::ohci_r(offs_t offset) @@ -883,7 +883,7 @@ void mcpx_apu_device::device_reset() pci_device::device_reset(); } -void mcpx_apu_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mcpx_apu_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int cmd; int bb, b, v; diff --git a/src/mame/machine/xbox_usb.cpp b/src/mame/machine/xbox_usb.cpp index 59883d2ca0b..5b2dca2be6e 100644 --- a/src/mame/machine/xbox_usb.cpp +++ b/src/mame/machine/xbox_usb.cpp @@ -220,7 +220,7 @@ void ohci_usb_controller::write(offs_t offset, uint32_t data) ohcist.hc_regs[offset] = data; } -void ohci_usb_controller::timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ohci_usb_controller::timer(emu_timer &timer, device_timer_id id, int param) { uint32_t hcca; uint32_t plh; diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp index af61fde4a04..8c9519d300f 100644 --- a/src/mame/machine/z80ne.cpp +++ b/src/mame/machine/z80ne.cpp @@ -144,7 +144,7 @@ TIMER_CALLBACK_MEMBER(z80ne_state::z80ne_kbd_scan) } } -void z80ne_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void z80ne_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/znmcu.cpp b/src/mame/machine/znmcu.cpp index 1b21d956e1b..a008ae0f954 100644 --- a/src/mame/machine/znmcu.cpp +++ b/src/mame/machine/znmcu.cpp @@ -96,7 +96,7 @@ WRITE_LINE_MEMBER(znmcu_device::write_clock) } } -void znmcu_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +void znmcu_device::device_timer(emu_timer &timer, device_timer_id tid, int param) { m_dsr_handler(param); diff --git a/src/mame/machine/znmcu.h b/src/mame/machine/znmcu.h index 4207cae2038..f956ae87115 100644 --- a/src/mame/machine/znmcu.h +++ b/src/mame/machine/znmcu.h @@ -26,7 +26,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: devcb_read8 m_dsw_handler; diff --git a/src/mame/machine/zx8302.cpp b/src/mame/machine/zx8302.cpp index 4ecab2f89a7..b2fd9acbfe2 100644 --- a/src/mame/machine/zx8302.cpp +++ b/src/mame/machine/zx8302.cpp @@ -220,7 +220,7 @@ void zx8302_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void zx8302_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void zx8302_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/machine/zx8302.h b/src/mame/machine/zx8302.h index 22ce85ba4b1..7aa922a4b3a 100644 --- a/src/mame/machine/zx8302.h +++ b/src/mame/machine/zx8302.h @@ -89,7 +89,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; // device_serial_interface overrides virtual void tra_callback() override; diff --git a/src/mame/video/3dom2_te.cpp b/src/mame/video/3dom2_te.cpp index 96285178bbd..8bd8412a8ad 100644 --- a/src/mame/video/3dom2_te.cpp +++ b/src/mame/video/3dom2_te.cpp @@ -3896,7 +3896,7 @@ void m2_te_device::load_texture() TIMERS ***************************************************************************/ -void m2_te_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void m2_te_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/3dom2_te.h b/src/mame/video/3dom2_te.h index cf8d84cbf8b..8c25c45c043 100644 --- a/src/mame/video/3dom2_te.h +++ b/src/mame/video/3dom2_te.h @@ -48,7 +48,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; private: diff --git a/src/mame/video/733_asr.cpp b/src/mame/video/733_asr.cpp index c19d45b60c5..74ebeb66ecf 100644 --- a/src/mame/video/733_asr.cpp +++ b/src/mame/video/733_asr.cpp @@ -407,7 +407,7 @@ void asr733_device::refresh(bitmap_ind16 &bitmap, int x, int y) /* Time callbacks */ -void asr733_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void asr733_device::device_timer(emu_timer &timer, device_timer_id id, int param) { check_keyboard(); m_lineint_line(ASSERT_LINE); diff --git a/src/mame/video/733_asr.h b/src/mame/video/733_asr.h index 540e6cb58d0..aa004ff0579 100644 --- a/src/mame/video/733_asr.h +++ b/src/mame/video/733_asr.h @@ -32,7 +32,7 @@ protected: void device_start() override; void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; - 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; ioport_constructor device_input_ports() const override; private: diff --git a/src/mame/video/911_vdt.cpp b/src/mame/video/911_vdt.cpp index 46d2383b644..c95c9180d02 100644 --- a/src/mame/video/911_vdt.cpp +++ b/src/mame/video/911_vdt.cpp @@ -255,7 +255,7 @@ void vdt911_device::device_reset() /* Timer callbacks */ -void vdt911_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void vdt911_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/911_vdt.h b/src/mame/video/911_vdt.h index cb5e2372ff8..b1d364d4053 100644 --- a/src/mame/video/911_vdt.h +++ b/src/mame/video/911_vdt.h @@ -60,7 +60,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; ioport_constructor device_input_ports() const override; - 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: void refresh(bitmap_ind16 &bitmap, const rectangle &cliprect, int x, int y); diff --git a/src/mame/video/antic.cpp b/src/mame/video/antic.cpp index 78109b59f6f..1917ae15b80 100644 --- a/src/mame/video/antic.cpp +++ b/src/mame/video/antic.cpp @@ -1936,21 +1936,21 @@ void antic_device::linerefresh() #define ANTIC_TIME_FROM_CYCLES(cycles) \ (attotime)(screen().scan_period() * (cycles) / CYCLES_PER_LINE) -void antic_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void antic_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_CYCLE_STEAL: - steal_cycles(ptr, param); + steal_cycles(param); break; case TIMER_ISSUE_DLI: - issue_dli(ptr, param); + issue_dli(param); break; case TIMER_LINE_REND: - scanline_render(ptr, param); + scanline_render(param); break; case TIMER_LINE_DONE: - line_done(ptr, param); + line_done(param); break; } } diff --git a/src/mame/video/antic.h b/src/mame/video/antic.h index f1371c9527e..7d3290f5cab 100644 --- a/src/mame/video/antic.h +++ b/src/mame/video/antic.h @@ -48,7 +48,7 @@ public: // 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; template <typename T> void set_gtia_tag(T &&tag) { m_gtia.set_tag(std::forward<T>(tag)); } diff --git a/src/mame/video/astrocde.cpp b/src/mame/video/astrocde.cpp index 4b4367b2959..fc49e7d4d6f 100644 --- a/src/mame/video/astrocde.cpp +++ b/src/mame/video/astrocde.cpp @@ -379,7 +379,7 @@ uint32_t astrocde_state::screen_update_profpac(screen_device &screen, bitmap_ind * *************************************/ -void astrocde_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void astrocde_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -387,7 +387,7 @@ void astrocde_state::device_timer(emu_timer &timer, device_timer_id id, int para m_maincpu->set_input_line(0, CLEAR_LINE); break; case TIMER_SCANLINE: - scanline_callback(ptr, param); + scanline_callback(param); break; default: throw emu_fatalerror("Unknown id in astrocde_state::device_timer"); diff --git a/src/mame/video/atarimo.cpp b/src/mame/video/atarimo.cpp index 8611de1bbb4..f0771aeedad 100644 --- a/src/mame/video/atarimo.cpp +++ b/src/mame/video/atarimo.cpp @@ -356,7 +356,7 @@ void atari_motion_objects_device::device_reset() // calbacks //------------------------------------------------- -void atari_motion_objects_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void atari_motion_objects_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/atarimo.h b/src/mame/video/atarimo.h index 3f5c72a5f48..4f50c339c9a 100644 --- a/src/mame/video/atarimo.h +++ b/src/mame/video/atarimo.h @@ -116,7 +116,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: // timer IDs diff --git a/src/mame/video/atarivad.cpp b/src/mame/video/atarivad.cpp index 40c418945e7..f3f4e94315b 100644 --- a/src/mame/video/atarivad.cpp +++ b/src/mame/video/atarivad.cpp @@ -212,7 +212,7 @@ void atari_vad_device::device_reset() // calbacks //------------------------------------------------- -void atari_vad_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void atari_vad_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/atarivad.h b/src/mame/video/atarivad.h index b0ea3dcac70..d2027d28b5b 100644 --- a/src/mame/video/atarivad.h +++ b/src/mame/video/atarivad.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; private: // timer IDs diff --git a/src/mame/video/blstroid.cpp b/src/mame/video/blstroid.cpp index 76fab2db46b..27ae443cdef 100644 --- a/src/mame/video/blstroid.cpp +++ b/src/mame/video/blstroid.cpp @@ -86,7 +86,7 @@ void blstroid_state::video_start() * *************************************/ -void blstroid_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void blstroid_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -99,7 +99,7 @@ void blstroid_state::device_timer(emu_timer &timer, device_timer_id id, int para m_maincpu->set_input_line(M68K_IRQ_1, ASSERT_LINE); break; default: - atarigen_state::device_timer(timer, id, param, ptr); + atarigen_state::device_timer(timer, id, param); break; } } diff --git a/src/mame/video/dcheese.cpp b/src/mame/video/dcheese.cpp index f851be6c49d..71219b87109 100644 --- a/src/mame/video/dcheese.cpp +++ b/src/mame/video/dcheese.cpp @@ -64,7 +64,7 @@ void dcheese_state::update_scanline_irq() } -void dcheese_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void dcheese_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/dpb_combiner.cpp b/src/mame/video/dpb_combiner.cpp index 48440eeec02..a04c83246c8 100644 --- a/src/mame/video/dpb_combiner.cpp +++ b/src/mame/video/dpb_combiner.cpp @@ -141,7 +141,7 @@ void dpb7000_combiner_card_device::device_add_mconfig(machine_config &config) //m_screen->set_screen_update(FUNC(dpb7000_combiner_card_device::screen_update)); } -void dpb7000_combiner_card_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void dpb7000_combiner_card_device::device_timer(emu_timer &timer, device_timer_id id, int param) { if (id == FSCK_TIMER) { diff --git a/src/mame/video/fmtowns.cpp b/src/mame/video/fmtowns.cpp index b45cd75d6d2..cd2bb5cc62b 100644 --- a/src/mame/video/fmtowns.cpp +++ b/src/mame/video/fmtowns.cpp @@ -1483,7 +1483,7 @@ INTERRUPT_GEN_MEMBER(towns_state::towns_vsync_irq) m_pic_slave->ir3_w(1); // IRQ11 = VSync if(IRQ_LOG) logerror("PIC: IRQ11 (VSync) set high\n"); m_video.towns_vblank_flag = 1; - machine().scheduler().timer_set(m_screen->time_until_vblank_end(), timer_expired_delegate(FUNC(towns_state::towns_vblank_end),this), 0, (void*)m_pic_slave); + machine().scheduler().timer_set(m_screen->time_until_vblank_end(), timer_expired_delegate(FUNC(towns_state::towns_vblank_end),this)); if(m_video.towns_tvram_enable) draw_text_layer(); if((m_video.towns_sprite_reg[1] & 0x80) && !m_video.towns_sprite_flag) diff --git a/src/mame/video/gameplan.cpp b/src/mame/video/gameplan.cpp index 197ab20b8ed..815c0428403 100644 --- a/src/mame/video/gameplan.cpp +++ b/src/mame/video/gameplan.cpp @@ -37,15 +37,15 @@ driver by Chris Moore * *************************************/ -void gameplan_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void gameplan_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_CLEAR_SCREEN_DONE: - clear_screen_done_callback(ptr, param); + clear_screen_done_callback(param); break; case TIMER_VIA_IRQ_DELAYED: - via_irq_delayed(ptr, param); + via_irq_delayed(param); break; default: throw emu_fatalerror("Unknown id in gameplan_state::device_timer"); diff --git a/src/mame/video/gic.cpp b/src/mame/video/gic.cpp index 65deaf5b7f7..951de465997 100644 --- a/src/mame/video/gic.cpp +++ b/src/mame/video/gic.cpp @@ -239,7 +239,7 @@ uint32_t gic_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, /* AUDIO SECTION */ -void gic_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void gic_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch ( id ) { diff --git a/src/mame/video/gic.h b/src/mame/video/gic.h index 579ddec7b12..b13cd358cb5 100644 --- a/src/mame/video/gic.h +++ b/src/mame/video/gic.h @@ -68,7 +68,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/mame/video/gime.cpp b/src/mame/video/gime.cpp index efb4b6a0bcd..db038c8ea01 100644 --- a/src/mame/video/gime.cpp +++ b/src/mame/video/gime.cpp @@ -344,7 +344,7 @@ void gime_device::device_reset(void) // device_timer - handle timer callbacks //------------------------------------------------- -void gime_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void gime_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { @@ -353,7 +353,7 @@ void gime_device::device_timer(emu_timer &timer, device_timer_id id, int param, break; default: - super::device_timer(timer, id, param, ptr); + super::device_timer(timer, id, param); break; } } diff --git a/src/mame/video/gime.h b/src/mame/video/gime.h index 15e697213d2..c09aa5b6e49 100644 --- a/src/mame/video/gime.h +++ b/src/mame/video/gime.h @@ -66,7 +66,7 @@ protected: // device-level overrides virtual void device_start(void) override; virtual void device_reset(void) 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_pre_save(void) override; virtual void device_post_load(void) override; virtual ioport_constructor device_input_ports() const override; diff --git a/src/mame/video/gp9001.cpp b/src/mame/video/gp9001.cpp index 5c4b709c57b..b2ba965f086 100644 --- a/src/mame/video/gp9001.cpp +++ b/src/mame/video/gp9001.cpp @@ -890,7 +890,7 @@ void gp9001vdp_device::screen_eof(void) } -void gp9001vdp_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void gp9001vdp_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h index 2b737aba8f2..c404e455b2c 100644 --- a/src/mame/video/gp9001.h +++ b/src/mame/video/gp9001.h @@ -66,7 +66,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 space_config_vector memory_space_config() const override; diff --git a/src/mame/video/hyhoo.cpp b/src/mame/video/hyhoo.cpp index 6ddae07c1e0..5c31004fa71 100644 --- a/src/mame/video/hyhoo.cpp +++ b/src/mame/video/hyhoo.cpp @@ -53,7 +53,7 @@ void hyhoo_state::hyhoo_romsel_w(uint8_t data) } } -void hyhoo_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void hyhoo_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/itech8.cpp b/src/mame/video/itech8.cpp index 13493d10a24..f0b27c88e3c 100644 --- a/src/mame/video/itech8.cpp +++ b/src/mame/video/itech8.cpp @@ -541,7 +541,7 @@ void grmatch_state::xscroll_w(uint8_t data) } -void grmatch_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void grmatch_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { @@ -549,7 +549,7 @@ void grmatch_state::device_timer(emu_timer &timer, device_timer_id id, int param palette_update(); break; default: - itech8_state::device_timer(timer, id, param, ptr); + itech8_state::device_timer(timer, id, param); break; } } diff --git a/src/mame/video/jag_blitter.cpp b/src/mame/video/jag_blitter.cpp index f318808ad45..bda83ece51d 100644 --- a/src/mame/video/jag_blitter.cpp +++ b/src/mame/video/jag_blitter.cpp @@ -153,7 +153,7 @@ inline void jag_blitter_device::command_done() // ... } -void jag_blitter_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void jag_blitter_device::device_timer(emu_timer &timer, device_timer_id id, int param) { command_run(); } diff --git a/src/mame/video/jag_blitter.h b/src/mame/video/jag_blitter.h index c16daf226eb..dd7c4247cf7 100644 --- a/src/mame/video/jag_blitter.h +++ b/src/mame/video/jag_blitter.h @@ -41,7 +41,7 @@ protected: //virtual void device_validity_check(validity_checker &valid) const override; virtual void device_start() override; virtual void device_reset() override; - 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 space_config_vector memory_space_config() const override; const address_space_config m_space_config; diff --git a/src/mame/video/jaguar.cpp b/src/mame/video/jaguar.cpp index b9a9b89cffb..9f47f313116 100644 --- a/src/mame/video/jaguar.cpp +++ b/src/mame/video/jaguar.cpp @@ -732,7 +732,7 @@ uint32_t jaguar_state::cojag_gun_input_r(offs_t offset) * *************************************/ -void jaguar_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void jaguar_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/k053250_ps.cpp b/src/mame/video/k053250_ps.cpp index dfb35d4531a..1327990599b 100644 --- a/src/mame/video/k053250_ps.cpp +++ b/src/mame/video/k053250_ps.cpp @@ -498,7 +498,7 @@ uint16_t k053250ps_device::reg_r(offs_t offset) } -void k053250ps_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void k053250ps_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(m_timer_lvcdma_state) { diff --git a/src/mame/video/k053250_ps.h b/src/mame/video/k053250_ps.h index 1e3451970a3..0c274ff60a4 100644 --- a/src/mame/video/k053250_ps.h +++ b/src/mame/video/k053250_ps.h @@ -45,7 +45,7 @@ public: protected: // device-level overrides - 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_start() override; virtual void device_reset() override; diff --git a/src/mame/video/lethalj.cpp b/src/mame/video/lethalj.cpp index 0a2f83e7d30..1cab4bb0e60 100644 --- a/src/mame/video/lethalj.cpp +++ b/src/mame/video/lethalj.cpp @@ -104,7 +104,7 @@ void lethalj_state::video_start() * *************************************/ -void lethalj_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void lethalj_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/m92.cpp b/src/mame/video/m92.cpp index d04543a4103..b80c0c47da7 100644 --- a/src/mame/video/m92.cpp +++ b/src/mame/video/m92.cpp @@ -46,7 +46,7 @@ /*****************************************************************************/ -void m92_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void m92_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/midtunit.cpp b/src/mame/video/midtunit.cpp index f792cb075c5..1e6d4e812da 100644 --- a/src/mame/video/midtunit.cpp +++ b/src/mame/video/midtunit.cpp @@ -616,7 +616,7 @@ DEFINE_TEMPLATED_DMA_DRAW_GROUP(false, false); * *************************************/ -void midtunit_video_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void midtunit_video_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/midtunit.h b/src/mame/video/midtunit.h index 0718eb6ce11..7931d221b2f 100644 --- a/src/mame/video/midtunit.h +++ b/src/mame/video/midtunit.h @@ -64,7 +64,7 @@ protected: midtunit_video_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; static const device_timer_id TIMER_DMA = 0; diff --git a/src/mame/video/midvunit.cpp b/src/mame/video/midvunit.cpp index 02f71d3098d..53407d46963 100644 --- a/src/mame/video/midvunit.cpp +++ b/src/mame/video/midvunit.cpp @@ -36,12 +36,12 @@ midvunit_renderer::midvunit_renderer(midvunit_state &state) * *************************************/ -void midvunit_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void midvunit_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_SCANLINE: - scanline_timer_cb(ptr, param); + scanline_timer_cb(param); break; default: throw emu_fatalerror("Unknown id in midvunit_state::device_timer"); diff --git a/src/mame/video/midyunit.cpp b/src/mame/video/midyunit.cpp index fe790af872d..104d000bc1c 100644 --- a/src/mame/video/midyunit.cpp +++ b/src/mame/video/midyunit.cpp @@ -381,15 +381,15 @@ void midyunit_state::dma_draw(uint16_t command) * *************************************/ -void midyunit_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void midyunit_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { case TIMER_DMA: - dma_callback(ptr, param); + dma_callback(param); break; case TIMER_AUTOERASE_LINE: - autoerase_line(ptr, param); + autoerase_line(param); break; default: throw emu_fatalerror("Unknown id in midyunit_state::device_timer"); @@ -586,7 +586,7 @@ TMS340X0_SCANLINE_IND16_CB_MEMBER(midyunit_state::scanline_update) dest[x] = m_pen_map[src[coladdr++ & 0x1ff]]; /* handle autoerase on the previous line */ - autoerase_line(nullptr, params->rowaddr - 1); + autoerase_line(params->rowaddr - 1); /* if this is the last update of the screen, set a timer to clear out the final line */ /* (since we update one behind) */ diff --git a/src/mame/video/nbmj8688.cpp b/src/mame/video/nbmj8688.cpp index 1cc86dab5d0..23a7948b56a 100644 --- a/src/mame/video/nbmj8688.cpp +++ b/src/mame/video/nbmj8688.cpp @@ -261,7 +261,7 @@ void nbmj8688_state::writeram_high(int x, int y, int color) update_pixel(x, y); } -void nbmj8688_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nbmj8688_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/nbmj8891.cpp b/src/mame/video/nbmj8891.cpp index 012a7f3c420..5a831b91088 100644 --- a/src/mame/video/nbmj8891.cpp +++ b/src/mame/video/nbmj8891.cpp @@ -305,7 +305,7 @@ void nbmj8891_state::update_pixel1(int x, int y) m_tmpbitmap1.pix(y, x) = (color == 0x7f) ? 0xff : color; } -void nbmj8891_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nbmj8891_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/nbmj8900.cpp b/src/mame/video/nbmj8900.cpp index 6c7adc860a4..d993300b007 100644 --- a/src/mame/video/nbmj8900.cpp +++ b/src/mame/video/nbmj8900.cpp @@ -194,7 +194,7 @@ void nbmj8900_state::update_pixel1(int x, int y) m_tmpbitmap1.pix(y, x) = m_palette->pen(color); } -void nbmj8900_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nbmj8900_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/nbmj8991.cpp b/src/mame/video/nbmj8991.cpp index 5f6862b5a37..80110bd1485 100644 --- a/src/mame/video/nbmj8991.cpp +++ b/src/mame/video/nbmj8991.cpp @@ -163,7 +163,7 @@ void nbmj8991_state::update_pixel(int x, int y) m_tmpbitmap.pix(y, x) = color; } -void nbmj8991_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nbmj8991_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/nbmj9195.cpp b/src/mame/video/nbmj9195.cpp index e56a15146db..16c54ca27b1 100644 --- a/src/mame/video/nbmj9195.cpp +++ b/src/mame/video/nbmj9195.cpp @@ -178,7 +178,7 @@ void nbmj9195_state::update_pixel(int vram, int x, int y) m_tmpbitmap[vram].pix(y, x) = color; } -void nbmj9195_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nbmj9195_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/nick.cpp b/src/mame/video/nick.cpp index 4b119a4695d..49c77e35db7 100644 --- a/src/mame/video/nick.cpp +++ b/src/mame/video/nick.cpp @@ -185,7 +185,7 @@ void nick_device::device_reset() // device_timer - handler timer events //------------------------------------------------- -void nick_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void nick_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int scanline = screen().vpos(); diff --git a/src/mame/video/nick.h b/src/mame/video/nick.h index 6a878fd97f6..4563c9d2618 100644 --- a/src/mame/video/nick.h +++ b/src/mame/video/nick.h @@ -79,7 +79,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/mame/video/niyanpai.cpp b/src/mame/video/niyanpai.cpp index 6aa036fa502..988580697c1 100644 --- a/src/mame/video/niyanpai.cpp +++ b/src/mame/video/niyanpai.cpp @@ -162,7 +162,7 @@ void niyanpai_state::update_pixel(int vram, int x, int y) m_tmpbitmap[vram].pix(y, x) = color; } -void niyanpai_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void niyanpai_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/pastelg.cpp b/src/mame/video/pastelg.cpp index 8753792ff16..4297bb9b52d 100644 --- a/src/mame/video/pastelg.cpp +++ b/src/mame/video/pastelg.cpp @@ -128,7 +128,7 @@ void pastelg_common_state::vramflip() m_flipscreen_old = m_flipscreen; } -void pastelg_common_state::blitter_timer_callback(void *ptr, s32 param) +void pastelg_common_state::blitter_timer_callback(s32 param) { m_nb1413m3->busyflag_w(1); } diff --git a/src/mame/video/pc4.cpp b/src/mame/video/pc4.cpp index 6f8b1e8543e..850980bb8aa 100644 --- a/src/mame/video/pc4.cpp +++ b/src/mame/video/pc4.cpp @@ -58,7 +58,7 @@ uint32_t pc4_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c } -void pc4_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void pc4_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/video/segag80r.cpp b/src/mame/video/segag80r.cpp index 8840c83a099..1acd43f7ba3 100644 --- a/src/mame/video/segag80r.cpp +++ b/src/mame/video/segag80r.cpp @@ -21,7 +21,7 @@ enum { spaceod_bg_detect_tile_color = 1 }; * *************************************/ -void segag80r_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void segag80r_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/sgi_re2.cpp b/src/mame/video/sgi_re2.cpp index 76ed188d433..b1595fe574e 100644 --- a/src/mame/video/sgi_re2.cpp +++ b/src/mame/video/sgi_re2.cpp @@ -191,7 +191,7 @@ void sgi_re2_device::reg_w(offs_t offset, u32 data) logerror("reg_w unhandled register 0x%02x data 0x%x\n", offset, data); } -void sgi_re2_device::step(void *ptr, int param) +void sgi_re2_device::step(s32 param) { switch (m_state) { diff --git a/src/mame/video/sgi_re2.h b/src/mame/video/sgi_re2.h index 48b424bb04f..e5fc5df9e63 100644 --- a/src/mame/video/sgi_re2.h +++ b/src/mame/video/sgi_re2.h @@ -119,7 +119,7 @@ public: protected: // state machine - void step(void *ptr = nullptr, int param = 0); + void step(s32 param = 0); void execute(); // drawing functions diff --git a/src/mame/video/tank8.cpp b/src/mame/video/tank8.cpp index 2d77a22b2ff..6d23ad8cd7a 100644 --- a/src/mame/video/tank8.cpp +++ b/src/mame/video/tank8.cpp @@ -166,7 +166,7 @@ void tank8_state::draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect) } -void tank8_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tank8_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/tc0180vcu.cpp b/src/mame/video/tc0180vcu.cpp index db1a846e134..379075b829f 100644 --- a/src/mame/video/tc0180vcu.cpp +++ b/src/mame/video/tc0180vcu.cpp @@ -166,7 +166,7 @@ void tc0180vcu_device::vblank_callback(screen_device &screen, bool state) // fires //------------------------------------------------- -void tc0180vcu_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void tc0180vcu_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/tc0180vcu.h b/src/mame/video/tc0180vcu.h index 1a973315035..dafd02598a8 100644 --- a/src/mame/video/tc0180vcu.h +++ b/src/mame/video/tc0180vcu.h @@ -36,7 +36,7 @@ protected: virtual void device_resolve_objects() 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/mame/video/triplhnt.cpp b/src/mame/video/triplhnt.cpp index 0937758003f..c28028a2570 100644 --- a/src/mame/video/triplhnt.cpp +++ b/src/mame/video/triplhnt.cpp @@ -35,7 +35,7 @@ void triplhnt_state::video_start() } -void triplhnt_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void triplhnt_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/uv201.cpp b/src/mame/video/uv201.cpp index 82710b3dcf7..4d36dbe0356 100644 --- a/src/mame/video/uv201.cpp +++ b/src/mame/video/uv201.cpp @@ -164,7 +164,7 @@ void uv201_device::device_reset() // device_timer - handle timer events //------------------------------------------------- -void uv201_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void uv201_device::device_timer(emu_timer &timer, device_timer_id id, int param) { int scanline = screen().vpos(); diff --git a/src/mame/video/uv201.h b/src/mame/video/uv201.h index 204b651d3d1..91d5b0135b6 100644 --- a/src/mame/video/uv201.h +++ b/src/mame/video/uv201.h @@ -89,7 +89,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: enum diff --git a/src/mame/video/vectrex.cpp b/src/mame/video/vectrex.cpp index f0fa6031dbc..dbb4e3766e0 100644 --- a/src/mame/video/vectrex.cpp +++ b/src/mame/video/vectrex.cpp @@ -220,8 +220,8 @@ TIMER_CALLBACK_MEMBER(vectrex_base_state::update_signal) m_vector_start_time = machine().time(); - if (ptr) - * (uint8_t *) ptr = param; + if (m_signal_ptr) + * (uint8_t *) m_signal_ptr = param; } @@ -275,7 +275,8 @@ void vectrex_state::video_start() void vectrex_base_state::vectrex_multiplexer(int mux) { - timer_set(attotime::from_nsec(ANALOG_DELAY), TIMER_UPDATE_SIGNAL, m_via_out[PORTA], &m_analog[mux]); + m_signal_ptr = &m_analog[mux]; + timer_set(attotime::from_nsec(ANALOG_DELAY), TIMER_UPDATE_SIGNAL, m_via_out[PORTA]); if (mux == A_AUDIO) m_dac->write(m_via_out[PORTA] ^ 0x80); // not gate shown on schematic @@ -330,6 +331,7 @@ void vectrex_base_state::v_via_pb_w(uint8_t data) if (!(data & 0x1) && (m_via_out[PORTB] & 0x1)) { /* MUX has been enabled */ + m_signal_ptr = nullptr; timer_set(attotime::from_nsec(ANALOG_DELAY), TIMER_UPDATE_SIGNAL); } } @@ -361,7 +363,8 @@ void vectrex_base_state::v_via_pb_w(uint8_t data) vectrex_multiplexer((data >> 1) & 0x3); m_via_out[PORTB] = data; - timer_set(attotime::from_nsec(ANALOG_DELAY), TIMER_UPDATE_SIGNAL, data & 0x80, &m_ramp); + m_signal_ptr = &m_ramp; + timer_set(attotime::from_nsec(ANALOG_DELAY), TIMER_UPDATE_SIGNAL, data & 0x80); } @@ -369,7 +372,8 @@ void vectrex_base_state::v_via_pa_w(uint8_t data) { /* DAC output always goes to Y integrator */ m_via_out[PORTA] = data; - timer_set(attotime::from_nsec(ANALOG_DELAY), TIMER_UPDATE_SIGNAL, data, &m_analog[A_Y]); + m_signal_ptr = &m_analog[A_Y]; + timer_set(attotime::from_nsec(ANALOG_DELAY), TIMER_UPDATE_SIGNAL, data); if (!(m_via_out[PORTB] & 0x1)) vectrex_multiplexer((m_via_out[PORTB] >> 1) & 0x3); @@ -406,7 +410,8 @@ WRITE_LINE_MEMBER(vectrex_base_state::v_via_cb2_w) } } - timer_set(attotime::zero, TIMER_UPDATE_SIGNAL, state, &m_blank); + m_signal_ptr = &m_blank; + timer_set(attotime::zero, TIMER_UPDATE_SIGNAL, state); m_cb2 = state; } } diff --git a/src/mame/video/wswan.cpp b/src/mame/video/wswan.cpp index a845117e6b2..a88d6463b0d 100644 --- a/src/mame/video/wswan.cpp +++ b/src/mame/video/wswan.cpp @@ -167,7 +167,7 @@ void wswan_video_device::device_reset() } -void wswan_video_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void wswan_video_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/wswan.h b/src/mame/video/wswan.h index f532ae5d3ab..1ca7e77b91d 100644 --- a/src/mame/video/wswan.h +++ b/src/mame/video/wswan.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; void setup_palettes(); void draw_background(); diff --git a/src/mame/video/xbox_nv2a.cpp b/src/mame/video/xbox_nv2a.cpp index 1354cf2382c..cbaa7a7843b 100644 --- a/src/mame/video/xbox_nv2a.cpp +++ b/src/mame/video/xbox_nv2a.cpp @@ -4772,7 +4772,7 @@ WRITE_LINE_MEMBER(nv2a_renderer::vblank_callback) #endif*/ if ((state != 0) && (puller_waiting == 1)) { puller_waiting = 0; - puller_timer_work(nullptr, 0); + puller_timer_work(0); } if (state != 0) { pcrtc[0x100 / 4] |= 1; @@ -5129,6 +5129,6 @@ void nv2a_renderer::set_ram_base(void *base) void nv2a_renderer::start(address_space *cpu_space) { - puller_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(nv2a_renderer::puller_timer_work), this), (void *)"NV2A Puller Timer"); + puller_timer = machine().scheduler().timer_alloc(timer_expired_delegate(&nv2a_renderer::puller_timer_work, "NV2A Puller Timer", this)); puller_timer->enable(false); } diff --git a/src/mame/video/ygv608.cpp b/src/mame/video/ygv608.cpp index 3d7c47724ea..b07273a0641 100644 --- a/src/mame/video/ygv608.cpp +++ b/src/mame/video/ygv608.cpp @@ -514,7 +514,7 @@ inline void ygv608_device::raster_irq_check() } -void ygv608_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void ygv608_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch(id) { diff --git a/src/mame/video/ygv608.h b/src/mame/video/ygv608.h index 586cf44597c..b0d21957f43 100644 --- a/src/mame/video/ygv608.h +++ b/src/mame/video/ygv608.h @@ -105,7 +105,7 @@ protected: virtual uint32_t palette_entries() const override { return 256; } - 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; address_space *m_iospace; private: diff --git a/src/mame/video/zx.cpp b/src/mame/video/zx.cpp index 7ce719a7e1c..6bb70c706b8 100644 --- a/src/mame/video/zx.cpp +++ b/src/mame/video/zx.cpp @@ -22,7 +22,7 @@ #include "includes/zx.h" -void zx_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void zx_state::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/zx8301.cpp b/src/mame/video/zx8301.cpp index 3e7e858f1d0..68b19a33e1c 100644 --- a/src/mame/video/zx8301.cpp +++ b/src/mame/video/zx8301.cpp @@ -158,7 +158,7 @@ void zx8301_device::device_start() // device_timer - handler timer events //------------------------------------------------- -void zx8301_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void zx8301_device::device_timer(emu_timer &timer, device_timer_id id, int param) { switch (id) { diff --git a/src/mame/video/zx8301.h b/src/mame/video/zx8301.h index 5a93738be46..35aab75ff5c 100644 --- a/src/mame/video/zx8301.h +++ b/src/mame/video/zx8301.h @@ -67,7 +67,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; // device_config_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/osd/osdnet.cpp b/src/osd/osdnet.cpp index b90a139731c..97b37366a4d 100644 --- a/src/osd/osdnet.cpp +++ b/src/osd/osdnet.cpp @@ -61,7 +61,7 @@ int osd_netdev::send(uint8_t *buf, int len) return 0; } -void osd_netdev::recv(void *ptr, int param) +void osd_netdev::recv(int param) { uint8_t *buf; int len; diff --git a/src/osd/osdnet.h b/src/osd/osdnet.h index 32e41663dcc..f18d7c5fea7 100644 --- a/src/osd/osdnet.h +++ b/src/osd/osdnet.h @@ -44,7 +44,7 @@ protected: virtual int recv_dev(uint8_t **buf); private: - void recv(void *ptr, int param); + void recv(int param); class device_network_interface *m_dev; emu_timer *m_timer; |