Changeset 7aaed09 in mainline for uspace/lib/c/generic/ddi.c

Timestamp:

2011-12-18T14:02:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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 mainline changes.

File:

• uspace/lib/c/generic/ddi.c (modified) (6 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>
@@ -53 +56 @@
 }
 
-/** Map piece of physical memory to task.
+/** Map a piece of physical memory to task.
  *
  * Caller of this function must have the CAP_MEM_MANAGER capability.
  *
- * @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.
+ * @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.
  *
- * @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.
+ * @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.
+ *
  */
-int physmem_map(void *pf, void *vp, unsigned long pages, int flags)
+int physmem_map(void *phys, void *virt, size_t pages, unsigned int flags)
 {
-        return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages,
-            flags);
+        return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) phys,
+            (sysarg_t) virt, pages, flags);
+}
+
+int dmamem_map(void *virt, size_t size, unsigned int map_flags,
+    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);
+}
+
+int dmamem_map_anonymous(size_t size, unsigned int map_flags,
+    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);
+}
+
+int dmamem_unmap(void *virt, size_t size, unsigned int flags)
+{
+        return __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, (sysarg_t) size,
+            (sysarg_t) flags);
+}
+
+int dmamem_unmap_anonymous(void *virt)
+{
+        return __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, 0,
+            DMAMEM_FLAGS_ANONYMOUS);
 }
 
@@ -77 +113 @@
  * 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              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.
+ * @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.
+ *
  */
 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);
 }
@@ -99 +136 @@
 /** Enable PIO for specified I/O range.
  *
- * @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 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              Zero on success or negative error code.
+ * @return Zero on success or negative error code.
+ *
  */
 int pio_enable(void *pio_addr, size_t size, void **use_addr)
@@ -112 +150 @@
         size_t offset;
         unsigned int pages;
-
+        
 #ifdef IO_SPACE_BOUNDARY
         if (pio_addr < IO_SPACE_BOUNDARY) {
@@ -119 +157 @@
         }
 #endif
-
+        
         phys = (void *) ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
         offset = pio_addr - phys;