[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/26] usbredir: Add usbredir_init_endpoints() helpe
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 24/26] usbredir: Add usbredir_init_endpoints() helper |
Date: |
Fri, 14 Dec 2012 14:35:45 +0100 |
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb/redirect.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index f4715f3..b3a96f7 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -1086,6 +1086,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)
{
USBRedirDevice *dev = DO_UPCAST(USBRedirDevice, dev, udev);
@@ -1112,9 +1123,7 @@ static int usbredir_initfn(USBDevice *udev)
packet_id_queue_init(&dev->cancelled, dev, "cancelled");
packet_id_queue_init(&dev->already_in_flight, dev, "already-in-flight");
- for (i = 0; i < MAX_ENDPOINTS; i++) {
- QTAILQ_INIT(&dev->endpoint[i].bufpq);
- }
+ usbredir_init_endpoints(dev);
/* We'll do the attach once we receive the speed from the usb-host */
udev->auto_attach = 0;
@@ -1317,7 +1326,6 @@ static void usbredir_device_connect(void *priv,
static void usbredir_device_disconnect(void *priv)
{
USBRedirDevice *dev = priv;
- int i;
/* Stop any pending attaches */
qemu_del_timer(dev->attach_timer);
@@ -1334,11 +1342,7 @@ static void usbredir_device_disconnect(void *priv)
/* Reset state so that the next dev connected starts with a clean slate */
usbredir_cleanup_device_queues(dev);
- memset(dev->endpoint, 0, sizeof(dev->endpoint));
- for (i = 0; i < MAX_ENDPOINTS; i++) {
- QTAILQ_INIT(&dev->endpoint[i].bufpq);
- }
- usb_ep_init(&dev->dev);
+ usbredir_init_endpoints(dev);
dev->interface_info.interface_count = NO_INTERFACE_INFO;
dev->dev.addr = 0;
dev->dev.speed = 0;
--
1.8.0.1
- [Qemu-devel] [PATCH 19/26] usb: Add an usb_device_ep_stopped USBDevice method, (continued)
- [Qemu-devel] [PATCH 19/26] usb: Add an usb_device_ep_stopped USBDevice method, Hans de Goede, 2012/12/14
- [Qemu-devel] [PATCH 16/26] uhci: Maximize how many frames we catch up when behind, Hans de Goede, 2012/12/14
- [Qemu-devel] [PATCH 21/26] usbredir: Add USBEP2I and I2USBEP helper macros, Hans de Goede, 2012/12/14
- [Qemu-devel] [PATCH 22/26] usbredir: Add ep_stopped USBDevice method, Hans de Goede, 2012/12/14
- [Qemu-devel] [PATCH 23/26] usbredir: Verify we have 32 bits bulk length cap when redirecting to xhci, Hans de Goede, 2012/12/14
- [Qemu-devel] [PATCH 26/26] usbredir: Add support for buffered bulk input, Hans de Goede, 2012/12/14
[Qemu-devel] [PATCH 24/26] usbredir: Add usbredir_init_endpoints() helper,
Hans de Goede <=
[Qemu-devel] [PATCH 25/26] usb-redir: Add debugging to bufpq save / restore, Hans de Goede, 2012/12/14
[Qemu-devel] [PATCH 18/26] usb: Fix usb_ep_find_packet_by_id, Hans de Goede, 2012/12/14