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

File:

• uspace/drv/char/i8042/i8042.c (modified) (9 diffs)

uspace/drv/char/i8042/i8042.c

@@ -68 +68 @@
 
 static void i8042_char_conn(ipc_callid_t, ipc_call_t *, void *);
-static int i8042_read(chardev_srv_t *, void *, size_t, size_t *);
-static int i8042_write(chardev_srv_t *, const void *, size_t, size_t *);
+static errno_t i8042_read(chardev_srv_t *, void *, size_t, size_t *);
+static errno_t i8042_write(chardev_srv_t *, const void *, size_t, size_t *);
 
 static chardev_ops_t i8042_chardev_ops = {
@@ -129 +129 @@
 {
         i8042_t *controller = ddf_dev_data_get(dev);
-        int rc;
+        errno_t rc;
         
         const uint8_t status = IPC_GET_ARG1(*call);
@@ -158 +158 @@
  *
  */
-int i8042_init(i8042_t *dev, addr_range_t *regs, int irq_kbd,
+errno_t i8042_init(i8042_t *dev, addr_range_t *regs, int irq_kbd,
     int irq_mouse, ddf_dev_t *ddf_dev)
 {
@@ -170 +170 @@
         i8042_regs_t *ar;
         
-        int rc;
+        errno_t rc;
         bool kbd_bound = false;
         bool aux_bound = false;
@@ -281 +281 @@
         };
         
-        const int irq_kbd_cap = register_interrupt_handler(ddf_dev, irq_kbd,
-            i8042_irq_handler, &irq_code);
-        if (irq_kbd_cap < 0) {
-                rc = irq_kbd_cap;
+        int irq_kbd_cap;
+        rc = register_interrupt_handler(ddf_dev, irq_kbd,
+            i8042_irq_handler, &irq_code, &irq_kbd_cap);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed set handler for kbd: %s.",
                     ddf_dev_get_name(ddf_dev));
@@ -290 +290 @@
         }
         
-        const int irq_mouse_cap = register_interrupt_handler(ddf_dev, irq_mouse,
-            i8042_irq_handler, &irq_code);
-        if (irq_mouse_cap < 0) {
-                rc = irq_mouse_cap;
+        int irq_mouse_cap;
+        rc = register_interrupt_handler(ddf_dev, irq_mouse,
+            i8042_irq_handler, &irq_code, &irq_mouse_cap);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed set handler for mouse: %s.",
                     ddf_dev_get_name(ddf_dev));
@@ -350 +350 @@
  *
  */
-static int i8042_write(chardev_srv_t *srv, const void *data, size_t size,
+static errno_t i8042_write(chardev_srv_t *srv, const void *data, size_t size,
     size_t *nwr)
 {
@@ -385 +385 @@
  *
  */
-static int i8042_read(chardev_srv_t *srv, void *dest, size_t size,
+static errno_t i8042_read(chardev_srv_t *srv, void *dest, size_t size,
     size_t *nread)
 {
@@ -391 +391 @@
         size_t p;
         uint8_t *destp = (uint8_t *)dest;
-        int rc;
+        errno_t rc;
         
         fibril_mutex_lock(&port->buf_lock);