Changeset 7aaed09 in mainline for uspace/lib/c/generic/as.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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:

Merge mainline changes.

File:

• uspace/lib/c/generic/as.c (modified) (1 diff)

uspace/lib/c/generic/as.c

@@ -117 +117 @@
 /** 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.
+ * @param      virt Virtual address to find mapping for.
+ * @param[out] phys Physical adress.
+ *
+ * @return EOK on no error.
+ * @retval ENOENT if no mapping was found.
+ *
  */
-int as_get_physical_mapping(const void *address, uintptr_t *frame)
+int as_get_physical_mapping(const void *virt, uintptr_t *phys)
 {
-        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);
 }