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

Timestamp:

2018-02-05T00:54:08Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

af16ebe

Parents:

65c059f

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-05 00:27:40)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-05 00:54:08)

Message:

usbhost: prepare buffers for transfers in library

File:

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

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

@@ -115 +115 @@
 {
         xhci_transfer_t *transfer = xhci_transfer_from_batch(batch);
-
-        dma_buffer_free(&transfer->hc_buffer);
         free(transfer);
 }
@@ -135 +133 @@
         size_t i, size_t total, size_t *remaining)
 {
-        const uintptr_t ptr = dma_buffer_phys(&transfer->hc_buffer,
-                transfer->hc_buffer.virt + i * PAGE_SIZE);
+        const uintptr_t ptr = dma_buffer_phys(&transfer->batch.dma_buffer,
+                transfer->batch.dma_buffer.virt + i * PAGE_SIZE);
 
         trb->parameter = host2xhci(64, ptr);
@@ -418 +416 @@
         }
 
-        if (batch->dir == USB_DIRECTION_IN) {
-                assert(batch->buffer);
-                assert(batch->transferred_size <= batch->buffer_size);
-                memcpy(batch->buffer, transfer->hc_buffer.virt, batch->transferred_size);
-        }
+        assert(batch->transferred_size <= batch->buffer_size);
 
         usb_transfer_batch_finish(batch);
@@ -472 +466 @@
         const usb_transfer_type_t type = batch->ep->transfer_type;
         assert(transfer_handlers[type]);
-
-        if (batch->buffer_size > 0) {
-                if (dma_buffer_alloc(&transfer->hc_buffer, batch->buffer_size))
-                        return ENOMEM;
-        }
-
-        if (batch->dir != USB_DIRECTION_IN) {
-                // Sending stuff from host to device, we need to copy the actual data.
-                memcpy(transfer->hc_buffer.virt, batch->buffer, batch->buffer_size);
-        }
 
         /*