Changes in kernel/generic/src/ddi/ddi.c [8df5f20:5a5269d] in mainline

File:

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

kernel/generic/src/ddi/ddi.c

@@ -46 +46 @@
 #include <mm/frame.h>
 #include <mm/as.h>
+#include <mm/km.h>
 #include <mm/page.h>
 #include <synch/mutex.h>
@@ -56 +57 @@
 #include <trace.h>
 #include <bitops.h>
+#include <arch/asm.h>
 
 /** This lock protects the @c pareas ordered dictionary. */
@@ -246 +248 @@
  */
 sys_errno_t sys_physmem_map(uintptr_t phys, size_t pages, unsigned int flags,
-    void *virt_ptr, uintptr_t bound)
+    uspace_ptr_uintptr_t virt_ptr, uintptr_t bound)
 {
         uintptr_t virt;
@@ -260 +262 @@
         rc = copy_to_uspace(virt_ptr, &virt, sizeof(virt));
         if (rc != EOK) {
-                physmem_unmap((uintptr_t) virt);
+                physmem_unmap(virt);
                 return rc;
         }
@@ -391 +393 @@
  *
  */
-sys_errno_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
+sys_errno_t sys_iospace_enable(uspace_ptr_ddi_ioarg_t uspace_io_arg)
 {
         ddi_ioarg_t arg;
@@ -402 +404 @@
 }
 
-sys_errno_t sys_iospace_disable(ddi_ioarg_t *uspace_io_arg)
+sys_errno_t sys_iospace_disable(uspace_ptr_ddi_ioarg_t uspace_io_arg)
 {
         ddi_ioarg_t arg;
@@ -463 +465 @@
 
 sys_errno_t sys_dmamem_map(size_t size, unsigned int map_flags, unsigned int flags,
-    void *phys_ptr, void *virt_ptr, uintptr_t bound)
+    uspace_ptr_uintptr_t phys_ptr, uspace_ptr_uintptr_t virt_ptr, uintptr_t bound)
 {
         if ((flags & DMAMEM_FLAGS_ANONYMOUS) == 0) {
@@ -471 +473 @@
 
                 uintptr_t phys;
-                errno_t rc = dmamem_map((uintptr_t) virt_ptr, size, map_flags,
+                errno_t rc = dmamem_map(virt_ptr, size, map_flags,
                     flags, &phys);
 
@@ -479 +481 @@
                 rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys));
                 if (rc != EOK) {
-                        dmamem_unmap((uintptr_t) virt_ptr, size);
+                        dmamem_unmap(virt_ptr, size);
                         return rc;
                 }
@@ -506 +508 @@
                 rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys));
                 if (rc != EOK) {
-                        dmamem_unmap_anonymous((uintptr_t) virt);
+                        dmamem_unmap_anonymous(virt);
                         return rc;
                 }
@@ -512 +514 @@
                 rc = copy_to_uspace(virt_ptr, &virt, sizeof(virt));
                 if (rc != EOK) {
-                        dmamem_unmap_anonymous((uintptr_t) virt);
+                        dmamem_unmap_anonymous(virt);
                         return rc;
                 }
@@ -527 +529 @@
                 return dmamem_unmap_anonymous(virt);
 }
+void *pio_map(void *phys, size_t size)
+{
+#ifdef IO_SPACE_BOUNDARY
+        if (phys < IO_SPACE_BOUNDARY)
+                return phys;
+#endif
+        return (void *) km_map((uintptr_t) phys, size, KM_NATURAL_ALIGNMENT,
+            PAGE_READ | PAGE_WRITE | PAGE_NOT_CACHEABLE);
+}
+
+void pio_unmap(void *phys, void *virt, size_t size)
+{
+#ifdef IO_SPACE_BOUNDARY
+        if (phys < IO_SPACE_BOUNDARY)
+                return;
+#endif
+        km_unmap((uintptr_t) virt, size);
+}
 
 /** @}