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

Timestamp:

2017-11-14T23:17:54Z (8 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

e76c0ea

Parents:

cfe4852

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 23:15:24)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 23:17:54)

Message:

xhci: use dma_buffers instead of malloc32 util

A bit of refactoring was needed to adapt scratchpad buffers.

File:

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

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

@@ -34 +34 @@
  */
 
-#include <usb/host/utils/malloc32.h>
 #include <usb/host/endpoint.h>
 #include <usb/descriptor.h>
@@ -135 +134 @@
 
         XHCI_EP_MAX_P_STREAMS_SET(*ctx, pstreams);
-        XHCI_EP_TR_DPTR_SET(*ctx, addr_to_phys(xhci_ep->primary_stream_ctx_array));
+        XHCI_EP_TR_DPTR_SET(*ctx, xhci_ep->primary_stream_ctx_dma.phys);
         // TODO: set HID?
         XHCI_EP_LSA_SET(*ctx, 1);
@@ -167 +166 @@
                 usb_log_debug2("Allocating primary stream context array of size %u for endpoint " XHCI_EP_FMT,
                         count, XHCI_EP_ARGS(*xhci_ep));
-                xhci_ep->primary_stream_ctx_array = malloc32(count * sizeof(xhci_stream_ctx_t));
-                if (!xhci_ep->primary_stream_ctx_array) {
+                if ((dma_buffer_alloc(&xhci_ep->primary_stream_ctx_dma, count * sizeof(xhci_stream_ctx_t))))
                         return ENOMEM;
-                }
+                xhci_ep->primary_stream_ctx_array = xhci_ep->primary_stream_ctx_dma.virt;
 
                 xhci_ep->primary_stream_rings = calloc(count, sizeof(xhci_trb_ring_t));
                 if (!xhci_ep->primary_stream_rings) {
-                        free32(xhci_ep->primary_stream_ctx_array);
+                        dma_buffer_free(&xhci_ep->primary_stream_ctx_dma);
                         return ENOMEM;
                 }
@@ -227 +225 @@
                         // FIXME: Get the trb ring associated with stream [index] and fini it
                 }
-                free32(xhci_ep->primary_stream_ctx_array);
+                dma_buffer_free(&xhci_ep->primary_stream_ctx_dma);
         } else {
                 usb_log_debug2("Freeing main transfer ring of endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));