Changeset 802898f in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2013-09-02T20:14:11Z (11 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

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

Children:

8c95dff

Parents:

0435fe41 (diff), 61ab4a9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

mainline update

File:

• kernel/generic/src/ddi/ddi.c (modified) (2 diffs)

kernel/generic/src/ddi/ddi.c

@@ -336 +336 @@
                 order = fnzb(pages - 1) + 1;
         
-        *phys = frame_alloc_noreserve(order, 0);
+        *phys = frame_alloc_noreserve(order, FRAME_DMA);
         if (*phys == NULL)
                 return ENOMEM;
@@ -361 +361 @@
 NO_TRACE static int dmamem_unmap_anonymous(uintptr_t virt)
 {
-        // TODO: implement unlocking & unmap
-        return EOK;
+        // TODO: This is an ugly hack
+        as_t *as = TASK->as;
+
+        mutex_lock(&as->lock);
+        as_area_t *area = find_locked_area(as, virt);
+        if (!area) {
+                mutex_unlock(&as->lock);
+                return ENOENT;
+        }
+        frame_free_noreserve(area->backend_data.base);
+        area->backend_data.base = 0;
+        area->backend_data.frames = 0;
+        mutex_unlock(&area->lock);
+        mutex_unlock(&as->lock);
+
+        return as_area_destroy(as, virt);
 }