Changeset 1d758fc in mainline for uspace/drv/bus/usb/ehci/ehci_batch.c

Timestamp:

2018-02-12T10:11:47Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

5fe3f954

Parents:

2f762a7

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-05 03:28:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-12 10:11:47)

Message:

usb: rethinking DMA buffers

File:

• uspace/drv/bus/usb/ehci/ehci_batch.c (modified) (5 diffs)

uspace/drv/bus/usb/ehci/ehci_batch.c

@@ -102 +102 @@
                 : 0;
 
-        const size_t size = ehci_batch->base.buffer_size;
+        const size_t size = ehci_batch->base.size;
 
         /* Add TD left over by the previous transfer */
@@ -180 +180 @@
 
         /* Assume all data got through */
-        ehci_batch->base.transferred_size = ehci_batch->base.buffer_size;
+        ehci_batch->base.transferred_size = ehci_batch->base.size;
 
         /* Check all TDs */
@@ -216 +216 @@
         }
 
-        assert(ehci_batch->base.transferred_size <= ehci_batch->base.buffer_size);
+        assert(ehci_batch->base.transferred_size <= ehci_batch->base.size);
 
         /* Clear TD pointers */
@@ -281 +281 @@
         /* Data stage */
         unsigned td_current = 1;
-        size_t remain_size = ehci_batch->base.buffer_size;
+        size_t remain_size = ehci_batch->base.size;
         uintptr_t buffer = dma_buffer_phys(&ehci_batch->base.dma_buffer,
             ehci_batch->data_buffer);
@@ -335 +335 @@
 
         size_t td_current = 0;
-        size_t remain_size = ehci_batch->base.buffer_size;
+        size_t remain_size = ehci_batch->base.size;
         uintptr_t buffer = dma_buffer_phys(&ehci_batch->base.dma_buffer,
             ehci_batch->data_buffer);