aboutsummaryrefslogtreecommitdiff
path: root/hw/input
diff options
context:
space:
mode:
authorAlex Bligh <alex@alex.org.uk>2013-08-21 16:02:39 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2013-08-22 15:58:05 +0200
commite93379b039030c68d85693a4bee2b76f814108d2 (patch)
tree6c017b5105f09bb60c8319499a49c660647aaf0b /hw/input
parent04d542c8b826a1196ca4f03f5a35d83035976bd1 (diff)
aio / timers: Rename qemu_timer_* functions
Rename four functions in preparation for new API. Rename qemu_timer_expired to timer_expired Rename qemu_timer_expire_time_ns to timer_expire_time_ns Rename qemu_timer_pending to timer_pending Rename qemu_timer_expired_ns to timer_expired_ns Signed-off-by: Alex Bligh <alex@alex.org.uk> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/input')
-rw-r--r--hw/input/tsc2005.c2
-rw-r--r--hw/input/tsc210x.c2
2 files changed, 2 insertions, 2 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);