Changeset 6b433a8 in mainline for uspace/drv/bus/usb/xhci/endpoint.c

Timestamp:

2017-11-20T19:14:31Z (7 years ago)

Author:

Salmelu <salmelu@…>

Branches:

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

Children:

27b0ea0

Parents:

d3086873

Message:

Isochronous transfers - endpoint initialization

File:

• uspace/drv/bus/usb/xhci/endpoint.c (modified) (3 diffs)

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

@@ -193 +193 @@
 }
 
+static int xhci_isoch_alloc_transfers(xhci_endpoint_t *xhci_ep) {
+        int i = 0;
+        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)) {
+                        err = ENOMEM;
+                        break;
+                }
+                transfer->size = 0;
+                ++i;
+        }
+
+        if (err) {
+                --i;
+                while(i >= 0) {
+                        dma_buffer_free(&xhci_ep->isoch_transfers[i]->data);
+                        --i;
+                }
+        }
+
+        return err;
+}
+
 int xhci_endpoint_alloc_transfer_ds(xhci_endpoint_t *xhci_ep)
 {
@@ -203 +227 @@
         if ((err = xhci_trb_ring_init(&xhci_ep->ring))) {
                 return err;
+        }
+
+        if (xhci_ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS) {
+                if((err = xhci_isoch_alloc_transfers(xhci_ep))) {
+                        xhci_trb_ring_fini(&xhci_ep->ring);
+                        return err;
+                }
         }
 
@@ -289 +320 @@
         XHCI_EP_TR_DPTR_SET(*ctx, ep->ring.dequeue);
         XHCI_EP_DCS_SET(*ctx, 1);
-        // TODO: max ESIT payload
+
+        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);
 }