Changeset 6d91888 in mainline

Timestamp:

2017-11-21T12:51:37Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6283cefb

Parents:

375211d2

Message:

xhci: deal with short transfers

Location:

uspace/drv/bus/usb/xhci

Files:

• hw_struct/trb.h (modified) (2 diffs)
• transfers.c (modified) (1 diff)

uspace/drv/bus/usb/xhci/hw_struct/trb.h

@@ -211 +211 @@
 }
 
-enum xhci_trb_completion_code {
+typedef enum xhci_trb_completion_code {
         XHCI_TRBC_INVALID = 0,
         XHCI_TRBC_SUCCESS,
@@ -255 +255 @@
          * 224 - 255 vendor defined info
          */
-};
+} xhci_trb_completion_code_t;
 
 #endif

uspace/drv/bus/usb/xhci/transfers.c

@@ -444 +444 @@
         }
 
-        batch->error = (TRB_COMPLETION_CODE(*trb) == XHCI_TRBC_SUCCESS) ? EOK : ENAK;
-        batch->transfered_size = batch->buffer_size - TRB_TRANSFER_LENGTH(*trb);
+        const xhci_trb_completion_code_t completion_code = TRB_COMPLETION_CODE(*trb);
+        switch (completion_code) {
+                case XHCI_TRBC_SHORT_PACKET:
+                        usb_log_debug("Short transfer.");
+                        /* fallthrough */
+                case XHCI_TRBC_SUCCESS:
+                        batch->error = EOK;
+                        batch->transfered_size = batch->buffer_size - TRB_TRANSFER_LENGTH(*trb);
+                        break;
+
+                default:
+                        usb_log_warning("Transfer not successfull: %u", completion_code);
+                        batch->error = EIO;
+        }
+
         usb_transfer_batch_reset_toggle(batch);
         endpoint_deactivate_locked(&ep->base);