Changes in uspace/drv/char/pl050/pl050.c [b7fd2a0:01c3bb4] in mainline

File:

• uspace/drv/char/pl050/pl050.c (modified) (12 diffs)

uspace/drv/char/pl050/pl050.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <errno.h>
-#include <str_error.h>
 #include <ddf/driver.h>
 #include <ddf/interrupt.h>
@@ -51 +50 @@
 };
 
-static errno_t pl050_dev_add(ddf_dev_t *);
-static errno_t pl050_fun_online(ddf_fun_t *);
-static errno_t pl050_fun_offline(ddf_fun_t *);
+static int pl050_dev_add(ddf_dev_t *);
+static int pl050_fun_online(ddf_fun_t *);
+static int pl050_fun_offline(ddf_fun_t *);
 static void pl050_char_conn(ipc_callid_t, ipc_call_t *, void *);
-static errno_t pl050_read(chardev_srv_t *, void *, size_t, size_t *);
-static errno_t pl050_write(chardev_srv_t *, const void *, size_t, size_t *);
+static int pl050_read(chardev_srv_t *, void *, size_t, size_t *);
+static int pl050_write(chardev_srv_t *, const void *, size_t, size_t *);
 
 static driver_ops_t driver_ops = {
@@ -158 +157 @@
 }
 
-static errno_t pl050_init(pl050_t *pl050)
+static int pl050_init(pl050_t *pl050)
 {
         hw_res_list_parsed_t res;
         void *regs;
-        errno_t rc;
+        int rc;
 
         fibril_mutex_initialize(&pl050->buf_lock);
@@ -213 +212 @@
         pl050->regs = regs;
 
-        int irq_cap;
-        rc = register_interrupt_handler(pl050->dev,
-            res.irqs.irqs[0], pl050_interrupt, &pl050_irq_code, &irq_cap);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed registering interrupt handler. (%s)",
-                    str_error_name(rc));
+        const int irq_cap = register_interrupt_handler(pl050->dev,
+            res.irqs.irqs[0], pl050_interrupt, &pl050_irq_code);
+        if (irq_cap < 0) {
+                rc = irq_cap;
+                ddf_msg(LVL_ERROR, "Failed registering interrupt handler. (%d)",
+                    rc);
                 goto error;
         }
@@ -224 +223 @@
         rc = hw_res_enable_interrupt(pl050->parent_sess, res.irqs.irqs[0]);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed enabling interrupt: %s", str_error(rc));
+                ddf_msg(LVL_ERROR, "Failed enabling interrupt. (%d)", rc);
                 goto error;
         }
@@ -237 +236 @@
 }
 
-static errno_t pl050_read(chardev_srv_t *srv, void *buffer, size_t size,
+static int pl050_read(chardev_srv_t *srv, void *buffer, size_t size,
     size_t *nread)
 {
@@ -263 +262 @@
 }
 
-static errno_t pl050_write(chardev_srv_t *srv, const void *data, size_t size,
+static int pl050_write(chardev_srv_t *srv, const void *data, size_t size,
     size_t *nwritten)
 {
@@ -294 +293 @@
 
 /** Add device. */
-static errno_t pl050_dev_add(ddf_dev_t *dev)
+static int pl050_dev_add(ddf_dev_t *dev)
 {
         ddf_fun_t *fun_a;
         pl050_t *pl050 = NULL;
         const char *mname;
-        errno_t rc;
+        int rc;
 
         ddf_msg(LVL_DEBUG, "pl050_dev_add()");
@@ -350 +349 @@
         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);
                 ddf_fun_destroy(fun_a);
                 goto error;
@@ -363 +362 @@
 }
 
-static errno_t pl050_fun_online(ddf_fun_t *fun)
+static int pl050_fun_online(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "pl050_fun_online()");
@@ -369 +368 @@
 }
 
-static errno_t pl050_fun_offline(ddf_fun_t *fun)
+static int pl050_fun_offline(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "pl050_fun_offline()");
@@ -377 +376 @@
 int main(int argc, char *argv[])
 {
-        errno_t rc;
+        int rc;
 
         printf(NAME ": HelenOS pl050 serial device driver\n");