Changeset 5a6cc679 in mainline for uspace/drv/char/i8042/main.c

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

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

uspace/drv/char/i8042/main.c

@@ -55 +55 @@
  *
  */
-static int get_my_registers(ddf_dev_t *dev, addr_range_t *p_io_reg,
+static errno_t get_my_registers(ddf_dev_t *dev, addr_range_t *p_io_reg,
     int *kbd_irq, int *mouse_irq)
 {
@@ -66 +66 @@
         hw_res_list_parsed_t hw_resources;
         hw_res_list_parsed_init(&hw_resources);
-        const int ret = hw_res_get_list_parsed(parent_sess, &hw_resources, 0);
+        const errno_t ret = hw_res_get_list_parsed(parent_sess, &hw_resources, 0);
         if (ret != EOK)
                 return ret;
@@ -96 +96 @@
  *
  */
-static int i8042_dev_add(ddf_dev_t *device)
+static errno_t i8042_dev_add(ddf_dev_t *device)
 {
         addr_range_t io_regs;
         int kbd = 0;
         int mouse = 0;
-        int rc;
+        errno_t rc;
         
         if (!device)