Changeset 1d758fc in mainline for uspace/drv/bus/usb/xhci/trb_ring.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/trb_ring.c (modified) (2 diffs)

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

@@ -89 +89 @@
 static errno_t trb_segment_alloc(trb_segment_t **segment)
 {
-        dma_buffer_t dbuf;
-
-        const errno_t err = dma_buffer_alloc(&dbuf, PAGE_SIZE);
+        *segment = AS_AREA_ANY;
+        uintptr_t phys;
+
+        const int err = dmamem_map_anonymous(PAGE_SIZE,
+            DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0,
+            &phys, (void **) segment);
         if (err)
                 return err;
 
-        *segment = dbuf.virt;
         memset(*segment, 0, PAGE_SIZE);
-        (*segment)->phys = dbuf.phys;
+        (*segment)->phys = phys;
         usb_log_debug("Allocated new ring segment.");
         return EOK;
@@ -104 +106 @@
 static void trb_segment_free(trb_segment_t *segment)
 {
-        dma_buffer_t dbuf = { .virt = segment, .phys = segment->phys };
-        dma_buffer_free(&dbuf);
+        dmamem_unmap_anonymous(segment);
 }