Changeset 5909c59 in mainline

Timestamp:

2017-12-20T14:27:21Z (7 years ago)

Author:

Salmelu <salmelu@…>

Branches:

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

Children:

bd1fab90

Parents:

a31068a

Message:

xhci: fixed isoch_transfers array

Location:

uspace/drv/bus/usb/xhci

Files:

• endpoint.c (modified) (2 diffs)
• endpoint.h (modified) (1 diff)
• transfers.c (modified) (2 diffs)

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

@@ -214 +214 @@
         int err = EOK;
         while (i < XHCI_ISOCH_BUFFER_COUNT) {
-                xhci_isoch_transfer_t *transfer = xhci_ep->isoch_transfers[i];
+                xhci_isoch_transfer_t *transfer = &xhci_ep->isoch_transfers[i];
                 if (dma_buffer_alloc(&transfer->data, xhci_ep->isoch_max_size)) {
                         err = ENOMEM;
@@ -226 +226 @@
                 --i;
                 while(i >= 0) {
-                        dma_buffer_free(&xhci_ep->isoch_transfers[i]->data);
+                        dma_buffer_free(&xhci_ep->isoch_transfers[i].data);
                         --i;
                 }

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

@@ -95 +95 @@
         /** Isochronous scheduled transfers with respective buffers */
         #define XHCI_ISOCH_BUFFER_COUNT 4
-        xhci_isoch_transfer_t* isoch_transfers[XHCI_ISOCH_BUFFER_COUNT];
+        xhci_isoch_transfer_t isoch_transfers[XHCI_ISOCH_BUFFER_COUNT];
 
         /** Indices to transfers */

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

@@ -238 +238 @@
                 return NULL;
         }
-        xhci_isoch_transfer_t *isoch_transfer = ep->isoch_transfers[ep->isoch_enqueue];
+        xhci_isoch_transfer_t *isoch_transfer = &ep->isoch_transfers[ep->isoch_enqueue];
         ep->isoch_enqueue = (ep->isoch_enqueue + 1) % XHCI_ISOCH_BUFFER_COUNT;
         return isoch_transfer;
@@ -244 +244 @@
 
 static xhci_isoch_transfer_t* isoch_transfer_get_dequeue(xhci_endpoint_t *ep) {
-        xhci_isoch_transfer_t *isoch_transfer = ep->isoch_transfers[ep->isoch_dequeue];
+        xhci_isoch_transfer_t *isoch_transfer = &ep->isoch_transfers[ep->isoch_dequeue];
         ep->isoch_dequeue = (ep->isoch_dequeue + 1) % XHCI_ISOCH_BUFFER_COUNT;
         return isoch_transfer;