Message ID | 20200614142840.10245-6-mark.cave-ayland@ilande.co.uk |
---|---|
State | New |
Headers | show |
Series | ADB: fix autopoll issues and rework mac_via state machine | expand |
On 6/14/20 4:28 PM, Mark Cave-Ayland wrote: > Don't use a fixed value but instead use the default value from the ADB bus > state. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/misc/macio/pmu.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c > index 3af4ef1a04..edb061e417 100644 > --- a/hw/misc/macio/pmu.c > +++ b/hw/misc/macio/pmu.c > @@ -104,7 +104,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) > @@ -180,7 +180,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); > } >
diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index 3af4ef1a04..edb061e417 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -104,7 +104,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) @@ -180,7 +180,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); }
Don't use a fixed value but instead use the default value from the ADB bus state. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/misc/macio/pmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)