Changeset 8cbf1c3 in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2013-09-09T23:13:10Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e2a0d76

Parents:

c67dbd6

Message:

prepare the public API of the frame allocator for the new backend
remove FRAME_KA (can be easily implemented explicitly)

File:

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

kernel/generic/src/ddi/ddi.c

@@ -314 +314 @@
 
 NO_TRACE static int dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
-    unsigned int flags, void **phys)
+    unsigned int flags, uintptr_t *phys)
 {
         ASSERT(TASK);
@@ -323 +323 @@
 
 NO_TRACE static int dmamem_map_anonymous(size_t size, unsigned int map_flags,
-    unsigned int flags, void **phys, uintptr_t *virt, uintptr_t bound)
+    unsigned int flags, uintptr_t *phys, uintptr_t *virt, uintptr_t bound)
 {
         ASSERT(TASK);
@@ -336 +336 @@
                 order = fnzb(pages - 1) + 1;
         
-        *phys = frame_alloc_noreserve(order, 0);
-        if (*phys == NULL)
+        *phys = frame_alloc_noreserve(order, 0, 0);
+        if (*phys == 0)
                 return ENOMEM;
         
         mem_backend_data_t backend_data;
-        backend_data.base = (uintptr_t) *phys;
+        backend_data.base = *phys;
         backend_data.frames = pages;
         
         if (!as_area_create(TASK->as, map_flags, size,
             AS_AREA_ATTR_NONE, &phys_backend, &backend_data, virt, bound)) {
-                frame_free_noreserve((uintptr_t) *phys);
+                frame_free_noreserve(*phys);
                 return ENOMEM;
         }
@@ -387 +387 @@
                  */
                 
-                void *phys;
+                uintptr_t phys;
                 int rc = dmamem_map((uintptr_t) virt_ptr, size, map_flags,
                     flags, &phys);
@@ -404 +404 @@
                  */
                 
-                void *phys;
+                uintptr_t phys;
                 uintptr_t virt = (uintptr_t) -1;
                 int rc = dmamem_map_anonymous(size, map_flags, flags,