Changeset 72d120e in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2014-06-16T20:17:44Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

5a78e4e

Parents:

9d653e3 (diff), 334bf28 (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:

Integrate from mainline.

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);