david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usbredir: Add usbredir_init_endpoints() helper

Browse Source 
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:45 +01:00 committed by Gerd Hoffmann
parent d3aea641a4
commit bd019b735a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/usb/redirect.c
View File

@ -1063,6 +1063,17 @@ static void usbredir_vm_state_change(void *priv, int running, RunState state)
} }
} }
static void usbredir_init_endpoints(USBRedirDevice *dev)
{
int i;
usb_ep_init(&dev->dev);
memset(dev->endpoint, 0, sizeof(dev->endpoint));
for (i = 0; i < MAX_ENDPOINTS; i++) {
QTAILQ_INIT(&dev->endpoint[i].bufpq);
}
}
static int usbredir_initfn(USBDevice *udev) static int usbredir_initfn(USBDevice *udev)
{ {
USBRedirDevice *dev = DO_UPCAST(USBRedirDevice, dev, udev); USBRedirDevice *dev = DO_UPCAST(USBRedirDevice, dev, udev);
@ -1089,9 +1100,7 @@ static int usbredir_initfn(USBDevice *udev)
packet_id_queue_init(&dev->cancelled, dev, "cancelled"); packet_id_queue_init(&dev->cancelled, dev, "cancelled");
packet_id_queue_init(&dev->already_in_flight, dev, "already-in-flight"); packet_id_queue_init(&dev->already_in_flight, dev, "already-in-flight");
for (i = 0; i < MAX_ENDPOINTS; i++) { usbredir_init_endpoints(dev);
QTAILQ_INIT(&dev->endpoint[i].bufpq);
}
/* We'll do the attach once we receive the speed from the usb-host */ /* We'll do the attach once we receive the speed from the usb-host */
udev->auto_attach = 0; udev->auto_attach = 0;
@ -1295,7 +1304,6 @@ static void usbredir_device_connect(void *priv,
static void usbredir_device_disconnect(void *priv) static void usbredir_device_disconnect(void *priv)
{ {
USBRedirDevice *dev = priv; USBRedirDevice *dev = priv;
int i;
/* Stop any pending attaches */ /* Stop any pending attaches */
qemu_del_timer(dev->attach_timer); qemu_del_timer(dev->attach_timer);
@ -1312,11 +1320,7 @@ static void usbredir_device_disconnect(void *priv)
/* Reset state so that the next dev connected starts with a clean slate */ /* Reset state so that the next dev connected starts with a clean slate */
usbredir_cleanup_device_queues(dev); usbredir_cleanup_device_queues(dev);
memset(dev->endpoint, 0, sizeof(dev->endpoint)); usbredir_init_endpoints(dev);
for (i = 0; i < MAX_ENDPOINTS; i++) {
QTAILQ_INIT(&dev->endpoint[i].bufpq);
}
usb_ep_init(&dev->dev);
dev->interface_info.interface_count = NO_INTERFACE_INFO; dev->interface_info.interface_count = NO_INTERFACE_INFO;
dev->dev.addr = 0; dev->dev.addr = 0;
dev->dev.speed = 0; dev->dev.speed = 0;