aboutsummaryrefslogtreecommitdiffstats
path: root/android/looper-qemu.c
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-05-10 07:06:00 +0200
committerDavid 'Digit' Turner <digit@android.com>2011-06-01 17:08:17 +0200
commit5973c775c853e26f684de58ad28c267281aaffd6 (patch)
treea1db31a2a98ec793e396a2de72f1a8858315d7af /android/looper-qemu.c
parent317c9d54284844615b33a25834a63248bf1bfa73 (diff)
downloadexternal_qemu-5973c775c853e26f684de58ad28c267281aaffd6.zip
external_qemu-5973c775c853e26f684de58ad28c267281aaffd6.tar.gz
external_qemu-5973c775c853e26f684de58ad28c267281aaffd6.tar.bz2
qemu-timer.c: rename qemu_timer_new_scale()
Get rid of qemu_timer_new() implementation, and update all callers to use qemu_timer_new_ms() or qemu_timer_new_ns() instead. Rename qemu_new_timer_scale() to qemu_new_timer() to follow upstream conventions. Change-Id: Id2c04f8597ec5026e02f87b3e2c5507920eb688e
Diffstat (limited to 'android/looper-qemu.c')
-rw-r--r--android/looper-qemu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/android/looper-qemu.c b/android/looper-qemu.c
index 5526f5b..714b48d 100644
--- a/android/looper-qemu.c
+++ b/android/looper-qemu.c
@@ -36,7 +36,7 @@ qlooptimer_startRelative(void* impl, Duration timeout_ms)
if (timeout_ms == DURATION_INFINITE)
qemu_del_timer(tt);
else
- qemu_mod_timer(tt, qemu_get_clock_ns(host_clock) + timeout_ms*1000000);
+ qemu_mod_timer(tt, qemu_get_clock_ms(host_clock) + timeout_ms);
}
static void
@@ -85,7 +85,7 @@ qlooper_timer_init(Looper* looper,
void* opaque)
{
timer->clazz = (LoopTimerClass*) &qlooptimer_class;
- timer->impl = qemu_new_timer(host_clock, callback, opaque);
+ timer->impl = qemu_new_timer_ms(host_clock, callback, opaque);
}
/**********************************************************************
@@ -370,7 +370,7 @@ qlooper_handle_io_bh(void* opaque)
static Duration
qlooper_now(Looper* ll)
{
- return qemu_get_clock_ns(host_clock)/1000000;
+ return qemu_get_clock_ms(host_clock);
}
extern void qemu_system_shutdown_request(void);