Changeset 17c5e62 in mainline for uspace/drv/bus/usb/xhci/endpoint.h

Timestamp:

2018-01-08T22:30:12Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

0eadfd1e

Parents:

bdd8842c

Message:

xhci: make isoch part of endpoint optional

File:

• uspace/drv/bus/usb/xhci/endpoint.h (modified) (1 diff)

uspace/drv/bus/usb/xhci/endpoint.h

@@ -93 +93 @@
         uint32_t interval;
 
-        /** The maximum size of an isochronous transfer and therefore the size of buffers */
-        size_t isoch_max_size;
+        /** This field is a valid pointer for (and only for) isochronous transfers. */
+        struct {
+                /** The maximum size of an isochronous transfer and therefore the size of buffers */
+                size_t max_size;
 
-        /** Isochronous scheduled transfers with respective buffers */
-        #define XHCI_ISOCH_BUFFER_COUNT 4
-        xhci_isoch_transfer_t isoch_transfers[XHCI_ISOCH_BUFFER_COUNT];
+                /** Isochronous scheduled transfers with respective buffers */
+                #define XHCI_ISOCH_BUFFER_COUNT 4
+                xhci_isoch_transfer_t transfers[XHCI_ISOCH_BUFFER_COUNT];
 
-        /** Indices to transfers */
-        size_t isoch_dequeue, isoch_enqueue;
+                /** Indices to transfers */
+                size_t dequeue, enqueue;
 
-        /** Are isochronous transfers started? */
-        bool isoch_started;
+                /** Are isochronous transfers started? */
+                bool started;
 
-        /** Protects common buffers. */
-        fibril_mutex_t isoch_guard;
+                /** Protects common buffers. */
+                fibril_mutex_t guard;
 
-        /** Signals filled buffer. */
-        fibril_condvar_t isoch_avail;
-
+                /** Signals filled buffer. */
+                fibril_condvar_t avail;
+        } isoch [0];
 } xhci_endpoint_t;