Changeset a455321 in mainline for uspace/drv/char/ps2mouse/ps2mouse.c

Timestamp:

2012-01-04T00:13:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22e4e9b

Parents:

ecc6323

Message:

i8042, ps2mouse: Use separate chardev interface instead of the one provided by DDF.

Requested on ML.

File:

• uspace/drv/char/ps2mouse/ps2mouse.c (modified) (8 diffs)

uspace/drv/char/ps2mouse/ps2mouse.c

@@ -36 +36 @@
 #include <errno.h>
 #include <devman.h>
-#include <device/char_dev.h>
 #include <ddf/log.h>
 #include <io/keycode.h>
@@ -44 +43 @@
 
 #include "ps2mouse.h"
+#include "chardev.h"
 
 #define PS2_MOUSE_GET_DEVICE_ID   0xf2
@@ -74 +74 @@
 do { \
         uint8_t data = 0; \
-        const ssize_t size = char_dev_read(session, &data, 1); \
+        const ssize_t size = chardev_read(session, &data, 1); \
         if (size != 1) { \
                 ddf_msg(LVL_ERROR, "Failed reading byte: %d)", size);\
@@ -85 +85 @@
         } \
 } while (0)
+
 #define MOUSE_WRITE_BYTE(sess, value) \
 do { \
         uint8_t data = (value); \
-        const ssize_t size = char_dev_write(session, &data, 1); \
+        const ssize_t size = chardev_write(session, &data, 1); \
         if (size < 0 ) { \
                 ddf_msg(LVL_ERROR, "Failed writing byte: %hhx", value); \
@@ -155 +156 @@
         /* Enable mouse data reporting. */
         uint8_t report = PS2_MOUSE_ENABLE_DATA_REPORT;
-        ssize_t size = char_dev_write(mouse->parent_sess, &report, 1);
+        ssize_t size = chardev_write(mouse->parent_sess, &report, 1);
         if (size != 1) {
                 ddf_msg(LVL_ERROR, "Failed to enable data reporting.");
@@ -165 +166 @@
         }
 
-        size = char_dev_read(mouse->parent_sess, &report, 1);
+        size = chardev_read(mouse->parent_sess, &report, 1);
         if (size != 1 || report != PS2_MOUSE_ACK) {
                 ddf_msg(LVL_ERROR, "Failed to confirm data reporting: %hhx.",
@@ -203 +204 @@
                 uint8_t packet[PS2_BUFSIZE] = {};
                 const ssize_t size =
-                    char_dev_read(mouse->parent_sess, packet, PS2_BUFSIZE);
+                    chardev_read(mouse->parent_sess, packet, PS2_BUFSIZE);
 
                 if (size != PS2_BUFSIZE) {
@@ -257 +258 @@
 
                 uint8_t packet[INTELLIMOUSE_BUFSIZE] = {};
-                const ssize_t size = char_dev_read(
+                const ssize_t size = chardev_read(
                     mouse->parent_sess, packet, INTELLIMOUSE_BUFSIZE);