Changes in uspace/srv/hid/isdv4_tablet/isdv4.c [582a0b8:f300523] in mainline

File:

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

uspace/srv/hid/isdv4_tablet/isdv4.c

@@ -27 +27 @@
  */
 
-#include <char_dev_iface.h>
+#include <async.h>
 #include <errno.h>
+#include <io/chardev.h>
+#include <mem.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdlib.h>
-#include <mem.h>
-#include <thread.h>
 
 #include "isdv4.h"
@@ -296 +298 @@
         bool reading = true;
         while (reading) {
-                ssize_t read = char_dev_read(state->sess, state->buf + state->buf_end,
-                    state->buf_size - state->buf_end);
-                if (read < 0)
+                size_t nread;
+                int rc;
+
+                rc = chardev_read(state->chardev, state->buf + state->buf_end,
+                    state->buf_size - state->buf_end, &nread);
+                if (rc != EOK && nread == 0)
                         return EIO;
-                state->buf_end += read;
+                state->buf_end += nread;
 
                 size_t i = 0;
@@ -355 +360 @@
         return EOK;
 }
-static bool write_command(async_sess_t *sess, uint8_t command)
-{
-        return char_dev_write(sess, &command, 1) == 1;
+
+static bool write_command(chardev_t *chardev, uint8_t command)
+{
+        int rc;
+        size_t nwr;
+
+        rc = chardev_write(chardev, &command, 1, &nwr);
+        return rc == EOK;
 }
 
@@ -363 +373 @@
     isdv4_event_fn event_fn)
 {
+        chardev_t *chardev;
+        int rc;
+
+        rc = chardev_open(sess, &chardev);
+        if (rc != EOK)
+                return rc;
+
         memset(state, 0, sizeof(isdv4_state_t));
+
         state->sess = sess;
+        state->chardev = chardev;
+
         state->buf = malloc(BUF_SIZE);
-        if (state->buf == NULL)
+        if (state->buf == NULL) {
+                chardev_close(chardev);
                 return ENOMEM;
+        }
+
         state->buf_size = BUF_SIZE;
         state->emit_event_fn = event_fn;
@@ -375 +398 @@
 int isdv4_init_tablet(isdv4_state_t *state)
 {
-        if (!write_command(state->sess, CMD_STOP))
+        if (!write_command(state->chardev, CMD_STOP))
                 return EIO;
 
-        thread_usleep(250000); /* 250 ms */
+        async_usleep(250000); /* 250 ms */
 
         // FIXME: Read all possible garbage before sending commands
-        if (!write_command(state->sess, CMD_QUERY_STYLUS))
+        if (!write_command(state->chardev, CMD_QUERY_STYLUS))
                 return EIO;
 
@@ -388 +411 @@
                 return rc;
 
-        if (!write_command(state->sess, CMD_QUERY_TOUCH))
+        if (!write_command(state->chardev, CMD_QUERY_TOUCH))
                 return EIO;
 
@@ -395 +418 @@
                 return rc;
 
-        if (!write_command(state->sess, CMD_START))
+        if (!write_command(state->chardev, CMD_START))
                 return EIO;