[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] xhci: fix control xfers
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 6/7] xhci: fix control xfers |
Date: |
Fri, 2 Mar 2012 14:19:29 +0100 |
Use the new, direct control transfer submission method instead of
bypassing the usb core by calling usb_device_handle_control directly.
The later fails for async control transfers.
This patch gets xhci + usb-host combo going.
---
hw/usb-xhci.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/hw/usb-xhci.c b/hw/usb-xhci.c
index fc5b542..8305489 100644
--- a/hw/usb-xhci.c
+++ b/hw/usb-xhci.c
@@ -1470,8 +1470,8 @@ static USBDevice *xhci_find_device(XHCIPort *port,
uint8_t addr)
static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer)
{
XHCITRB *trb_setup, *trb_status;
- uint8_t bmRequestType, bRequest;
- uint16_t wValue, wLength, wIndex;
+ uint8_t bmRequestType;
+ uint16_t wLength;
XHCIPort *port;
USBDevice *dev;
int ret;
@@ -1508,9 +1508,6 @@ static int xhci_fire_ctl_transfer(XHCIState *xhci,
XHCITransfer *xfer)
}
bmRequestType = trb_setup->parameter;
- bRequest = trb_setup->parameter >> 8;
- wValue = trb_setup->parameter >> 16;
- wIndex = trb_setup->parameter >> 32;
wLength = trb_setup->parameter >> 48;
if (xfer->data && xfer->data_alloced < wLength) {
@@ -1537,12 +1534,12 @@ static int xhci_fire_ctl_transfer(XHCIState *xhci,
XHCITransfer *xfer)
xfer->iso_xfer = false;
xhci_setup_packet(xfer, dev);
+ xfer->packet.parameter = trb_setup->parameter;
if (!xfer->in_xfer) {
xhci_xfer_data(xfer, xfer->data, wLength, 0, 1, 0);
}
- ret = usb_device_handle_control(dev, &xfer->packet,
- (bmRequestType << 8) | bRequest,
- wValue, wIndex, wLength, xfer->data);
+
+ ret = usb_handle_packet(dev, &xfer->packet);
xhci_complete_packet(xfer, ret);
if (!xfer->running_async && !xfer->running_retry) {
--
1.7.1
- [Qemu-devel] [PATCH 0/7] usb: packet pipelining, Gerd Hoffmann, 2012/03/02
- [Qemu-devel] [PATCH 4/7] usb-host: enable pipelineing for bulk endpoints., Gerd Hoffmann, 2012/03/02
- [Qemu-devel] [PATCH 1/7] uhci_fill_queue: zap debug printf, Gerd Hoffmann, 2012/03/02
- [Qemu-devel] [PATCH 2/7] usb: queue can have async packets, Gerd Hoffmann, 2012/03/02
- [Qemu-devel] [PATCH 7/7] xhci: fix port status, Gerd Hoffmann, 2012/03/02
- [Qemu-devel] [PATCH 3/7] usb: add pipelining option to usb endpoints, Gerd Hoffmann, 2012/03/02
- [Qemu-devel] [PATCH 6/7] xhci: fix control xfers,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 5/7] usb: add shortcut for control transfers, Gerd Hoffmann, 2012/03/02