Changeset eeb5cc2 in mainline

Timestamp:

2013-09-12T12:24:09Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46eb2c4

Parents:

9e470c0

Message:

Add pio_enable_resource() to slightly simplify enabling of PIO and also
to abstract away from relative/absolute ranges in HW resources.

Location:

uspace/lib/c

Files:

• generic/ddi.c (modified) (1 diff)
• include/ddi.h (modified) (2 diffs)

uspace/lib/c/generic/ddi.c

@@ -136 +136 @@
 }
 
+/** Enable PIO for specified HW resource.
+ *
+ * @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);   
+}
+
 /** Enable PIO for specified I/O range.
  *

uspace/lib/c/include/ddi.h

@@ -40 +40 @@
 #include <sys/time.h>
 #include <abi/ddi/irq.h>
+#include <device/hw_res.h>
+#include <device/pio_window.h>
 #include <task.h>
 
@@ -55 +57 @@
 extern int dmamem_unmap_anonymous(void *);
 
+extern int pio_enable_resource(pio_window_t *, hw_resource_t *, void **);
 extern int pio_enable(void *, size_t, void **);