diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/input/tsc2005.c | 2 | ||||
| -rw-r--r-- | hw/input/tsc210x.c | 2 | ||||
| -rw-r--r-- | hw/mips/cputimer.c | 4 | ||||
| -rw-r--r-- | hw/openrisc/cputimer.c | 2 | ||||
| -rw-r--r-- | hw/timer/mc146818rtc.c | 6 | ||||
| -rw-r--r-- | hw/usb/redirect.c | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c index a771cd5e52..ebd1b7e484 100644 --- a/hw/input/tsc2005.c +++ b/hw/input/tsc2005.c @@ -513,7 +513,7 @@ static int tsc2005_load(QEMUFile *f, void *opaque, int version_id) for (i = 0; i < 8; i ++) s->tr[i] = qemu_get_be32(f); - s->busy = qemu_timer_pending(s->timer); + s->busy = timer_pending(s->timer); tsc2005_pin_update(s); return 0; diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c index 9b854e77dd..0067f983ef 100644 --- a/hw/input/tsc210x.c +++ b/hw/input/tsc210x.c @@ -1093,7 +1093,7 @@ static int tsc210x_load(QEMUFile *f, void *opaque, int version_id) for (i = 0; i < 0x14; i ++) qemu_get_be16s(f, &s->filter_data[i]); - s->busy = qemu_timer_pending(s->timer); + s->busy = timer_pending(s->timer); qemu_set_irq(s->pint, !s->irq); qemu_set_irq(s->davint, !s->dav); diff --git a/hw/mips/cputimer.c b/hw/mips/cputimer.c index e0266bf15a..739bbac323 100644 --- a/hw/mips/cputimer.c +++ b/hw/mips/cputimer.c @@ -72,8 +72,8 @@ uint32_t cpu_mips_get_count (CPUMIPSState *env) uint64_t now; now = qemu_get_clock_ns(vm_clock); - if (qemu_timer_pending(env->timer) - && qemu_timer_expired(env->timer, now)) { + if (timer_pending(env->timer) + && timer_expired(env->timer, now)) { /* The timer has already expired. */ cpu_mips_timer_expire(env); } diff --git a/hw/openrisc/cputimer.c b/hw/openrisc/cputimer.c index 4144b34be7..9a09f5c9dc 100644 --- a/hw/openrisc/cputimer.c +++ b/hw/openrisc/cputimer.c @@ -72,7 +72,7 @@ static void openrisc_timer_cb(void *opaque) OpenRISCCPU *cpu = opaque; if ((cpu->env.ttmr & TTMR_IE) && - qemu_timer_expired(cpu->env.timer, qemu_get_clock_ns(vm_clock))) { + timer_expired(cpu->env.timer, qemu_get_clock_ns(vm_clock))) { CPUState *cs = CPU(cpu); cpu->env.ttmr |= TTMR_IP; diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 3c3baaccfa..d12f6e7fa6 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -252,7 +252,7 @@ static void check_update_timer(RTCState *s) * the alarm time. */ next_update_time = s->next_alarm_time; } - if (next_update_time != qemu_timer_expire_time_ns(s->update_timer)) { + if (next_update_time != timer_expire_time_ns(s->update_timer)) { qemu_mod_timer(s->update_timer, next_update_time); } } @@ -587,8 +587,8 @@ static int update_in_progress(RTCState *s) if (!rtc_running(s)) { return 0; } - if (qemu_timer_pending(s->update_timer)) { - int64_t next_update_time = qemu_timer_expire_time_ns(s->update_timer); + if (timer_pending(s->update_timer)) { + int64_t next_update_time = timer_expire_time_ns(s->update_timer); /* Latch UIP until the timer expires. */ if (qemu_get_clock_ns(rtc_clock) >= (next_update_time - UIP_HOLD_LENGTH)) { s->cmos_data[RTC_REG_A] |= REG_A_UIP; diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index e3b9f324b3..8fee3d362b 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1493,7 +1493,7 @@ static void usbredir_device_connect(void *priv, USBRedirDevice *dev = priv; const char *speed; - if (qemu_timer_pending(dev->attach_timer) || dev->dev.attached) { + if (timer_pending(dev->attach_timer) || dev->dev.attached) { ERROR("Received device connect while already connected\n"); return; } @@ -1588,7 +1588,7 @@ static void usbredir_interface_info(void *priv, * If we receive interface info after the device has already been * connected (ie on a set_config), re-check interface dependent things. */ - if (qemu_timer_pending(dev->attach_timer) || dev->dev.attached) { + if (timer_pending(dev->attach_timer) || dev->dev.attached) { usbredir_check_bulk_receiving(dev); if (usbredir_check_filter(dev)) { ERROR("Device no longer matches filter after interface info " |