Changeset 132ab5d1 in mainline for uspace/drv/intctl/apic/apic.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/apic/apic.c (modified) (3 diffs)

uspace/drv/intctl/apic/apic.c

@@ -45 +45 @@
 #include <stdbool.h>
 #include <errno.h>
+#include <str_error.h>
 #include <async.h>
 #include <stdio.h>
@@ -220 +221 @@
         rc = pio_enable((void *) res->base, IO_APIC_SIZE, &regs);
         if (rc != EOK) {
-                printf("%s: Failed to enable PIO for APIC: %d\n", NAME, rc);
+                printf("%s: Failed to enable PIO for APIC: %s\n", NAME, str_error(rc));
                 return EIO;
         }
@@ -237 +238 @@
         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;
         }