Changeset 1d758fc in mainline for uspace/drv/bus/usb/xhci/scratchpad.c

Timestamp:

2018-02-12T10:11:47Z (6 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/xhci/scratchpad.c (modified) (1 diff)

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

@@ -72 +72 @@
         memset(hc->scratchpad_array.virt, 0, size);
 
-        uint64_t phys_begin = hc->scratchpad_array.phys + array_size;
+        const char *base = hc->scratchpad_array.virt + array_size;
         uint64_t *array = hc->scratchpad_array.virt;
 
-        for (unsigned i = 0; i < num_bufs; ++i)
-                array[i] = host2xhci(64, phys_begin + i * PAGE_SIZE);
+        for (unsigned i = 0; i < num_bufs; ++i) {
+                array[i] = host2xhci(64, dma_buffer_phys(&hc->scratchpad_array,
+                            base + i * PAGE_SIZE));
+        }
 
-        hc->dcbaa[0] = host2xhci(64, hc->scratchpad_array.phys);
+        hc->dcbaa[0] = host2xhci(64, dma_buffer_phys_base(&hc->scratchpad_array));
 
         usb_log_debug("Allocated %d scratchpad buffers.", num_bufs);