Changeset 15c5418 in mainline for uspace/drv/hid/atkbd

Timestamp:

2017-11-18T20:06:15Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

75fcf9b

Parents:

efb9fd08

Message:

chardev_open, chardev_close.

Location:

uspace/drv/hid/atkbd

Files:

• atkbd.c (modified) (12 diffs)
• atkbd.h (modified) (2 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;
         
         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);
+                ssize_t size = chardev_read(kbd->chardev, &code, 1);
                 if (size != 1)
                         return EIO;
@@ -224 +217 @@
                         map_size = sizeof(scanmap_e0) / sizeof(unsigned int);
                         
-                        size = chardev_read(parent_exch, &code, 1);
+                        size = chardev_read(kbd->chardev, &code, 1);
                         if (size != 1)
                                 return EIO;
                 } else if (code == KBD_SCANCODE_SET_EXTENDED_SPECIAL) {
-                        size = chardev_read(parent_exch, &code, 1);
+                        size = chardev_read(kbd->chardev, &code, 1);
                         if (size != 1)
                                 return EIO;
@@ -234 +227 @@
                                 continue;
 
-                        size = chardev_read(parent_exch, &code, 1);
+                        size = chardev_read(kbd->chardev, &code, 1);
                         if (size != 1)
                                 return EIO;
@@ -240 +233 @@
                                 continue;
 
-                        size = chardev_read(parent_exch, &code, 1);
+                        size = chardev_read(kbd->chardev, &code, 1);
                         if (size != 1)
                                 return EIO;
@@ -246 +239 @@
                                 continue;
 
-                        size = chardev_read(parent_exch, &code, 1);
+                        size = chardev_read(kbd->chardev, &code, 1);
                         if (size != 1)
                                 return EIO;
@@ -252 +245 @@
                                 continue;
 
-                        size = chardev_read(parent_exch, &code, 1);
+                        size = chardev_read(kbd->chardev, &code, 1);
                         if (size != 1)
                                 return EIO;
@@ -258 +251 @@
                                 continue;
 
-                        size = chardev_read(parent_exch, &code, 1);
+                        size = chardev_read(kbd->chardev, &code, 1);
                         if (size != 1)
                                 return EIO;
@@ -264 +257 @@
                                 continue;
 
-                        size = chardev_read(parent_exch, &code, 1);
+                        size = chardev_read(kbd->chardev, &code, 1);
                         if (size != 1)
                                 return EIO;
@@ -279 +272 @@
                 if (code == KBD_SCANCODE_KEY_RELEASE) {
                         type = KEY_RELEASE;
-                        size = chardev_read(parent_exch, &code, 1);
+                        size = chardev_read(kbd->chardev, &code, 1);
                         if (size != 1)
                                 return EIO;
@@ -362 +355 @@
 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 +409 @@
         fibril_add_ready(kbd->polling_fibril);
         return EOK;
+error:
+        chardev_close(kbd->chardev);
+        kbd->chardev = NULL;
+        return rc;
 }

uspace/drv/hid/atkbd/atkbd.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2017 Jiri Svoboda
  * All rights reserved.
  *
@@ -34 +35 @@
  */
 
-#ifndef _AT_KBD_H_
-#define _AT_KBD_H_
+#ifndef AT_KBD_H_
+#define AT_KBD_H_
 
 #include <ddf/driver.h>
 #include <fibril.h>
+#include <io/chardev.h>
 
 /** PC/AT keyboard driver structure. */
 typedef struct {
-        ddf_fun_t *kbd_fun;        /**< Keyboard function. */
-        async_sess_t *parent_sess; /**< Connection to device providing data. */
-        async_sess_t *client_sess; /**< Callback connection to client. */
-        fid_t polling_fibril;      /**< Fibril retrieving an parsing data. */
+        /** Keyboard function */
+        ddf_fun_t *kbd_fun;
+        /** Device providing keyboard connection */
+        chardev_t *chardev;
+        /** Callback connection to client */
+        async_sess_t *client_sess; 
+        /** Fibril retrieving and parsing data */
+        fid_t polling_fibril;
 } at_kbd_t;