Changes in uspace/lib/c/generic/as.c [8d70937:fbcdeb8] in mainline

File:

• uspace/lib/c/generic/as.c (modified) (2 diffs)

uspace/lib/c/generic/as.c

@@ -45 +45 @@
 /** Create address space area.
  *
- * @param address Virtual address where to place new address space area.
- * @param size    Size of the area.
- * @param flags   Flags describing type of the area.
+ * @param base  Starting virtual address of the area.
+ *              If set to (void *) -1, the kernel finds
+ *              a mappable area.
+ * @param size  Size of the area.
+ * @param flags Flags describing type of the area.
  *
- * @return address on success, (void *) -1 otherwise.
+ * @return Starting virtual address of the created area on success.
+ * @return (void *) -1 otherwise.
  *
  */
-void *as_area_create(void *address, size_t size, unsigned int flags)
+void *as_area_create(void *base, size_t size, unsigned int flags)
 {
-        return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t) address,
-            (sysarg_t) size, (sysarg_t) flags);
+        return (void *) __SYSCALL4(SYS_AS_AREA_CREATE, (sysarg_t) base,
+            (sysarg_t) size, (sysarg_t) flags, (sysarg_t) __entry);
 }
 
@@ -102 +105 @@
 }
 
-/** Return pointer to unmapped address space area
+/** Find mapping to physical address.
  *
- * @param size Requested size of the allocation.
+ * @param      virt Virtual address to find mapping for.
+ * @param[out] phys Physical adress.
  *
- * @return Pointer to the beginning of unmapped address space area.
+ * @return EOK on no error.
+ * @retval ENOENT if no mapping was found.
  *
  */
-void *as_get_mappable_page(size_t size)
+int as_get_physical_mapping(const void *virt, uintptr_t *phys)
 {
-        return (void *) __SYSCALL2(SYS_AS_GET_UNMAPPED_AREA,
-            (sysarg_t) __entry, (sysarg_t) size);
-}
-
-/** Find mapping to physical address.
- *
- * @param address Virtual address in question (virtual).
- * @param[out] frame Frame address (physical).
- * @return Error code.
- * @retval EOK No error, @p frame holds the translation.
- * @retval ENOENT Mapping not found.
- */
-int as_get_physical_mapping(const void *address, uintptr_t *frame)
-{
-        uintptr_t tmp_frame;
-        uintptr_t virt = (uintptr_t) address;
-        
-        int rc = (int) __SYSCALL2(SYS_PAGE_FIND_MAPPING,
-            (sysarg_t) virt, (sysarg_t) &tmp_frame);
-        if (rc != EOK) {
-                return rc;
-        }
-        
-        if (frame != NULL) {
-                *frame = tmp_frame;
-        }
-        
-        return EOK;
+        return (int) __SYSCALL2(SYS_PAGE_FIND_MAPPING, (sysarg_t) virt,
+            (sysarg_t) phys);
 }