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

uhci: Maximize how many frames we catch up when behind 

If somehow we've gotten behind a lot, simply skip ahead, like the ehci code
does.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2012-12-14 14:35:37 +01:00 committed by Gerd Hoffmann
parent f8f48b6957
commit 9fdf702727
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,6 +171,7 @@ struct UHCIState {
/* Properties */ /* Properties */
char *masterbus; char *masterbus;
uint32_t firstport; uint32_t firstport;
uint32_t maxframes;
}; };
typedef struct UHCI_TD { typedef struct UHCI_TD {
@ -1201,6 +1202,12 @@ static void uhci_frame_timer(void *opaque)
/* Process up to MAX_FRAMES_PER_TICK frames */ /* Process up to MAX_FRAMES_PER_TICK frames */
frames = (t_now - t_last_run) / frame_t; frames = (t_now - t_last_run) / frame_t;
if (frames > s->maxframes) {
int skipped = frames - s->maxframes;
s->expire_time += skipped * frame_t;
s->frnum = (s->frnum + skipped) & 0x7ff;
frames -= skipped;
}
if (frames > MAX_FRAMES_PER_TICK) { if (frames > MAX_FRAMES_PER_TICK) {
frames = MAX_FRAMES_PER_TICK; frames = MAX_FRAMES_PER_TICK;
} }
@ -1326,6 +1333,7 @@ static Property uhci_properties[] = {
DEFINE_PROP_STRING("masterbus", UHCIState, masterbus), DEFINE_PROP_STRING("masterbus", UHCIState, masterbus),
DEFINE_PROP_UINT32("firstport", UHCIState, firstport, 0), DEFINE_PROP_UINT32("firstport", UHCIState, firstport, 0),
DEFINE_PROP_UINT32("bandwidth", UHCIState, frame_bandwidth, 1280), DEFINE_PROP_UINT32("bandwidth", UHCIState, frame_bandwidth, 1280),
DEFINE_PROP_UINT32("maxframes", UHCIState, maxframes, 128),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };