Changeset 9934f7d in mainline for uspace/srv/hid/input/ctl/kbdev.c

Timestamp:

2011-06-13T19:53:48Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a07a454

Parents:

43ac0cc

Message:

Add extra argument to async connection handlers that can be used for passing
information from async_connect_to_me() to the handler.

File:

• uspace/srv/hid/input/ctl/kbdev.c (modified) (5 diffs)

uspace/srv/hid/input/ctl/kbdev.c

@@ -54 +54 @@
 static void kbdev_ctl_set_ind(kbd_dev_t *, unsigned);
 
-static void kbdev_callback_conn(ipc_callid_t, ipc_call_t *);
+static void kbdev_callback_conn(ipc_callid_t, ipc_call_t *, void *arg);
 
 kbd_ctl_ops_t kbdev_ctl = {
@@ -73 +73 @@
         int fd;
 } kbdev_t;
-
-/** XXX Need to pass data from async_connect_to_me() to connection handler */
-static kbdev_t *unprotected_kbdev;
 
 static kbdev_t *kbdev_new(kbd_dev_t *kdev)
@@ -140 +137 @@
         }
 
-        /*
-         * XXX We need to pass kbdev to the connection handler. Since the
-         * framework does not support this, use a global variable.
-         * This needs to be fixed ASAP.
-         */
-        unprotected_kbdev = kbdev;
-
-        rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn);
+        rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn, kbdev);
         if (rc != EOK) {
                 printf(NAME ": Failed creating callback connection from '%s'.\n",
@@ -177 +167 @@
 }
 
-static void kbdev_callback_conn(ipc_callid_t iid, ipc_call_t *icall)
+static void kbdev_callback_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         kbdev_t *kbdev;
@@ -183 +173 @@
         int type, key;
 
-        kbdev = unprotected_kbdev;
+        /* Kbdev device structure */
+        kbdev = arg;
 
         while (true) {