Changeset 5a6cc679 in mainline for uspace/drv/char/i8042

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

Location:

uspace/drv/char/i8042

Files:

• i8042.c (modified) (7 diffs)
• i8042.h (modified) (1 diff)
• main.c (modified) (3 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;
@@ -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);

uspace/drv/char/i8042/i8042.h

@@ -88 +88 @@
 } i8042_t;
 
-extern int i8042_init(i8042_t *, addr_range_t *, int, int, ddf_dev_t *);
+extern errno_t i8042_init(i8042_t *, addr_range_t *, int, int, ddf_dev_t *);
 
 #endif

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)