ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ehci: improve expire time calculation 

Move down the expire time calculation down in the frame timer, to the
point where the timer is actually reloaded.  This way we'll notice any
async_stepdown changes (especially resetting to 0 due to usb activity).

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-07-11 11:23:17 +02:00
parent 7efc17af9a
commit afb7a0b85b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/usb/hcd-ehci.c
View File

@ -2372,7 +2372,7 @@ static void ehci_frame_timer(void *opaque)
if (ehci_periodic_enabled(ehci) || ehci->pstate != EST_INACTIVE) { if (ehci_periodic_enabled(ehci) || ehci->pstate != EST_INACTIVE) {
need_timer++; need_timer++;
expire_time = t_now + (get_ticks_per_sec() / FRAME_TIMER_FREQ); ehci->async_stepdown = 0;
if (frames > ehci->maxframes) { if (frames > ehci->maxframes) {
skipped_frames = frames - ehci->maxframes; skipped_frames = frames - ehci->maxframes;
@ -2391,8 +2391,6 @@ static void ehci_frame_timer(void *opaque)
if (ehci->async_stepdown < ehci->maxframes / 2) { if (ehci->async_stepdown < ehci->maxframes / 2) {
ehci->async_stepdown++; ehci->async_stepdown++;
} }
expire_time = t_now + (get_ticks_per_sec()
* ehci->async_stepdown / FRAME_TIMER_FREQ);
ehci_update_frindex(ehci, frames); ehci_update_frindex(ehci, frames);
ehci->last_run_ns += FRAME_TIMER_NS * frames; ehci->last_run_ns += FRAME_TIMER_NS * frames;
} }
@ -2402,7 +2400,7 @@ static void ehci_frame_timer(void *opaque)
*/ */
if (ehci_async_enabled(ehci) || ehci->astate != EST_INACTIVE) { if (ehci_async_enabled(ehci) || ehci->astate != EST_INACTIVE) {
need_timer++; need_timer++;
qemu_bh_schedule(ehci->async_bh); ehci_advance_async_state(ehci);
} }
ehci_commit_irq(ehci); ehci_commit_irq(ehci);
@ -2412,6 +2410,8 @@ static void ehci_frame_timer(void *opaque)
} }
if (need_timer) { if (need_timer) {
expire_time = t_now + (get_ticks_per_sec()
* (ehci->async_stepdown+1) / FRAME_TIMER_FREQ);
qemu_mod_timer(ehci->frame_timer, expire_time); qemu_mod_timer(ehci->frame_timer, expire_time);
} }
} }