[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/9] usb: split endpoint init and reset
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 7/9] usb: split endpoint init and reset |
Date: |
Mon, 9 Jul 2012 12:20:31 +0200 |
Create a new usb_ep_reset() function to reset endpoint state, without
re-initialiting the queues, so we don't unlink in-flight packets just
because usb-host has to re-parse the descriptor tables.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb.h | 1 +
hw/usb/core.c | 13 +++++++++++--
hw/usb/host-linux.c | 5 +++--
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/hw/usb.h b/hw/usb.h
index a5623d3..9cd2f89 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -363,6 +363,7 @@ void usb_packet_complete(USBDevice *dev, USBPacket *p);
void usb_cancel_packet(USBPacket * p);
void usb_ep_init(USBDevice *dev);
+void usb_ep_reset(USBDevice *dev);
void usb_ep_dump(USBDevice *dev);
struct USBEndpoint *usb_ep_get(USBDevice *dev, int pid, int ep);
uint8_t usb_ep_get_type(USBDevice *dev, int pid, int ep);
diff --git a/hw/usb/core.c b/hw/usb/core.c
index 0e02da7..fe15be0 100644
--- a/hw/usb/core.c
+++ b/hw/usb/core.c
@@ -550,7 +550,7 @@ void usb_packet_cleanup(USBPacket *p)
qemu_iovec_destroy(&p->iov);
}
-void usb_ep_init(USBDevice *dev)
+void usb_ep_reset(USBDevice *dev)
{
int ep;
@@ -559,7 +559,6 @@ void usb_ep_init(USBDevice *dev)
dev->ep_ctl.ifnum = 0;
dev->ep_ctl.dev = dev;
dev->ep_ctl.pipeline = false;
- QTAILQ_INIT(&dev->ep_ctl.queue);
for (ep = 0; ep < USB_MAX_ENDPOINTS; ep++) {
dev->ep_in[ep].nr = ep + 1;
dev->ep_out[ep].nr = ep + 1;
@@ -573,6 +572,16 @@ void usb_ep_init(USBDevice *dev)
dev->ep_out[ep].dev = dev;
dev->ep_in[ep].pipeline = false;
dev->ep_out[ep].pipeline = false;
+ }
+}
+
+void usb_ep_init(USBDevice *dev)
+{
+ int ep;
+
+ usb_ep_reset(dev);
+ QTAILQ_INIT(&dev->ep_ctl.queue);
+ for (ep = 0; ep < USB_MAX_ENDPOINTS; ep++) {
QTAILQ_INIT(&dev->ep_in[ep].queue);
QTAILQ_INIT(&dev->ep_out[ep].queue);
}
diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c
index 5479fb5..9ba8925 100644
--- a/hw/usb/host-linux.c
+++ b/hw/usb/host-linux.c
@@ -1136,7 +1136,7 @@ static int usb_linux_update_endp_table(USBHostDevice *s)
USBDescriptor *d;
bool active = false;
- usb_ep_init(&s->dev);
+ usb_ep_reset(&s->dev);
for (i = 0;; i += d->bLength) {
if (i+2 >= s->descr_len) {
@@ -1239,7 +1239,7 @@ static int usb_linux_update_endp_table(USBHostDevice *s)
return 0;
error:
- usb_ep_init(&s->dev);
+ usb_ep_reset(&s->dev);
return 1;
}
@@ -1326,6 +1326,7 @@ static int usb_host_open(USBHostDevice *dev, int bus_num,
goto fail;
}
+ usb_ep_init(&dev->dev);
ret = usb_linux_update_endp_table(dev);
if (ret) {
goto fail;
--
1.7.1
- [Qemu-devel] [PULL 0/9] usb patch queue, Gerd Hoffmann, 2012/07/09
- [Qemu-devel] [PATCH] usb: split endpoint init and reset, Gerd Hoffmann, 2012/07/09
- [Qemu-devel] [PATCH 5/9] ehci: Kick async schedule on wakeup in the non companion case, Gerd Hoffmann, 2012/07/09
- [Qemu-devel] [PATCH 9/9] usb-host: add trace events for iso xfers, Gerd Hoffmann, 2012/07/09
- [Qemu-devel] [PATCH 1/9] ehci: fix ehci_qh_do_overlay, Gerd Hoffmann, 2012/07/09
- [Qemu-devel] [PATCH 7/9] usb: split endpoint init and reset,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 6/9] usb-redir: Correctly handle the usb_redir_babble usbredir status, Gerd Hoffmann, 2012/07/09
- [Qemu-devel] [PATCH 4/9] usb-ehci: Fix an assert whenever isoc transfers are used, Gerd Hoffmann, 2012/07/09
- [Qemu-devel] [PATCH 8/9] usb: fix interface initialization, Gerd Hoffmann, 2012/07/09
- [Qemu-devel] [PATCH 3/9] ehci: don't flush cache on doorbell rings., Gerd Hoffmann, 2012/07/09
- [Qemu-devel] [PATCH 2/9] ehci: fix td writeback, Gerd Hoffmann, 2012/07/09
- Re: [Qemu-devel] [PULL 0/9] usb patch queue, Anthony Liguori, 2012/07/09