Changeset 132ab5d1 in mainline for uspace/drv/intctl/obio/obio.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

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