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

Timestamp:

2012-01-04T00:13:53Z (14 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/i8042/i8042.c (modified) (11 diffs)

uspace/drv/char/i8042/i8042.c

@@ -55 +55 @@
 static int i8042_write_kbd(ddf_fun_t *, char *, size_t);
 static int i8042_read_kbd(ddf_fun_t *, char *, size_t);
-static int i8042_write_aux(ddf_fun_t *, char *, size_t);
-static int i8042_read_aux(ddf_fun_t *, char *, size_t);
 
 /** Primary port interface structure. */
@@ -64 +62 @@
 };
 
-/** Auxiliary port interface structure. */
-static char_dev_ops_t aux_iface = {
-    .read = i8042_read_aux,
-    .write = i8042_write_aux,
-};
+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
+        .interfaces[CHAR_DEV_IFACE] = &kbd_iface,
+        .default_handler = default_handler,
 };
 
 /** Auxiliary port function operations. */
-static ddf_dev_ops_t aux_ops = {
-        .interfaces[CHAR_DEV_IFACE] = &aux_iface
+static ddf_dev_ops_t ops = {
+        .default_handler = default_handler,
 };
 
@@ -181 +176 @@
         }
 
-        dev->mouse_fun = ddf_fun_create(ddf_dev, fun_inner, "ps2b");
-        if (!dev->mouse_fun) {
+        dev->aux_fun = ddf_fun_create(ddf_dev, fun_inner, "ps2b");
+        if (!dev->aux_fun) {
                 ddf_fun_destroy(dev->kbd_fun);
                 return ENOMEM;
         }
 
-        ret = ddf_fun_add_match_id(dev->mouse_fun, "char/ps2mouse", 90);
+        ret = ddf_fun_add_match_id(dev->aux_fun, "char/ps2mouse", 90);
         if (ret != EOK) {
                 ddf_fun_destroy(dev->kbd_fun);
-                ddf_fun_destroy(dev->mouse_fun);
+                ddf_fun_destroy(dev->aux_fun);
                 return ret;
         }
 
         dev->kbd_fun->ops = &kbd_ops;
-        dev->mouse_fun->ops = &aux_ops;
+        dev->aux_fun->ops = &ops;
         dev->kbd_fun->driver_data = dev;
-        dev->mouse_fun->driver_data = dev;
+        dev->aux_fun->driver_data = dev;
 
         buffer_init(&dev->kbd_buffer, dev->kbd_data, BUFFER_SIZE);
@@ -210 +205 @@
                 ddf_fun_destroy(dev->kbd_fun); \
         } \
-        if (dev->mouse_fun) { \
-                dev->mouse_fun->driver_data = NULL; \
-                ddf_fun_destroy(dev->mouse_fun); \
+        if (dev->aux_fun) { \
+                dev->aux_fun->driver_data = NULL; \
+                ddf_fun_destroy(dev->aux_fun); \
         } \
 } else (void)0
@@ -220 +215 @@
             "Failed to bind keyboard function: %s.", str_error(ret));
 
-        ret = ddf_fun_bind(dev->mouse_fun);
+        ret = ddf_fun_bind(dev->aux_fun);
         CHECK_RET_DESTROY(ret,
             "Failed to bind mouse function: %s.", str_error(ret));
@@ -242 +237 @@
                 ddf_fun_destroy(dev->kbd_fun); \
         } \
-        if (dev->mouse_fun) { \
-                ddf_fun_unbind(dev->mouse_fun); \
-                dev->mouse_fun->driver_data = NULL; \
-                ddf_fun_destroy(dev->mouse_fun); \
+        if (dev->aux_fun) { \
+                ddf_fun_unbind(dev->aux_fun); \
+                dev->aux_fun->driver_data = NULL; \
+                ddf_fun_destroy(dev->aux_fun); \
         } \
 } else (void)0
@@ -328 +323 @@
 }
 
-/** Write data to i8042 auxiliary port.
+// TODO use shared instead of own copy
+enum {
+        IPC_CHAR_READ = DEV_FIRST_CUSTOM_METHOD,
+        IPC_CHAR_WRITE,
+};
+
+/** Write data to i8042 port.
  * @param fun DDF function.
  * @param buffer Data source.
@@ -334 +335 @@
  * @return Bytes written.
  */
-static int i8042_write_aux(ddf_fun_t *fun, char *buffer, size_t size)
+static int i8042_write(ddf_fun_t *fun, char *buffer, size_t size)
 {
         assert(fun);
@@ -342 +343 @@
         for (size_t i = 0; i < size; ++i) {
                 wait_ready(controller);
-                pio_write_8(&controller->regs->status, i8042_CMD_WRITE_AUX);
+                if (controller->aux_fun == fun)
+                        pio_write_8(
+                            &controller->regs->status, i8042_CMD_WRITE_AUX);
                 pio_write_8(&controller->regs->data, buffer[i]);
         }
@@ -349 +352 @@
 }
 
-/** Read data from i8042 auxiliary port.
+/** Read data from i8042 port.
  * @param fun DDF function.
  * @param buffer Data place.
@@ -355 +358 @@
  * @return Bytes read.
  */
-static int i8042_read_aux(ddf_fun_t *fun, char *buffer, size_t size)
+static int i8042_read(ddf_fun_t *fun, char *data, size_t size)
 {
         assert(fun);
         assert(fun->driver_data);
-        bzero(buffer, size);
 
         i8042_t *controller = fun->driver_data;
+        buffer_t *buffer = (fun == controller->aux_fun) ?
+            &controller->aux_buffer : &controller->kbd_buffer;
         for (size_t i = 0; i < size; ++i) {
-                *buffer++ = buffer_read(&controller->aux_buffer);
+                *data++ = buffer_read(buffer);
         }
         return size;
+}
+
+void default_handler(ddf_fun_t *fun, ipc_callid_t id, ipc_call_t *call)
+{
+        const sysarg_t method = IPC_GET_IMETHOD(*call);
+        const size_t size = IPC_GET_ARG1(*call);
+        switch (method) {
+        case IPC_CHAR_READ:
+                if (size <= 4 * sizeof(sysarg_t)) {
+                        sysarg_t message[4] = { 0 };
+                        i8042_read(fun, (char*)message, size);
+                        async_answer_4(id, size, message[0], message[1],
+                            message[2], message[3]);
+                } else {
+                        async_answer_0(id, ELIMIT);
+                }
+                break;
+
+        case IPC_CHAR_WRITE:
+                if (size <= 3 * sizeof(sysarg_t)) {
+                        const sysarg_t message[3] = {
+                                IPC_GET_ARG2(*call), IPC_GET_ARG3(*call),
+                                IPC_GET_ARG4(*call) };
+                        i8042_write(fun, (char*)message, size);
+                        async_answer_0(id, size);
+                } else {
+                        async_answer_0(id, ELIMIT);
+                }
+
+        default:
+                async_answer_0(id, EINVAL);
+        }
 }
 /**