Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 00:54:22 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

6532riot.c: removed static TIMER_CALLBACK in favour of device_timer (nw)

Browse Source
This commit is contained in:
Ivan Vangelista 2015-06-12 11:27:51 +02:00
parent 1f74064220
commit f279a31605
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/emu/machine/6532riot.c
View File

@ -114,17 +114,6 @@ UINT8 riot6532_device::get_timer()
/*-------------------------------------------------
timer_end_callback - callback to process the
timer
-------------------------------------------------*/
TIMER_CALLBACK( riot6532_device::timer_end_callback )
{
riot6532_device *via = reinterpret_cast<riot6532_device *>(ptr);
via->timer_end();
}
void riot6532_device::timer_end()
{
assert(m_timerstate != TIMER_IDLE);
@ -429,7 +418,7 @@ void riot6532_device::device_start()
m_irq_cb.resolve_safe();
/* allocate timers */
m_timer = machine().scheduler().timer_alloc(FUNC(timer_end_callback), (void *)this);
m_timer = timer_alloc(TIMER_END_CB);
/* register for save states */
save_item(NAME(m_port[0].m_in));
@ -480,3 +469,15 @@ void riot6532_device::device_reset()
m_timerstate = TIMER_COUNTING;
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)
{
switch (id)
{
case TIMER_END_CB:
timer_end();
break;
default:
assert_always(FALSE, "Unknown id in riot6532_device::device_timer");
}
}

7
src/emu/machine/6532riot.h
View File

@ -84,10 +84,10 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
virtual void device_post_load() { }
virtual void device_clock_changed() { }
static TIMER_CALLBACK( timer_end_callback );
private:
void update_irqstate();
@ -113,6 +113,11 @@ private:
UINT8 m_timershift;
UINT8 m_timerstate;
emu_timer * m_timer;
enum
{
TIMER_END_CB
};
};