Changeset 1440eae in mainline for uspace/lib/c/generic/ddi.c

Timestamp:

2011-12-22T12:04:54Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

3819ce5

Parents:

65d7b0a (diff), a438de4 (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 with mainline

File:

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

uspace/lib/c/generic/ddi.c

@@ -45 +45 @@
 #include <align.h>
 #include <libarch/config.h>
+#include "private/libc.h"
 
 /** Return unique device number.
@@ -61 +62 @@
  *
  * @param phys  Physical address of the starting frame.
- * @param virt  Virtual address of the starting page.
  * @param pages Number of pages to map.
  * @param flags Flags for the new address space area.
+ * @param virt  Virtual address of the starting page.
  *
  * @return EOK on success
@@ -72 +73 @@
  *
  */
-int physmem_map(void *phys, void *virt, size_t pages, unsigned int flags)
+int physmem_map(void *phys, size_t pages, unsigned int flags, void **virt)
 {
-        return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) phys,
-            (sysarg_t) virt, pages, flags);
+        return __SYSCALL5(SYS_PHYSMEM_MAP, (sysarg_t) phys,
+            pages, flags, (sysarg_t) virt, (sysarg_t) __entry);
 }
 
@@ -81 +82 @@
     unsigned int flags, void **phys)
 {
-        return (int) __SYSCALL5(SYS_DMAMEM_MAP, (sysarg_t) virt,
-            (sysarg_t) size, (sysarg_t) map_flags, (sysarg_t) flags,
-            (sysarg_t) 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);
 }
 
@@ -89 +90 @@
     unsigned int flags, void **phys, void **virt)
 {
-        *virt = as_get_mappable_page(size);
-        if (*virt == NULL)
-                return ENOMEM;
-        
-        return dmamem_map(*virt, size, map_flags,
-            flags | DMAMEM_FLAGS_ANONYMOUS, 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, (sysarg_t) __entry);
 }
 
-int dmamem_unmap(void *virt, size_t size, unsigned int flags)
+int dmamem_unmap(void *virt, size_t size)
 {
-        return __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, (sysarg_t) size,
-            (sysarg_t) flags);
+        return __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, (sysarg_t) size, 0);
 }
 
@@ -138 +135 @@
  * @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.
+ * @param virt     Virtual address for application's
+ *                 PIO operations.
  *
- * @return Zero on success or negative error code.
+ * @return EOK on success.
+ * @return Negative error code on failure.
  *
  */
-int pio_enable(void *pio_addr, size_t size, void **use_addr)
+int pio_enable(void *pio_addr, size_t size, void **virt)
 {
-        void *phys;
-        void *virt;
-        size_t offset;
-        unsigned int pages;
-        
 #ifdef IO_SPACE_BOUNDARY
         if (pio_addr < IO_SPACE_BOUNDARY) {
-                *use_addr = pio_addr;
+                *virt = pio_addr;
                 return iospace_enable(task_get_id(), pio_addr, size);
         }
 #endif
         
-        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);
+        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;
 }
 
@@ -176 +176 @@
  *
  */
-int register_irq(int inr, int devno, int method, irq_code_t *ucode)
+int irq_register(int inr, int devno, int method, irq_code_t *ucode)
 {
-        return __SYSCALL4(SYS_REGISTER_IRQ, inr, devno, method,
+        return __SYSCALL4(SYS_IRQ_REGISTER, inr, devno, method,
             (sysarg_t) ucode);
 }
@@ -190 +190 @@
  *
  */
-int unregister_irq(int inr, int devno)
+int irq_unregister(int inr, int devno)
 {
-        return __SYSCALL2(SYS_UNREGISTER_IRQ, inr, devno);
+        return __SYSCALL2(SYS_IRQ_UNREGISTER, inr, devno);
 }