Changeset 8d6c1f1 in mainline for kernel/generic/src/mm/page.c

Timestamp:

2011-06-07T21:31:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

75608143

Parents:

ff4f073 (diff), eb522e8 (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 USB support.

Changes from bzr://helenos-usb.bzr.sourceforge.net/bzrroot/helenos-usb/mainline:

• replaced '-' with '_' in new driver names
• USB libs are built for each architecture
• devman starts early
• sys_thread_udelay() uses generic delay()
• sys_as_create_area() now creates cacheable areas by default

File:

• kernel/generic/src/mm/page.c (modified) (3 diffs)

kernel/generic/src/mm/page.c

@@ -60 +60 @@
 
 #include <mm/page.h>
+#include <genarch/mm/page_ht.h>
+#include <genarch/mm/page_pt.h>
 #include <arch/mm/page.h>
 #include <arch/mm/asid.h>
@@ -70 +72 @@
 #include <debug.h>
 #include <arch.h>
+#include <syscall/copy.h>
+#include <errno.h>
 
 /** Virtual operations for page subsystem. */
@@ -172 +176 @@
 }
 
+/** Syscall wrapper for getting mapping of a virtual page.
+ * 
+ * @retval EOK Everything went find, @p uspace_frame and @p uspace_node
+ *             contains correct values.
+ * @retval ENOENT Virtual address has no mapping.
+ */
+sysarg_t sys_page_find_mapping(uintptr_t virt_address,
+    uintptr_t *uspace_frame)
+{
+        mutex_lock(&AS->lock);
+        
+        pte_t *pte = page_mapping_find(AS, virt_address, false);
+        if (!PTE_VALID(pte) || !PTE_PRESENT(pte)) {
+                mutex_unlock(&AS->lock);
+                
+                return (sysarg_t) ENOENT;
+        }
+        
+        uintptr_t phys_address = PTE_GET_FRAME(pte);
+        
+        mutex_unlock(&AS->lock);
+        
+        int rc = copy_to_uspace(uspace_frame,
+            &phys_address, sizeof(phys_address));
+        if (rc != EOK) {
+                return (sysarg_t) rc;
+        }
+        
+        return EOK;
+}
+
 /** @}
  */