From: Mark Cave-Ayland Date: Tue, 23 Jun 2020 20:49:19 +0000 (+0100) Subject: pmu: honour autopoll_rate_ms when rearming the ADB autopoll timer X-Git-Tag: v5.1.0-rc0~48^2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=414eb1d500b94b2774440656f5bde4bf2e0f4a29;p=thirdparty%2Fqemu.git pmu: honour autopoll_rate_ms when rearming the ADB autopoll timer Don't use a fixed value but instead use the default value from the ADB bus state. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daudé Tested-by: Finn Thain Acked-by: Laurent Vivier Message-Id: <20200623204936.24064-6-mark.cave-ayland@ilande.co.uk> --- diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index cae2845936b..bae0b440d0a 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -106,7 +106,7 @@ static void pmu_adb_poll(void *opaque) } timer_mod(s->adb_poll_timer, - qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 30); + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + s->autopoll_rate_ms); } static void pmu_one_sec_timer(void *opaque) @@ -182,7 +182,7 @@ static void pmu_cmd_set_adb_autopoll(PMUState *s, uint16_t mask) s->adb_poll_mask = mask; if (mask) { timer_mod(s->adb_poll_timer, - qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 30); + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + s->autopoll_rate_ms); } else { timer_del(s->adb_poll_timer); }