Changeset 2552f05f in mainline

Timestamp:

2011-12-26T16:18:18Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

cf5c05c0

Parents:

ec3b125

Message:

i8042, xtkbd, ps2mouse: Change match ids. Remove dead code. Increase buffer size.

Increased buffer is a workaround for a hang that happens when the buffer is full, this needs to be investigated and fixed properly.

Location:

uspace/drv/char

Files:

• i8042/i8042.c (modified) (4 diffs)
• i8042/i8042.h (modified) (1 diff)
• ps2mouse/ps2mouse.ma (modified) (1 diff)
• xtkbd/xtkbd.ma (modified) (1 diff)

uspace/drv/char/i8042/i8042.c

@@ -142 +142 @@
                 return;
         i8042_t *controller = dev->driver_data;
-//      fibril_mutex_lock(&controller->guard);
 
         const uint8_t status = IPC_GET_ARG1(*call);
@@ -149 +148 @@
             &controller->aux_buffer : &controller->kbd_buffer;
         buffer_write(buffer, data);
-#if 0
-        char ** buffer =
-            aux ? &controller->aux_buffer : &controller->kbd_buffer;
-        char * buffer_end =
-            aux ? controller->aux_buffer_end : controller->kbd_buffer_end;
-
-        if (*buffer != NULL && *buffer < buffer_end) {
-                *(*buffer) = data;
-                if (++(*buffer) == buffer_end)
-                        fibril_condvar_broadcast(&controller->data_avail);
-        } else {
-                ddf_msg(LVL_WARN, "Unhandled %s data: %hhx , status: %hhx.",
-                    aux ? "AUX" : "KBD", data, status);
-        }
-
-        fibril_mutex_unlock(&controller->guard);
-#endif
 }
 /*----------------------------------------------------------------------------*/
@@ -183 +165 @@
         if (!dev->kbd_fun)
                 return ENOMEM;
-        int ret = ddf_fun_add_match_id(dev->kbd_fun, "xtkbd", 90);
+        int ret = ddf_fun_add_match_id(dev->kbd_fun, "char/xtkbd", 90);
         if (ret != EOK) {
                 ddf_fun_destroy(dev->kbd_fun);
@@ -195 +177 @@
         }
 
-        ret = ddf_fun_add_match_id(dev->mouse_fun, "ps2mouse", 90);
+        ret = ddf_fun_add_match_id(dev->mouse_fun, "char/ps2mouse", 90);
         if (ret != EOK) {
                 ddf_fun_destroy(dev->kbd_fun);

uspace/drv/char/i8042/i8042.h

@@ -46 +46 @@
 #include "buffer.h"
 
-#define BUFFER_SIZE 12
+#define BUFFER_SIZE 64
 
 /** i8042 HW I/O interface */

uspace/drv/char/ps2mouse/ps2mouse.ma

@@ -1 @@
-100 ps2mouse
+100 char/ps2mouse

uspace/drv/char/xtkbd/xtkbd.ma

@@ -1 @@
-100 xtkbd
+100 char/xtkbd