diff options
author | 2016-03-12 12:31:13 +0100 | |
---|---|---|
committer | 2016-03-12 12:31:13 +0100 | |
commit | a026a582f1a0ea8c1ede3acaddacef506ef3f3b0 (patch) | |
tree | e31573822f2359677de519f9f3b600d98e8764cd /src/devices/machine/68307tmu.cpp | |
parent | 477d2abd43984f076b7e45f5527591fa8fd0d241 (diff) | |
parent | dcab55bf53b94713a6f72e9633f5101c8dd6c08c (diff) |
Merge pull request #15 from mamedev/master
Sync to base master
Diffstat (limited to 'src/devices/machine/68307tmu.cpp')
-rw-r--r-- | src/devices/machine/68307tmu.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/devices/machine/68307tmu.cpp b/src/devices/machine/68307tmu.cpp index 6f5c33687cd..e3c8e595f7c 100644 --- a/src/devices/machine/68307tmu.cpp +++ b/src/devices/machine/68307tmu.cpp @@ -99,7 +99,7 @@ WRITE16_MEMBER( m68307cpu_device::m68307_internal_timer_w ) } } -static TIMER_CALLBACK( m68307_timer0_callback ) +TIMER_CALLBACK_MEMBER(m68307_timer::timer0_callback ) { m68307cpu_device* m68k = (m68307cpu_device *)ptr; m68307_single_timer* tptr = &m68k->m68307TIMER->singletimer[0]; @@ -110,7 +110,7 @@ static TIMER_CALLBACK( m68307_timer0_callback ) tptr->mametimer->adjust(m68k->cycles_to_attotime(20000)); } -static TIMER_CALLBACK( m68307_timer1_callback ) +TIMER_CALLBACK_MEMBER(m68307_timer::timer1_callback ) { m68307cpu_device* m68k = (m68307cpu_device *)ptr; m68307_single_timer* tptr = &m68k->m68307TIMER->singletimer[1]; @@ -122,7 +122,7 @@ static TIMER_CALLBACK( m68307_timer1_callback ) } -static TIMER_CALLBACK( m68307_wd_timer_callback ) +TIMER_CALLBACK_MEMBER(m68307_timer::wd_timer_callback ) { printf("wd timer\n"); } @@ -134,15 +134,12 @@ void m68307_timer::init(m68307cpu_device *device) m68307_single_timer* tptr; tptr = &singletimer[0]; - tptr->mametimer = device->machine().scheduler().timer_alloc(FUNC(m68307_timer0_callback), parent); + tptr->mametimer = device->machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(m68307_timer::timer0_callback),this), parent); tptr = &singletimer[1]; - tptr->mametimer = device->machine().scheduler().timer_alloc(FUNC(m68307_timer1_callback), parent); - - - wd_mametimer = device->machine().scheduler().timer_alloc(FUNC(m68307_wd_timer_callback), parent); - + tptr->mametimer = device->machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(m68307_timer::timer1_callback),this), parent); + wd_mametimer = device->machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(m68307_timer::wd_timer_callback),this), parent); } UINT16 m68307_timer::read_tcn(UINT16 mem_mask, int which) |