Changeset ac307b2 in mainline for uspace/srv/hid/input/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/input/port/chardev.c (modified) (6 diffs)

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

@@ -35 +35 @@
  */
 
-#include <ipc/char.h>
 #include <async.h>
+#include <errno.h>
+#include <fibril.h>
+#include <io/chardev.h>
 #include <loc.h>
-#include <errno.h>
 #include <stdio.h>
 #include "../input.h"
@@ -44 +45 @@
 #include "../kbd.h"
 
-static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+static int kbd_port_fibril(void *);
 
 static int chardev_port_init(kbd_dev_t *);
-static void chardev_port_write(uint8_t data);
+static void chardev_port_write(uint8_t);
 
 kbd_port_ops_t chardev_port = {
@@ -56 +57 @@
 static kbd_dev_t *kbd_dev;
 static async_sess_t *dev_sess;
+static chardev_t *chardev;
 
 /** List of devices to try connecting to. */
@@ -70 +72 @@
 {
         service_id_t service_id;
-        async_exch_t *exch;
         unsigned int i;
+        fid_t fid;
         int rc;
         
@@ -96 +98 @@
         }
         
-        exch = async_exchange_begin(dev_sess);
-        if (exch == NULL) {
-                printf("%s: Failed starting exchange with device\n", NAME);
+        rc = chardev_open(dev_sess, &chardev);
+        if (rc != EOK) {
+                printf("%s: Failed opening character device\n", NAME);
                 async_hangup(dev_sess);
                 return ENOMEM;
         }
         
-        port_id_t port;
-        rc = async_create_callback_port(exch, INTERFACE_CHAR_CB, 0, 0,
-            kbd_port_events, NULL, &port);
-        
-        async_exchange_end(exch);
-        
-        if (rc != 0) {
-                printf("%s: Failed to create callback from device\n", NAME);
+        fid = fibril_create(kbd_port_fibril, NULL);
+        if (fid == 0) {
+                printf("%s: Failed creating fibril\n", NAME);
+                chardev_close(chardev);
                 async_hangup(dev_sess);
-                return -1;
+                return ENOMEM;
         }
+
+        fibril_add_ready(fid);
         
         printf("%s: Found input device '%s'\n", NAME, in_devs[i]);
@@ -121 +121 @@
 static void chardev_port_write(uint8_t data)
 {
-        async_exch_t *exch = async_exchange_begin(dev_sess);
-        if (exch == NULL) {
-                printf("%s: Failed starting exchange with device\n", NAME);
+        int rc;
+        size_t nwr;
+
+        rc = chardev_write(chardev, &data, sizeof(data), &nwr);
+        if (rc != EOK || nwr != sizeof(data)) {
+                printf("%s: Failed writing to character device\n", NAME);
                 return;
-        }
-
-        async_msg_1(exch, CHAR_WRITE_BYTE, data);
-        async_exchange_end(exch);
-}
-
-static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
-{
-        /* Ignore parameters, the connection is already opened */
-        while (true) {
-
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                
-                if (!IPC_GET_IMETHOD(call)) {
-                        /* TODO: Handle hangup */
-                        return;
-                }
-
-                int retval = EOK;
-
-                switch (IPC_GET_IMETHOD(call)) {
-                case CHAR_NOTIF_BYTE:
-                        kbd_push_data(kbd_dev, IPC_GET_ARG1(call));
-                        break;
-                default:
-                        retval = ENOENT;
-                }
-                async_answer_0(callid, retval);
         }
 }
 
+static int kbd_port_fibril(void *arg)
+{
+        int rc;
+        size_t nread;
+        uint8_t b;
+
+        while (true) {
+                rc = chardev_read(chardev, &b, sizeof(b), &nread);
+                if (rc != EOK || nread != sizeof(b)) {
+                        printf("%s: Error reading data", NAME);
+                        continue;
+                }
+
+                kbd_push_data(kbd_dev, b);
+        }
+
+        return 0;
+}
 
 /**