Changes in uspace/lib/c/generic/ddi.c [fbcdeb8:c0699467] in mainline

File:

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

uspace/lib/c/generic/ddi.c

@@ -33 +33 @@
  */
 
-#include <assert.h>
-#include <unistd.h>
-#include <errno.h>
 #include <sys/types.h>
 #include <abi/ddi/arg.h>
@@ -45 +42 @@
 #include <align.h>
 #include <libarch/config.h>
-#include "private/libc.h"
 
 /** Return unique device number.
@@ -57 +53 @@
 }
 
-/** Map a piece of physical memory to task.
+/** Map piece of physical memory to task.
  *
  * Caller of this function must have the CAP_MEM_MANAGER capability.
  *
- * @param phys  Physical address of the starting frame.
- * @param pages Number of pages to map.
- * @param flags Flags for the new address space area.
- * @param virt  Virtual address of the starting page.
+ * @param pf            Physical address of the starting frame.
+ * @param vp            Virtual address of the starting page.
+ * @param pages         Number of pages to map.
+ * @param flags         Flags for the new address space area.
  *
- * @return EOK on success
- * @return EPERM if the caller lacks the CAP_MEM_MANAGER capability
- * @return ENOENT if there is no task with specified ID
- * @return ENOMEM if there was some problem in creating
- *         the address space area.
- *
+ * @return              0 on success, EPERM if the caller lacks the
+ *                      CAP_MEM_MANAGER capability, ENOENT if there is no task
+ *                      with specified ID and ENOMEM if there was some problem
+ *                      in creating address space area.
  */
-int physmem_map(void *phys, size_t pages, unsigned int flags, void **virt)
+int physmem_map(void *pf, void *vp, unsigned long pages, int flags)
 {
-        return __SYSCALL5(SYS_PHYSMEM_MAP, (sysarg_t) phys,
-            pages, flags, (sysarg_t) virt, (sysarg_t) __entry);
-}
-
-int dmamem_map(void *virt, size_t size, unsigned int map_flags,
-    unsigned int flags, void **phys)
-{
-        return (int) __SYSCALL6(SYS_DMAMEM_MAP, (sysarg_t) size,
-            (sysarg_t) map_flags, (sysarg_t) flags & ~DMAMEM_FLAGS_ANONYMOUS,
-            (sysarg_t) phys, (sysarg_t) virt, 0);
-}
-
-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,
-            (sysarg_t) phys, (sysarg_t) virt, (sysarg_t) __entry);
-}
-
-int dmamem_unmap(void *virt, size_t size)
-{
-        return __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, (sysarg_t) size, 0);
-}
-
-int dmamem_unmap_anonymous(void *virt)
-{
-        return __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, 0,
-            DMAMEM_FLAGS_ANONYMOUS);
+        return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages,
+            flags);
 }
 
@@ -110 +77 @@
  * Caller of this function must have the IO_MEM_MANAGER capability.
  *
- * @param id     Task ID.
- * @param ioaddr Starting address of the I/O range.
- * @param size   Size of the range.
+ * @param id            Task ID.
+ * @param ioaddr        Starting address of the I/O range.
+ * @param size          Size of the range.
  *
- * @return EOK on success
- * @return EPERM if the caller lacks the CAP_IO_MANAGER capability
- * @return ENOENT if there is no task with specified ID
- * @return ENOMEM if there was some problem in allocating memory.
- *
+ * @return              0 on success, EPERM if the caller lacks the
+ *                      CAP_IO_MANAGER capability, ENOENT if there is no task
+ *                      with specified ID and ENOMEM if there was some problem
+ *                      in allocating memory.
  */
 int iospace_enable(task_id_t id, void *ioaddr, unsigned long size)
 {
         ddi_ioarg_t arg;
-        
+
         arg.task_id = id;
         arg.ioaddr = ioaddr;
         arg.size = size;
-        
+
         return __SYSCALL1(SYS_IOSPACE_ENABLE, (sysarg_t) &arg);
 }
@@ -133 +99 @@
 /** Enable PIO for specified I/O range.
  *
- * @param pio_addr I/O start address.
- * @param size     Size of the I/O region.
- * @param virt     Virtual address for application's
- *                 PIO operations.
+ * @param pio_addr      I/O start address.
+ * @param size          Size of the I/O region.
+ * @param use_addr      Address where the final address for application's PIO
+ *                      will be stored.
  *
- * @return EOK on success.
- * @return Negative error code on failure.
- *
+ * @return              Zero on success or negative error code.
  */
-int pio_enable(void *pio_addr, size_t size, void **virt)
+int pio_enable(void *pio_addr, size_t size, void **use_addr)
 {
+        void *phys;
+        void *virt;
+        size_t offset;
+        unsigned int pages;
+
 #ifdef IO_SPACE_BOUNDARY
         if (pio_addr < IO_SPACE_BOUNDARY) {
-                *virt = pio_addr;
+                *use_addr = pio_addr;
                 return iospace_enable(task_get_id(), pio_addr, size);
         }
 #endif
-        
-        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);
-        
-        void *virt_page;
-        int rc = physmem_map(phys_frame, pages,
-            AS_AREA_READ | AS_AREA_WRITE, &virt_page);
-        if (rc != EOK)
-                return rc;
-        
-        *virt = virt_page + offset;
-        return EOK;
+
+        phys = (void *) ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
+        offset = pio_addr - phys;
+        pages = ALIGN_UP(offset + size, PAGE_SIZE) >> PAGE_WIDTH;
+        virt = as_get_mappable_page(pages << PAGE_WIDTH);
+        *use_addr = virt + offset;
+        return physmem_map(phys, virt, pages, AS_AREA_READ | AS_AREA_WRITE);
 }
 
@@ -176 +138 @@
  *
  */
-int irq_register(int inr, int devno, int method, irq_code_t *ucode)
+int register_irq(int inr, int devno, int method, irq_code_t *ucode)
 {
-        return __SYSCALL4(SYS_IRQ_REGISTER, inr, devno, method,
+        return __SYSCALL4(SYS_REGISTER_IRQ, inr, devno, method,
             (sysarg_t) ucode);
 }
@@ -190 +152 @@
  *
  */
-int irq_unregister(int inr, int devno)
+int unregister_irq(int inr, int devno)
 {
-        return __SYSCALL2(SYS_IRQ_UNREGISTER, inr, devno);
+        return __SYSCALL2(SYS_UNREGISTER_IRQ, inr, devno);
 }