Changes in uspace/lib/c/generic/ddi.c [8049b79:b5c2f56] in mainline

File:

• uspace/lib/c/generic/ddi.c (modified) (6 diffs)

uspace/lib/c/generic/ddi.c

@@ -42 +42 @@
 #include <ddi.h>
 #include <libarch/ddi.h>
-#include <device/hw_res.h>
-#include <device/hw_res_parsed.h>
-#include <device/pio_window.h>
 #include <libc.h>
 #include <task.h>
@@ -79 +76 @@
  *
  */
-int physmem_map(uintptr_t phys, size_t pages, unsigned int flags, void **virt)
+int physmem_map(void *phys, size_t pages, unsigned int flags, void **virt)
 {
         return __SYSCALL5(SYS_PHYSMEM_MAP, (sysarg_t) phys,
@@ -86 +83 @@
 
 int dmamem_map(void *virt, size_t size, unsigned int map_flags,
-    unsigned int flags, uintptr_t *phys)
+    unsigned int flags, void **phys)
 {
         return (int) __SYSCALL6(SYS_DMAMEM_MAP, (sysarg_t) size,
@@ -93 +90 @@
 }
 
-int dmamem_map_anonymous(size_t size, uintptr_t constraint,
-    unsigned int map_flags, unsigned int flags, uintptr_t *phys, void **virt)
-{
-        *phys = constraint;
-        
+int dmamem_map_anonymous(size_t size, unsigned int map_flags,
+    unsigned int flags, void **phys, void **virt)
+{
         return (int) __SYSCALL6(SYS_DMAMEM_MAP, (sysarg_t) size,
             (sysarg_t) map_flags, (sysarg_t) flags | DMAMEM_FLAGS_ANONYMOUS,
@@ -137 +132 @@
         
         return __SYSCALL1(SYS_IOSPACE_ENABLE, (sysarg_t) &arg);
-}
-
-/** Enable PIO for specified address range.
- *
- * @param range I/O range to be enable.
- * @param virt  Virtual address for application's PIO operations. 
- */
-int pio_enable_range(addr_range_t *range, void **virt)
-{
-        return pio_enable(RNGABSPTR(*range), RNGSZ(*range), virt);
-}
-
-/** Enable PIO for specified HW resource wrt. to the PIO window.
- *
- * @param win      PIO window. May be NULL if the resources are known to be
- *                 absolute.
- * @param res      Resources specifying the I/O range wrt. to the PIO window.
- * @param virt     Virtual address for application's PIO operations.
- *
- * @return EOK on success.
- * @return Negative error code on failure.
- *
- */
-int pio_enable_resource(pio_window_t *win, hw_resource_t *res, void **virt)
-{
-        uintptr_t addr;
-        size_t size;
-
-        switch (res->type) {
-        case IO_RANGE:
-                addr = res->res.io_range.address;
-                if (res->res.io_range.relative) {
-                        if (!win)
-                                return EINVAL;
-                        addr += win->io.base;
-                }
-                size = res->res.io_range.size;
-                break;
-        case MEM_RANGE:
-                addr = res->res.mem_range.address;
-                if (res->res.mem_range.relative) {
-                        if (!win)
-                                return EINVAL;
-                        addr += win->mem.base;
-                }
-                size = res->res.mem_range.size;
-                break;
-        default:
-                return EINVAL;
-        }
-
-        return pio_enable((void *) addr, size, virt);   
 }
 
@@ -215 +158 @@
         if (!virt)
                 return EINVAL;
-        
-        uintptr_t phys_frame =
-            ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
-        size_t offset = (uintptr_t) pio_addr - phys_frame;
+
+        void *phys_frame =
+            (void *) ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
+        size_t offset = pio_addr - phys_frame;
         size_t pages = SIZE2PAGES(offset + size);