Changeset e3122b0 in mainline

Timestamp:

2012-07-20T14:33:35Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3795f9c

Parents:

8fccd42

Message:

uhci: Use dmamem_map_anonymous instead of as area tricks.

File:

• uspace/drv/bus/usb/uhci/utils/malloc32.h (modified) (2 diffs)

uspace/drv/bus/usb/uhci/utils/malloc32.h

@@ -35 +35 @@
 #define DRV_UHCI_UTILS_MALLOC32_H
 
+#include <as.h>
 #include <assert.h>
-#include <unistd.h>
+#include <ddi.h>
 #include <errno.h>
 #include <malloc.h>
 #include <mem.h>
-#include <as.h>
+#include <unistd.h>
 
 #define UHCI_STRCUTURES_ALIGNMENT 16
@@ -99 +100 @@
 static inline void * get_page(void)
 {
-        void *address = as_area_create(AS_AREA_ANY, UHCI_REQUIRED_PAGE_SIZE,
-            AS_AREA_READ | AS_AREA_WRITE);
-        if (address == AS_MAP_FAILED)
-                return NULL;
-        
-        return address;
+        void *address, *phys;
+        const int ret = dmamem_map_anonymous(UHCI_REQUIRED_PAGE_SIZE,
+            AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &address);
+        return ret == EOK ? address : NULL;
 }
 
 static inline void return_page(void *page)
 {
-        if (page)
-                as_area_destroy(page);
+        dmamem_unmap_anonymous(page);
 }