diff options
Diffstat (limited to 'src/emu/sound/ics2115.c')
-rw-r--r-- | src/emu/sound/ics2115.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/emu/sound/ics2115.c b/src/emu/sound/ics2115.c index aee2e9c20bf..282fec25abc 100644 --- a/src/emu/sound/ics2115.c +++ b/src/emu/sound/ics2115.c @@ -164,16 +164,16 @@ static void keyon(struct ics2115 *chip, int osc) } -static TIMER_CALLBACK_PTR( timer_cb_0 ) +static TIMER_CALLBACK( timer_cb_0 ) { - struct ics2115 *chip = param; + struct ics2115 *chip = ptr; chip->irq_pend |= 1<<0; recalc_irq(chip); } -static TIMER_CALLBACK_PTR( timer_cb_1 ) +static TIMER_CALLBACK( timer_cb_1 ) { - struct ics2115 *chip = param; + struct ics2115 *chip = ptr; chip->irq_pend |= 1<<1; recalc_irq(chip); } @@ -195,9 +195,9 @@ static void recalc_timer(struct ics2115 *chip, int timer) if(chip->timer[timer].period != period) { chip->timer[timer].period = period; if(period) - timer_adjust_ptr(chip->timer[timer].timer, ATTOTIME_IN_NSEC(period), ATTOTIME_IN_NSEC(period)); + timer_adjust(chip->timer[timer].timer, ATTOTIME_IN_NSEC(period), 0, ATTOTIME_IN_NSEC(period)); else - timer_adjust_ptr(chip->timer[timer].timer, attotime_never, attotime_zero); + timer_adjust(chip->timer[timer].timer, attotime_never, 0, attotime_zero); } } @@ -458,8 +458,8 @@ static void *ics2115_start(int sndindex, int clock, const void *config) chip->intf = config; chip->index = sndindex; chip->rom = memory_region(chip->intf->region); - chip->timer[0].timer = timer_alloc_ptr(timer_cb_0, chip); - chip->timer[1].timer = timer_alloc_ptr(timer_cb_1, chip); + chip->timer[0].timer = timer_alloc(timer_cb_0, chip); + chip->timer[1].timer = timer_alloc(timer_cb_1, chip); chip->ulaw = auto_malloc(256*sizeof(INT16)); chip->stream = stream_create(0, 2, 33075, chip, update); @@ -532,8 +532,8 @@ static void ics2115_reset(void *_chip) chip->irq_en = 0; chip->irq_pend = 0; memset(chip->voice, 0, sizeof(chip->voice)); - timer_adjust_ptr(chip->timer[0].timer, attotime_never, attotime_zero); - timer_adjust_ptr(chip->timer[1].timer, attotime_never, attotime_zero); + timer_adjust(chip->timer[0].timer, attotime_never, 0, attotime_zero); + timer_adjust(chip->timer[1].timer, attotime_never, 0, attotime_zero); chip->timer[0].period = 0; chip->timer[1].period = 0; recalc_irq(chip); |