Changes in uspace/srv/hid/input/input.c [a2afd8f:dd8ab1c] in mainline

File:

• uspace/srv/hid/input/input.c (modified) (7 diffs)

uspace/srv/hid/input/input.c

@@ -37 +37 @@
  */
 
+#include <adt/fifo.h>
 #include <adt/list.h>
-#include <stdbool.h>
+#include <async.h>
+#include <config.h>
+#include <errno.h>
+#include <fibril.h>
 #include <fibril_synch.h>
+#include <io/chardev.h>
+#include <io/console.h>
+#include <io/keycode.h>
 #include <ipc/services.h>
 #include <ipc/input.h>
-#include <config.h>
+#include <loc.h>
+#include <ns.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ns.h>
-#include <async.h>
-#include <errno.h>
-#include <adt/fifo.h>
-#include <io/console.h>
-#include <io/keycode.h>
-#include <loc.h>
 #include <str_error.h>
-#include <char_dev_iface.h>
-#include <fibril.h>
-#include "layout.h"
+
+#include "input.h"
 #include "kbd.h"
 #include "kbd_port.h"
 #include "kbd_ctl.h"
+#include "layout.h"
 #include "mouse.h"
 #include "mouse_proto.h"
 #include "serial.h"
-#include "input.h"
 
 #define NUM_LAYOUTS  4
@@ -364 +365 @@
 }
 
-static void kconsole_event_handler(ipc_callid_t callid, ipc_call_t *call,
-    void *arg)
+static void kconsole_event_handler(ipc_call_t *call, void *arg)
 {
         if (IPC_GET_ARG1(*call)) {
@@ -536 +536 @@
         while (true) {
                 uint8_t data;
-
-                char_dev_read(sdev->sess, &data, sizeof(data));
+                size_t nread;
+
+                chardev_read(sdev->chardev, &data, sizeof(data), &nread);
+                /* XXX Handle error */
                 kbd_push_data(sdev->kdev, data);
         }
@@ -552 +554 @@
 {
         bool match = false;
+        int rc;
 
         serial_dev_t *sdev = serial_dev_new();
@@ -559 +562 @@
         sdev->kdev->svc_id = service_id;
         
-        int rc = loc_service_get_name(service_id, &sdev->kdev->svc_name);
+        rc = loc_service_get_name(service_id, &sdev->kdev->svc_name);
         if (rc != EOK)
                 goto fail;
@@ -582 +585 @@
                 sdev->sess = loc_service_connect(service_id, INTERFACE_DDF,
                     IPC_FLAG_BLOCKING);
+
+                rc = chardev_open(sdev->sess, &sdev->chardev);
+                if (rc != EOK) {
+                        async_hangup(sdev->sess);
+                        sdev->sess = NULL;
+                        list_remove(&sdev->link);
+                        goto fail;
+                }
 
                 fid_t fid = fibril_create(serial_consumer, sdev);
@@ -816 +827 @@
         int rc = loc_register_cat_change_cb(cat_change_cb);
         if (rc != EOK) {
-                printf("%s: Failed registering callback for device discovery. "
-                    "(%d)\n", NAME, rc);
+                printf("%s: Failed registering callback for device discovery: "
+                    "%s\n", NAME, str_error(rc));
                 return rc;
         }