summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/nes
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2022-01-26 08:47:06 -0500
committer AJR <ajrhacker@users.noreply.github.com>2022-01-26 08:56:03 -0500
commitca79d71af4bca7c1b8acc1df9e5dbb5b987d1542 (patch)
tree42994b1dd615273baa3e656b569ccd478270aff3 /src/devices/bus/nes
parentba918b59faad5244d87078ab3b955f64fd803c4d (diff)
Remove void *ptr parameter from emu_timer, timer_device and all related callbacks
Diffstat (limited to 'src/devices/bus/nes')
-rw-r--r--src/devices/bus/nes/bandai.cpp2
-rw-r--r--src/devices/bus/nes/bandai.h2
-rw-r--r--src/devices/bus/nes/bootleg.cpp20
-rw-r--r--src/devices/bus/nes/bootleg.h20
-rw-r--r--src/devices/bus/nes/cony.cpp2
-rw-r--r--src/devices/bus/nes/cony.h2
-rw-r--r--src/devices/bus/nes/datach.cpp2
-rw-r--r--src/devices/bus/nes/datach.h2
-rw-r--r--src/devices/bus/nes/disksys.cpp2
-rw-r--r--src/devices/bus/nes/disksys.h2
-rw-r--r--src/devices/bus/nes/event.cpp2
-rw-r--r--src/devices/bus/nes/event.h2
-rw-r--r--src/devices/bus/nes/irem.cpp2
-rw-r--r--src/devices/bus/nes/irem.h2
-rw-r--r--src/devices/bus/nes/jaleco.cpp2
-rw-r--r--src/devices/bus/nes/jaleco.h2
-rw-r--r--src/devices/bus/nes/jy.cpp2
-rw-r--r--src/devices/bus/nes/jy.h2
-rw-r--r--src/devices/bus/nes/kaiser.cpp4
-rw-r--r--src/devices/bus/nes/kaiser.h4
-rw-r--r--src/devices/bus/nes/konami.cpp4
-rw-r--r--src/devices/bus/nes/konami.h4
-rw-r--r--src/devices/bus/nes/legacy.cpp2
-rw-r--r--src/devices/bus/nes/legacy.h2
-rw-r--r--src/devices/bus/nes/namcot.cpp2
-rw-r--r--src/devices/bus/nes/namcot.h2
-rw-r--r--src/devices/bus/nes/sunsoft.cpp4
-rw-r--r--src/devices/bus/nes/sunsoft.h4
-rw-r--r--src/devices/bus/nes/sunsoft_dcs.cpp2
-rw-r--r--src/devices/bus/nes/sunsoft_dcs.h2
-rw-r--r--src/devices/bus/nes/tengen.cpp2
-rw-r--r--src/devices/bus/nes/tengen.h2
-rw-r--r--src/devices/bus/nes/vrc_clones.cpp4
-rw-r--r--src/devices/bus/nes/vrc_clones.h4
34 files changed, 60 insertions, 60 deletions
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;