[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/20] usb-ehci: Cleanup itd error handling
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 11/20] usb-ehci: Cleanup itd error handling |
Date: |
Wed, 7 Mar 2012 14:05:11 +0100 |
From: Hans de Goede <address@hidden>
All error statuses except for NAK are handled in a switch case, move the
handling of NAK into the same switch case.
Signed-off-by: Hans de Goede <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb-ehci.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index 9197298..825fcc0 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -1466,20 +1466,7 @@ static int ehci_process_itd(EHCIState *ehci,
}
qemu_sglist_destroy(&ehci->isgl);
- if (ret == USB_RET_NAK) {
- /* no data for us, so do a zero-length transfer */
- ret = 0;
- }
-
- if (ret >= 0) {
- if (!dir) {
- /* OUT */
- set_field(&itd->transact[i], len - ret, ITD_XACT_LENGTH);
- } else {
- /* IN */
- set_field(&itd->transact[i], ret, ITD_XACT_LENGTH);
- }
- } else {
+ if (ret < 0) {
switch (ret) {
default:
fprintf(stderr, "Unexpected iso usb result: %d\n", ret);
@@ -1495,6 +1482,19 @@ static int ehci_process_itd(EHCIState *ehci,
itd->transact[i] |= ITD_XACT_BABBLE;
ehci_record_interrupt(ehci, USBSTS_ERRINT);
break;
+ case USB_RET_NAK:
+ /* no data for us, so do a zero-length transfer */
+ ret = 0;
+ break;
+ }
+ }
+ if (ret >= 0) {
+ if (!dir) {
+ /* OUT */
+ set_field(&itd->transact[i], len - ret, ITD_XACT_LENGTH);
+ } else {
+ /* IN */
+ set_field(&itd->transact[i], ret, ITD_XACT_LENGTH);
}
}
if (itd->transact[i] & ITD_XACT_IOC) {
--
1.7.1
- [Qemu-devel] [PATCH 13/20] usb: add USB_RET_IOERROR, (continued)
- [Qemu-devel] [PATCH 13/20] usb: add USB_RET_IOERROR, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 04/20] usb-ehci: always call ehci_queues_rip_unused for period queues, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 08/20] usb-ehci: Fix cerr tracking, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 20/20] xhci: fix port status, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 10/20] usb-ehci: Fix and simplify nakcnt handling, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 14/20] uhci_fill_queue: zap debug printf, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 07/20] usb-ehci: Any packet completion except for NAK should set the interrupt, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 09/20] usb-ehci: Remove dead nakcnt code, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 17/20] usb-host: enable pipelineing for bulk endpoints., Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 02/20] usb-ehci: Never follow table entries with the T-bit set, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 11/20] usb-ehci: Cleanup itd error handling,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 18/20] usb: add shortcut for control transfers, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 16/20] usb: add pipelining option to usb endpoints, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 06/20] usb-ehci: Rip the queues when the async or period schedule is halted, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 19/20] xhci: fix control xfers, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 15/20] usb: queue can have async packets, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 01/20] usb-redir: Set ep type and interface, Gerd Hoffmann, 2012/03/07
- Re: [Qemu-devel] [PULL 00/20] usb patch queue, Anthony Liguori, 2012/03/09