Changes in uspace/drv/intctl/obio/obio.c [c1694b6b:d0cbfd3] in mainline

File:

• uspace/drv/intctl/obio/obio.c (modified) (5 diffs)

uspace/drv/intctl/obio/obio.c

@@ -42 +42 @@
  */
 
+#include <align.h>
+#include <as.h>
 #include <async.h>
 #include <ddf/driver.h>
@@ -47 +49 @@
 #include <ddi.h>
 #include <errno.h>
-#include <str_error.h>
 #include <inttypes.h>
 #include <ipc/irc.h>
@@ -117 +118 @@
 {
         ddf_fun_t *fun_a = NULL;
+        int flags;
+        int retval;
         int rc;
 
-        rc = pio_enable((void *)res->base, OBIO_SIZE, (void **) &obio->regs);
-        if (rc != EOK) {
+        flags = AS_AREA_READ | AS_AREA_WRITE;
+        obio->regs = (ioport64_t *)AS_AREA_ANY;
+        retval = physmem_map(res->base,
+            ALIGN_UP(OBIO_SIZE, PAGE_SIZE) >> PAGE_WIDTH, flags,
+            (void *) &obio->regs);
+
+        if (retval < 0) {
                 ddf_msg(LVL_ERROR, "Error mapping OBIO registers");
                 rc = EIO;
@@ -126 +134 @@
         }
 
-        ddf_msg(LVL_NOTE, "OBIO registers with base at 0x%" PRIxn, res->base);
+        ddf_msg(LVL_NOTE, "OBIO registers with base at 0x%" PRIun, res->base);
 
         fun_a = ddf_fun_create(obio->dev, fun_exposed, "a");
@@ -139 +147 @@
         rc = ddf_fun_bind(fun_a);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed binding function 'a': %s", str_error(rc));
+                ddf_msg(LVL_ERROR, "Failed binding function 'a'. (%d)", rc);
                 goto error;
         }