Changeset c21e6a5 in mainline for uspace/drv/bus/usb/uhci/uhci_batch.h

Timestamp:

2018-02-05T00:54:08Z (6 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/uhci/uhci_batch.h (modified) (3 diffs)

uspace/drv/bus/usb/uhci/uhci_batch.h

@@ -61 +61 @@
         /** Number of TDs used by the transfer */
         size_t td_count;
-        /** Data buffer, must be accessible by the UHCI hw */
-        void *device_buffer;
+        /* Setup data */
+        char *setup_buffer;
+        /** Backing TDs + setup_buffer */
+        dma_buffer_t uhci_dma_buffer;
         /** List element */
         link_t link;
@@ -80 +82 @@
 {
         assert(uhci_batch);
-        assert(uhci_batch->device_buffer);
-        return uhci_batch->device_buffer + sizeof(qh_t) +
+        return uhci_batch->uhci_dma_buffer.virt + sizeof(qh_t) +
             uhci_batch->td_count * sizeof(td_t);
 }
@@ -93 +94 @@
 {
         assert(uhci_batch);
-        return uhci_transfer_batch_setup_buffer(uhci_batch) +
-            (uhci_batch->base.ep->transfer_type == USB_TRANSFER_CONTROL ? USB_SETUP_PACKET_SIZE : 0);
+        return uhci_batch->base.dma_buffer.virt;
 }