Changeset ac307b2 in mainline for uspace/srv/hid/output/port/chardev.c

Timestamp:

2017-11-25T11:12:23Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

98cb5e0d

Parents:

f571ca49 (diff), 0851a3d (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 branch 'master' into callcaps

File:

• uspace/srv/hid/output/port/chardev.c (modified) (4 diffs)

uspace/srv/hid/output/port/chardev.c

@@ -30 +30 @@
  */
 
+#include <async.h>
+#include <config.h>
+#include <errno.h>
+#include <fibril_synch.h>
+#include <io/chardev.h>
+#include <loc.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <char_dev_iface.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <async.h>
-#include <fibril_synch.h>
-#include <loc.h>
-#include <errno.h>
 #include <str.h>
-#include <config.h>
 #include "../ctl/serial.h"
 #include "../output.h"
@@ -48 +48 @@
 
 static async_sess_t *sess;
+static chardev_t *chardev;
 static service_id_t serial_cat_id;
 
@@ -57 +58 @@
 {
         uint8_t byte = (uint8_t) ch;
-        char_dev_write(sess, &byte, 1); 
+        size_t nwr;
+        chardev_write(chardev, &byte, 1, &nwr);
+        /* XXX Handle error */
 }
 
 static void chardev_control_puts(const char *str)
 {
-        char_dev_write(sess, (void *) str, str_size(str));
+        size_t nwr;
+        chardev_write(chardev, (void *) str, str_size(str), &nwr);
+        /* XXX Handle error */
 }
 
@@ -126 +131 @@
                 return;
         }
+
+        rc = chardev_open(sess, &chardev);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
+                printf("%s: Failed opening character device\n", NAME);
+                return;
+        }
+
         serial_init(chardev_putchar, chardev_control_puts);