diff options
| -rw-r--r-- | hw/usb-ehci.c | 2 | ||||
| -rw-r--r-- | hw/usb-ohci.c | 2 | ||||
| -rw-r--r-- | hw/usb-uhci.c | 1 | ||||
| -rw-r--r-- | hw/usb.h | 11 | ||||
| -rw-r--r-- | usb-linux.c | 4 | ||||
| -rw-r--r-- | usb-redir.c | 9 |
6 files changed, 19 insertions, 10 deletions
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c index 825fcc05b3..df742f7f02 100644 --- a/hw/usb-ehci.c +++ b/hw/usb-ehci.c @@ -1299,6 +1299,7 @@ static void ehci_execute_complete(EHCIQueue *q) if (q->usb_status < 0) { switch(q->usb_status) { + case USB_RET_IOERROR: case USB_RET_NODEV: q->qh.token |= (QTD_TOKEN_HALT | QTD_TOKEN_XACTERR); set_field(&q->qh.token, 0, QTD_TOKEN_CERR); @@ -1471,6 +1472,7 @@ static int ehci_process_itd(EHCIState *ehci, default: fprintf(stderr, "Unexpected iso usb result: %d\n", ret); /* Fall through */ + case USB_RET_IOERROR: case USB_RET_NODEV: /* 3.3.2: XACTERR is only allowed on IN transactions */ if (dir) { diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index 7aa19fe781..20aaa74250 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -837,6 +837,7 @@ static int ohci_service_iso_td(OHCIState *ohci, struct ohci_ed *ed, OHCI_CC_DATAUNDERRUN); } else { switch (ret) { + case USB_RET_IOERROR: case USB_RET_NODEV: OHCI_SET_BM(iso_td.offset[relative_frame_number], TD_PSW_CC, OHCI_CC_DEVICENOTRESPONDING); @@ -1052,6 +1053,7 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed) OHCI_SET_BM(td.flags, TD_CC, OHCI_CC_DATAUNDERRUN); } else { switch (ret) { + case USB_RET_IOERROR: case USB_RET_NODEV: OHCI_SET_BM(td.flags, TD_CC, OHCI_CC_DEVICENOTRESPONDING); case USB_RET_NAK: diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index 70e3881321..2c6ed38608 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -765,6 +765,7 @@ out: break; return 1; + case USB_RET_IOERROR: case USB_RET_NODEV: default: break; @@ -39,11 +39,12 @@ #define USB_TOKEN_IN 0x69 /* device -> host */ #define USB_TOKEN_OUT 0xe1 /* host -> device */ -#define USB_RET_NODEV (-1) -#define USB_RET_NAK (-2) -#define USB_RET_STALL (-3) -#define USB_RET_BABBLE (-4) -#define USB_RET_ASYNC (-5) +#define USB_RET_NODEV (-1) +#define USB_RET_NAK (-2) +#define USB_RET_STALL (-3) +#define USB_RET_BABBLE (-4) +#define USB_RET_IOERROR (-5) +#define USB_RET_ASYNC (-6) #define USB_SPEED_LOW 0 #define USB_SPEED_FULL 1 diff --git a/usb-linux.c b/usb-linux.c index 38df9e613e..050ea7a87d 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -369,7 +369,7 @@ static void async_complete(void *opaque) break; default: - p->result = USB_RET_NAK; + p->result = USB_RET_IOERROR; break; } @@ -729,7 +729,7 @@ static int urb_status_to_usb_ret(int status) case -EOVERFLOW: return USB_RET_BABBLE; default: - return USB_RET_NAK; + return USB_RET_IOERROR; } } diff --git a/usb-redir.c b/usb-redir.c index c52311ac02..8e9f175dbb 100644 --- a/usb-redir.c +++ b/usb-redir.c @@ -431,7 +431,7 @@ static int usbredir_handle_iso_data(USBRedirDevice *dev, USBPacket *p, /* Check iso_error for stream errors, otherwise its an underrun */ status = dev->endpoint[EP2I(ep)].iso_error; dev->endpoint[EP2I(ep)].iso_error = 0; - return status ? USB_RET_NAK : 0; + return status ? USB_RET_IOERROR : 0; } DPRINTF2("iso-token-in ep %02X status %d len %d queue-size: %d\n", ep, isop->status, isop->len, dev->endpoint[EP2I(ep)].bufpq_size); @@ -439,7 +439,7 @@ static int usbredir_handle_iso_data(USBRedirDevice *dev, USBPacket *p, status = isop->status; if (status != usb_redir_success) { bufp_free(dev, isop, ep); - return USB_RET_NAK; + return USB_RET_IOERROR; } len = isop->len; @@ -1018,11 +1018,14 @@ static int usbredir_handle_status(USBRedirDevice *dev, return USB_RET_STALL; case usb_redir_cancelled: WARNING("returning cancelled packet to HC?\n"); + return USB_RET_NAK; case usb_redir_inval: + WARNING("got invalid param error from usb-host?\n"); + return USB_RET_NAK; case usb_redir_ioerror: case usb_redir_timeout: default: - return USB_RET_NAK; + return USB_RET_IOERROR; } } |