Changeset bf9cb2f in mainline for kernel/generic/src

Timestamp:

2014-05-19T01:01:27Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

10ef47ba

Parents:

527f1ca

Message:

complete the desired API semantics of physmem_map() and dmamem_map_anonymous() to be compatible with as_area_create()
(the user is allowed to request a specific virtual memory base address, the kernel uses an available base address if AS_AREA_ANY is used)

File:

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

kernel/generic/src/ddi/ddi.c

@@ -229 +229 @@
     void *virt_ptr, uintptr_t bound)
 {
-        uintptr_t virt = (uintptr_t) -1;
-        int rc = physmem_map(ALIGN_DOWN(phys, FRAME_SIZE), pages, flags,
-            &virt, bound);
+        uintptr_t virt;
+        int rc = copy_from_uspace(&virt, virt_ptr, sizeof(virt));
+        if (rc != EOK)
+                return rc;
+        
+        rc = physmem_map(ALIGN_DOWN(phys, FRAME_SIZE), pages, flags, &virt,
+            bound);
         if (rc != EOK)
                 return rc;
@@ -390 +394 @@
                         return rc;
                 
+                uintptr_t virt;
+                rc = copy_from_uspace(&virt, virt_ptr, sizeof(virt));
+                if (rc != EOK)
+                        return rc;
+                
                 uintptr_t phys;
-                uintptr_t virt = (uintptr_t) -1;
                 rc = dmamem_map_anonymous(size, constraint, map_flags, flags,
                     &phys, &virt, bound);