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

Timestamp:

2018-01-08T22:30:12Z (6 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.c (modified) (6 diffs)

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

@@ -89 +89 @@
 
         if (xhci_ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS) {
-                xhci_ep->isoch_max_size = desc->companion.bytes_per_interval
+                xhci_ep->isoch->max_size = desc->companion.bytes_per_interval
                         ? desc->companion.bytes_per_interval
                         : ep->max_transfer_size;
@@ -95 +95 @@
 
                 /* Allocate and setup isochronous-specific structures. */
-                xhci_ep->isoch_enqueue = 0;
-                xhci_ep->isoch_dequeue = 0;
-                xhci_ep->isoch_started = false;
-
-                fibril_mutex_initialize(&xhci_ep->isoch_guard);
-                fibril_condvar_initialize(&xhci_ep->isoch_avail);
+                xhci_ep->isoch->enqueue = 0;
+                xhci_ep->isoch->dequeue = 0;
+                xhci_ep->isoch->started = false;
+
+                fibril_mutex_initialize(&xhci_ep->isoch->guard);
+                fibril_condvar_initialize(&xhci_ep->isoch->avail);
         }
 
@@ -266 +266 @@
         int err = EOK;
         while (i < XHCI_ISOCH_BUFFER_COUNT) {
-                xhci_isoch_transfer_t *transfer = &xhci_ep->isoch_transfers[i];
-                if (dma_buffer_alloc(&transfer->data, xhci_ep->isoch_max_size)) {
+                xhci_isoch_transfer_t *transfer = &xhci_ep->isoch->transfers[i];
+                if (dma_buffer_alloc(&transfer->data, xhci_ep->isoch->max_size)) {
                         err = ENOMEM;
                         break;
@@ -278 +278 @@
                 --i;
                 while(i >= 0) {
-                        dma_buffer_free(&xhci_ep->isoch_transfers[i].data);
+                        dma_buffer_free(&xhci_ep->isoch->transfers[i].data);
                         --i;
                 }
@@ -342 +342 @@
         if (xhci_ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS) {
                 for (size_t i = 0; i < XHCI_ISOCH_BUFFER_COUNT; ++i) {
-                        dma_buffer_free(&xhci_ep->isoch_transfers[i].data);
+                        dma_buffer_free(&xhci_ep->isoch->transfers[i].data);
                 }
         }
@@ -417 +417 @@
         XHCI_EP_INTERVAL_SET(*ctx, fnzb32(ep->interval) % 32 - 1);
 
-        XHCI_EP_MAX_ESIT_PAYLOAD_LO_SET(*ctx, ep->isoch_max_size & 0xFFFF);
-        XHCI_EP_MAX_ESIT_PAYLOAD_HI_SET(*ctx, (ep->isoch_max_size >> 16) & 0xFF);
+        XHCI_EP_MAX_ESIT_PAYLOAD_LO_SET(*ctx, ep->isoch->max_size & 0xFFFF);
+        XHCI_EP_MAX_ESIT_PAYLOAD_HI_SET(*ctx, (ep->isoch->max_size >> 16) & 0xFF);
 }