Changeset e747303 in mainline

Timestamp:

2011-12-25T22:43:12Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5b0de4c

Parents:

a8f7029

Message:

i8024: Fix char dev interface return values. Make kbd function internal and look for XT keyboard.

File:

• uspace/drv/char/i8042/i8042.c (modified) (7 diffs)

uspace/drv/char/i8042/i8042.c

@@ -150 +150 @@
             controller->aux_buffer_end : controller->kbd_buffer_end;
         if (*buffer != NULL && *buffer < buffer_end) {
-                *(*buffer)++ = data;
-                if (*buffer == buffer_end)
+                *(*buffer) = data;
+                if (++(*buffer) == buffer_end)
                         fibril_condvar_signal(&controller->data_avail);
         } else {
-                ddf_msg(LVL_WARN, "Unhandled %s data: %x , status: %x.",
+                ddf_msg(LVL_WARN, "Unhandled %s data: %hhx , status: %hhx.",
                     (status & i8042_AUX_DATA) ? "AUX" : "KBD", data, status);
         }
@@ -173 +173 @@
                 return -1;
 
-        dev->kbd_fun = ddf_fun_create(ddf_dev, fun_exposed, "ps2a");
+        dev->kbd_fun = ddf_fun_create(ddf_dev, fun_inner, "ps2a");
         if (!dev->kbd_fun)
                 return ENOMEM;
+        int ret = ddf_fun_add_match_id(dev->kbd_fun, "xtkbd", 90);
+        if (ret != EOK) {
+                ddf_fun_destroy(dev->kbd_fun);
+                return ret;
+        }
 
         dev->mouse_fun = ddf_fun_create(ddf_dev, fun_exposed, "ps2b");
@@ -208 +213 @@
 } else (void)0
 
-        int ret = ddf_fun_bind(dev->kbd_fun);
+        ret = ddf_fun_bind(dev->kbd_fun);
         CHECK_RET_DESTROY(ret,
             "Failed to bind keyboard function: %s.\n", str_error(ret));
@@ -291 +296 @@
         }
         fibril_mutex_unlock(&controller->guard);
-        return EOK;
+        return size;
 }
 /*----------------------------------------------------------------------------*/
@@ -317 +322 @@
         controller->kbd_buffer_end = NULL;
         fibril_mutex_unlock(&controller->guard);
-        return EOK;
+        return size;
 }
 /*----------------------------------------------------------------------------*/
@@ -332 +337 @@
         }
         fibril_mutex_unlock(&controller->guard);
-        return EOK;
+        return size;
 }
 /*----------------------------------------------------------------------------*/
@@ -358 +363 @@
         controller->aux_buffer_end = NULL;
         fibril_mutex_unlock(&controller->guard);
-        return EOK;
+        return size;
 }
 /*----------------------------------------------------------------------------*/