Changeset bd87ae0 in mainline for uspace/drv/char/i8042

Timestamp:

2012-01-04T00:50:07Z (14 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/i8042/i8042.c (modified) (5 diffs)

uspace/drv/char/i8042/i8042.c

@@ -47 +47 @@
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
-#include <ops/char_dev.h>
 
 #include "i8042.h"
@@ -53 +52 @@
 #define NAME       "i8042"
 
-static int i8042_write_kbd(ddf_fun_t *, char *, size_t);
-static int i8042_read_kbd(ddf_fun_t *, char *, size_t);
-
-/** Primary port interface structure. */
-static char_dev_ops_t kbd_iface = {
-    .read = i8042_read_kbd,
-    .write = i8042_write_kbd,
-};
-
 void default_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
 
-/** Primary port function operations. */
-static ddf_dev_ops_t kbd_ops = {
-        .interfaces[CHAR_DEV_IFACE] = &kbd_iface,
-        .default_handler = default_handler,
-};
-
-/** Auxiliary port function operations. */
+/** Port function operations. */
 static ddf_dev_ops_t ops = {
         .default_handler = default_handler,
@@ -189 +173 @@
         }
 
-        dev->kbd_fun->ops = &kbd_ops;
+        dev->kbd_fun->ops = &ops;
         dev->aux_fun->ops = &ops;
         dev->kbd_fun->driver_data = dev;
@@ -283 +267 @@
 }
 
-/** Write data to i8042 primary port.
- * @param fun DDF function.
- * @param buffer Data source.
- * @param size Data size.
- * @return Bytes written.
- */
-static int i8042_write_kbd(ddf_fun_t *fun, char *buffer, size_t size)
-{
-        assert(fun);
-        assert(fun->driver_data);
-        i8042_t *controller = fun->driver_data;
-        fibril_mutex_lock(&controller->write_guard);
-        for (size_t i = 0; i < size; ++i) {
-                wait_ready(controller);
-                pio_write_8(&controller->regs->data, buffer[i]);
-        }
-        fibril_mutex_unlock(&controller->write_guard);
-        return size;
-}
-
-/** Read data from i8042 primary port.
- * @param fun DDF function.
- * @param buffer Data place.
- * @param size Data place size.
- * @return Bytes read.
- */
-static int i8042_read_kbd(ddf_fun_t *fun, char *buffer, size_t size)
-{
-        assert(fun);
-        assert(fun->driver_data);
-        bzero(buffer, size);
-
-        i8042_t *controller = fun->driver_data;
-
-        for (size_t i = 0; i < size; ++i) {
-                *buffer++ = buffer_read(&controller->kbd_buffer);
-        }
-        return size;
-}
-
-// TODO use shared instead of own copy
+// TODO use shared instead this
 enum {
         IPC_CHAR_READ = DEV_FIRST_CUSTOM_METHOD,
@@ -372 +316 @@
 }
 
+/** Handle data requests.
+ * @param fun ddf_fun_t function.
+ * @param id callid
+ * @param call IPC request.
+ */
 void default_handler(ddf_fun_t *fun, ipc_callid_t id, ipc_call_t *call)
 {