aboutsummaryrefslogtreecommitdiffstats
path: root/console.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 /console.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 'console.c')
-rw-r--r--console.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/console.c b/console.c
index f6694b2..73371fb 100644
--- a/console.c
+++ b/console.c
@@ -1141,7 +1141,7 @@ static void kbd_send_chars(void *opaque)
/* characters are pending: we send them a bit later (XXX:
horrible, should change char device API) */
if (s->out_fifo.count > 0) {
- qemu_mod_timer(s->kbd_timer, qemu_get_clock(rt_clock) + 1);
+ qemu_mod_timer(s->kbd_timer, qemu_get_clock_ms(rt_clock) + 1);
}
}
@@ -1477,7 +1477,7 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds, QemuOpt
s->chr = chr;
s->out_fifo.buf = s->out_fifo_buf;
s->out_fifo.buf_size = sizeof(s->out_fifo_buf);
- s->kbd_timer = qemu_new_timer(rt_clock, kbd_send_chars, s);
+ s->kbd_timer = qemu_new_timer_ms(rt_clock, kbd_send_chars, s);
s->ds = ds;
if (!color_inited) {