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

Timestamp:

2017-11-14T23:17:54Z (7 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/transfers.c (modified) (8 diffs)

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

@@ -34 +34 @@
  */
 
-#include <usb/host/utils/malloc32.h>
 #include <usb/debug.h>
 #include <usb/request.h>
@@ -113 +112 @@
         assert(transfer);
 
-        if (transfer->hc_buffer)
-                free32(transfer->hc_buffer);
+        dma_buffer_free(&transfer->hc_buffer);
 }
 
@@ -156 +154 @@
                 xhci_trb_clean(trb_data);
 
-                trb_data->parameter = addr_to_phys(transfer->hc_buffer);
+                trb_data->parameter = host2xhci(64, transfer->hc_buffer.phys);
 
                 // data size (sent for OUT, or buffer size)
@@ -196 +194 @@
         xhci_trb_t trb;
         xhci_trb_clean(&trb);
-        trb.parameter = addr_to_phys(transfer->hc_buffer);
+        trb.parameter = host2xhci(64, transfer->hc_buffer.phys);
 
         // data size (sent for OUT, or buffer size)
@@ -217 +215 @@
         xhci_trb_t trb;
         xhci_trb_clean(&trb);
-        trb.parameter = addr_to_phys(transfer->hc_buffer);
+        trb.parameter = host2xhci(64, transfer->hc_buffer.phys);
 
         // data size (sent for OUT, or buffer size)
@@ -282 +280 @@
                 assert(batch->buffer);
                 assert(batch->transfered_size <= batch->buffer_size);
-                memcpy(batch->buffer, transfer->hc_buffer, batch->transfered_size);
+                memcpy(batch->buffer, transfer->hc_buffer.virt, batch->transfered_size);
         }
 
@@ -324 +322 @@
 
         if (batch->buffer_size > 0) {
-                transfer->hc_buffer = malloc32(batch->buffer_size);
-                if (!transfer->hc_buffer)
+                if (dma_buffer_alloc(&transfer->hc_buffer, batch->buffer_size))
                         return ENOMEM;
         }
@@ -331 +328 @@
         if (batch->dir != USB_DIRECTION_IN) {
                 // Sending stuff from host to device, we need to copy the actual data.
-                memcpy(transfer->hc_buffer, batch->buffer, batch->buffer_size);
+                memcpy(transfer->hc_buffer.virt, batch->buffer, batch->buffer_size);
         }