diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-05-25 08:13:55 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-06-07 10:02:23 +0200 |
| commit | f020ed36fef7780e81a94543ae6388d8dc144ab6 (patch) | |
| tree | 2d3c1bc91bd3f4c1dd6ed51099aa04d514165b2d /hw/usb | |
| parent | 3a21532626bb5c3ecb0f916843f75ccce6501a9d (diff) | |
| download | qemu-f020ed36fef7780e81a94543ae6388d8dc144ab6.zip qemu-f020ed36fef7780e81a94543ae6388d8dc144ab6.tar.gz qemu-f020ed36fef7780e81a94543ae6388d8dc144ab6.tar.bz2 | |
ehci: rework frame skipping
Move the framecount check out of the loop and use the new
ehci_update_frindex function to skip frames if needed.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/hcd-ehci.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index d97c539..5298204 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -2315,9 +2315,8 @@ static void ehci_frame_timer(void *opaque) int schedules = 0; int64_t expire_time, t_now; uint64_t ns_elapsed; - int frames; + int frames, skipped_frames; int i; - int skipped_frames = 0; t_now = qemu_get_clock_ns(vm_clock); ns_elapsed = t_now - ehci->last_run_ns; @@ -2327,15 +2326,17 @@ static void ehci_frame_timer(void *opaque) schedules++; expire_time = t_now + (get_ticks_per_sec() / FRAME_TIMER_FREQ); + if (frames > ehci->maxframes) { + skipped_frames = frames - ehci->maxframes; + ehci_update_frindex(ehci, skipped_frames); + ehci->last_run_ns += FRAME_TIMER_NS * skipped_frames; + frames -= skipped_frames; + DPRINTF("WARNING - EHCI skipped %d frames\n", skipped_frames); + } + for (i = 0; i < frames; i++) { ehci_update_frindex(ehci, 1); - - if (frames - i > ehci->maxframes) { - skipped_frames++; - } else { - ehci_advance_periodic_state(ehci); - } - + ehci_advance_periodic_state(ehci); ehci->last_run_ns += FRAME_TIMER_NS; } } else { @@ -2348,12 +2349,6 @@ static void ehci_frame_timer(void *opaque) ehci->last_run_ns += FRAME_TIMER_NS * frames; } -#if 0 - if (skipped_frames) { - DPRINTF("WARNING - EHCI skipped %d frames\n", skipped_frames); - } -#endif - /* Async is not inside loop since it executes everything it can once * called */ |