Changes in uspace/drv/hid/atkbd/atkbd.c [d420b22:5d50c419] in mainline

File:

• uspace/drv/hid/atkbd/atkbd.c (modified) (6 diffs)

uspace/drv/hid/atkbd/atkbd.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2017 Jiri Svoboda
  * Copyright (c) 2011 Jan Vesely
  * Copyright (c) 2009 Vineeth Pillai
@@ -201 +202 @@
 static int polling(void *arg)
 {
-        const at_kbd_t *kbd = arg;
-        
-        assert(kbd);
-        assert(kbd->parent_sess);
-        
-        async_exch_t *parent_exch = async_exchange_begin(kbd->parent_sess);
+        at_kbd_t *kbd = arg;
+        size_t nwr;
+        int rc;
         
         while (true) {
-                if (!parent_exch)
-                        parent_exch = async_exchange_begin(kbd->parent_sess);
-
                 uint8_t code = 0;
-                ssize_t size = chardev_read(parent_exch, &code, 1);
-                if (size != 1)
+                rc = chardev_read(kbd->chardev, &code, 1, &nwr);
+                if (rc != EOK)
                         return EIO;
                 
@@ -224 +219 @@
                         map_size = sizeof(scanmap_e0) / sizeof(unsigned int);
                         
-                        size = chardev_read(parent_exch, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nwr);
+                        if (rc != EOK)
                                 return EIO;
                 } else if (code == KBD_SCANCODE_SET_EXTENDED_SPECIAL) {
-                        size = chardev_read(parent_exch, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nwr);
+                        if (rc != EOK)
                                 return EIO;
                         if (code != 0x14)
                                 continue;
 
-                        size = chardev_read(parent_exch, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nwr);
+                        if (rc != EOK)
                                 return EIO;
                         if (code != 0x77)
                                 continue;
 
-                        size = chardev_read(parent_exch, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nwr);
+                        if (rc != EOK)
                                 return EIO;
                         if (code != 0xe1)
                                 continue;
 
-                        size = chardev_read(parent_exch, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nwr);
+                        if (rc != EOK)
                                 return EIO;
                         if (code != 0xf0)
                                 continue;
 
-                        size = chardev_read(parent_exch, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nwr);
+                        if (rc != EOK)
                                 return EIO;
                         if (code != 0x14)
                                 continue;
 
-                        size = chardev_read(parent_exch, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nwr);
+                        if (rc != EOK)
                                 return EIO;
                         if (code != 0xf0)
                                 continue;
 
-                        size = chardev_read(parent_exch, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nwr);
+                        if (rc != EOK)
                                 return EIO;
                         if (code == 0x77)
@@ -279 +274 @@
                 if (code == KBD_SCANCODE_KEY_RELEASE) {
                         type = KEY_RELEASE;
-                        size = chardev_read(parent_exch, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nwr);
+                        if (rc != EOK)
                                 return EIO;
                 } else {
@@ -362 +357 @@
 int at_kbd_init(at_kbd_t *kbd, ddf_dev_t *dev)
 {
+        async_sess_t *parent_sess;
+        int rc;
+        
         assert(kbd);
         assert(dev);
         
         kbd->client_sess = NULL;
-        kbd->parent_sess = ddf_dev_parent_sess_get(dev);
-        
-        if (!kbd->parent_sess) {
+        parent_sess = ddf_dev_parent_sess_get(dev);
+        if (parent_sess == NULL) {
                 ddf_msg(LVL_ERROR, "Failed creating parent session.");
+                rc = EIO;
+                goto error;
+        }
+        
+        rc = chardev_open(parent_sess, &kbd->chardev);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed opening character device.");
                 return EIO;
         }
@@ -407 +411 @@
         fibril_add_ready(kbd->polling_fibril);
         return EOK;
+error:
+        chardev_close(kbd->chardev);
+        kbd->chardev = NULL;
+        return rc;
 }