Changeset bd87ae0 in mainline for uspace/drv/char/xtkbd/xtkbd.c

Timestamp:

2012-01-04T00:50:07Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

41c9a22

Parents:

2f79a38

Message:

i8042, xtkbd: Switch keyboard away from DDF provided interface.

File:

• uspace/drv/char/xtkbd/xtkbd.c (modified) (5 diffs)

uspace/drv/char/xtkbd/xtkbd.c

@@ -35 +35 @@
 #include <errno.h>
 #include <devman.h>
-#include <device/char_dev.h>
 #include <ddf/log.h>
 #include <io/keycode.h>
@@ -42 +41 @@
 #include <abi/ipc/methods.h>
 
+#include "chardev.h"
 #include "xtkbd.h"
 
@@ -259 +259 @@
 
         assert(kbd->parent_sess);
+        async_exch_t *parent_exch = async_exchange_begin(kbd->parent_sess);
         while (1) {
+                if (!parent_exch)
+                        parent_exch = async_exchange_begin(kbd->parent_sess);
+
                 const int *map = scanmap_simple;
                 size_t map_size = sizeof(scanmap_simple) / sizeof(int);
 
                 uint8_t code = 0;
-                ssize_t size = char_dev_read(kbd->parent_sess, &code, 1);
+                ssize_t size = chardev_read(parent_exch, &code, 1);
 
                 /** Ignore AT command reply */
@@ -274 +278 @@
                         map = scanmap_e0;
                         map_size = sizeof(scanmap_e0) / sizeof(int);
-                        size = char_dev_read(kbd->parent_sess, &code, 1);
+                        size = chardev_read(parent_exch, &code, 1);
                         // TODO handle print screen
                 }
@@ -334 +338 @@
                     ((mods & KM_SCROLL_LOCK) ? LI_SCROLL : 0);
                 uint8_t cmds[] = { KBD_CMD_SET_LEDS, status };
-                const ssize_t size =
-                     char_dev_write(kbd->parent_sess, cmds, sizeof(cmds));
+                async_exch_t *exch = async_exchange_begin(kbd->parent_sess);
+                const ssize_t size = chardev_write(exch, cmds, sizeof(cmds));
+                async_exchange_end(exch);
                 async_answer_0(icallid, size < 0 ? size : EOK);
                 break;