[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/31] xhci: allow address slot being called multipl
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 08/31] xhci: allow address slot being called multiple times |
Date: |
Thu, 1 Nov 2012 16:54:21 +0100 |
win8 guests do that for some reason ...
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-xhci.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 3259638..900abf5 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -483,6 +483,8 @@ enum xhci_flags {
static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid,
unsigned int epid);
+static TRBCCode xhci_disable_ep(XHCIState *xhci, unsigned int slotid,
+ unsigned int epid);
static void xhci_event(XHCIState *xhci, XHCIEvent *event, int v);
static void xhci_write_event(XHCIState *xhci, XHCIEvent *event, int v);
@@ -1075,8 +1077,7 @@ static TRBCCode xhci_enable_ep(XHCIState *xhci, unsigned
int slotid,
slot = &xhci->slots[slotid-1];
if (slot->eps[epid-1]) {
- fprintf(stderr, "xhci: slot %d ep %d already enabled!\n", slotid,
epid);
- return CC_TRB_ERROR;
+ xhci_disable_ep(xhci, slotid, epid);
}
epctx = g_malloc(sizeof(XHCIEPContext));
@@ -1919,6 +1920,9 @@ static TRBCCode xhci_address_slot(XHCIState *xhci,
unsigned int slotid,
}
for (i = 0; i < xhci->numslots; i++) {
+ if (i == slotid-1) {
+ continue;
+ }
if (xhci->slots[i].uport == uport) {
fprintf(stderr, "xhci: port %s already assigned to slot %d\n",
uport->path, i+1);
@@ -1936,6 +1940,7 @@ static TRBCCode xhci_address_slot(XHCIState *xhci,
unsigned int slotid,
slot->devaddr = xhci->devaddr++;
slot_ctx[3] = (SLOT_ADDRESSED << SLOT_STATE_SHIFT) | slot->devaddr;
DPRINTF("xhci: device address is %d\n", slot->devaddr);
+ usb_device_reset(dev);
usb_device_handle_control(dev, NULL,
DeviceOutRequest | USB_REQ_SET_ADDRESS,
slot->devaddr, 0, 0, NULL);
--
1.7.1
- [Qemu-devel] [PULL 00/31] usb patch queue, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 03/31] xhci: add xhci_port_have_device, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 04/31] xhci: add xhci_port_notify, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 06/31] xhci: set pls in xhci_port_update & xhci_port_reset, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 08/31] xhci: allow address slot being called multiple times,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 10/31] usb/ehci: Abstract away PCI DMA API, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 07/31] xhci: add port trace points, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 09/31] usb/ehci: parameterise the register region offsets, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 20/31] usb/ehci-pci: add ich9 00:1a.* variant, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 02/31] xhci: s/xhci_update_port/xhci_port_update/, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 21/31] usb/ehci-pci: add helper to create ich9 usb controllers, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 11/31] usb/ehci: seperate out PCIisms, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 29/31] usb-redir: Use reject rather the disconnect on bad ep info, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 01/31] xhci: add {get, set}_field macros & enum for pls, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 18/31] uhci: add ich9 00:1a.* variants, Gerd Hoffmann, 2012/11/01