Changeset 7010861 in mainline for uspace/drv/bus

Timestamp:

2017-10-27T11:39:59Z (8 years ago)

Author:

Michal Staruch <salmelu@…>

Branches:

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

Children:

8b8c164

Parents:

3f6c94ed

Message:

Added a check for trb ring initialization

This could cause weird crashes when streams were used before, it may help debugging later when we start working with streams.

File:

• uspace/drv/bus/usb/xhci/transfers.c (modified) (2 diffs)

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

@@ -320 +320 @@
         }
 
+        // FIXME: find a better way to check if the ring is not initialized
+        if (!xhci_ep->ring.segment_count) {
+                usb_log_error("Ring not initialized for endpoint num %u!", xhci_ep->base.endpoint);
+                return EINVAL;
+        }
+
         const usb_transfer_type_t type = batch->ep->transfer_type;
         assert(type >= 0 && type < ARRAY_SIZE(transfer_handlers));
@@ -328 +334 @@
         }
 
+
         if (batch->dir != USB_DIRECTION_IN) {
                 // Sending stuff from host to device, we need to copy the actual data.