Changes in kernel/generic/src/ddi/ddi.c [46e886f:6f7071b] in mainline

File:

• kernel/generic/src/ddi/ddi.c (modified) (11 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>
@@ -57 +56 @@
 #include <trace.h>
 #include <bitops.h>
-#include <arch/asm.h>
 
 /** This lock protects the @c pareas ordered dictionary. */
@@ -123 +121 @@
  *
  */
-_NO_TRACE static errno_t physmem_map(uintptr_t phys, size_t pages,
+NO_TRACE static errno_t physmem_map(uintptr_t phys, size_t pages,
     unsigned int flags, uintptr_t *virt, uintptr_t bound)
 {
@@ -229 +227 @@
 }
 
-_NO_TRACE static errno_t physmem_unmap(uintptr_t virt)
+NO_TRACE static errno_t physmem_unmap(uintptr_t virt)
 {
         assert(TASK);
@@ -314 +312 @@
  *
  */
-_NO_TRACE static errno_t iospace_enable(task_id_t id, uintptr_t ioaddr, size_t size)
+NO_TRACE static errno_t iospace_enable(task_id_t id, uintptr_t ioaddr, size_t size)
 {
         /*
@@ -355 +353 @@
  *
  */
-_NO_TRACE static errno_t iospace_disable(task_id_t id, uintptr_t ioaddr, size_t size)
+NO_TRACE static errno_t iospace_disable(task_id_t id, uintptr_t ioaddr, size_t size)
 {
         /*
@@ -415 +413 @@
 }
 
-_NO_TRACE static errno_t dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
+NO_TRACE static errno_t dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
     unsigned int flags, uintptr_t *phys)
 {
@@ -424 +422 @@
 }
 
-_NO_TRACE static errno_t dmamem_map_anonymous(size_t size, uintptr_t constraint,
+NO_TRACE static errno_t dmamem_map_anonymous(size_t size, uintptr_t constraint,
     unsigned int map_flags, unsigned int flags, uintptr_t *phys,
     uintptr_t *virt, uintptr_t bound)
@@ -453 +451 @@
 }
 
-_NO_TRACE static errno_t dmamem_unmap(uintptr_t virt, size_t size)
+NO_TRACE static errno_t dmamem_unmap(uintptr_t virt, size_t size)
 {
         // TODO: implement unlocking & unmap
@@ -459 +457 @@
 }
 
-_NO_TRACE static errno_t dmamem_unmap_anonymous(uintptr_t virt)
+NO_TRACE static errno_t dmamem_unmap_anonymous(uintptr_t virt)
 {
         return as_area_destroy(TASK->as, virt);
@@ -529 +527 @@
                 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);
-}
 
 /** @}