summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/timer.cpp
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/machine/timer.cpp
parentba918b59faad5244d87078ab3b955f64fd803c4d (diff)
Remove void *ptr parameter from emu_timer, timer_device and all related callbacks
Diffstat (limited to 'src/devices/machine/timer.cpp')
-rw-r--r--src/devices/machine/timer.cpp7
1 files changed, 3 insertions, 4 deletions
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())