Changeset 984a9ba in mainline for uspace/drv/hid/xtkbd/xtkbd.c

Timestamp:

2018-07-05T09:34:09Z (6 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

63d46341

Parents:

76f566d

Message:

do not expose the call capability handler from the async framework

Keep the call capability handler encapsulated within the async framework
and do not expose it explicitly via its API. Use the pointer to
ipc_call_t as the sole object identifying an IPC call in the code that
uses the async framework.

This plugs a major leak in the abstraction and also simplifies both the
async framework (slightly) and all IPC servers.

File:

• uspace/drv/hid/xtkbd/xtkbd.c (modified) (5 diffs)

uspace/drv/hid/xtkbd/xtkbd.c

@@ -328 +328 @@
 /** Default handler for IPC methods not handled by DDF.
  *
- * @param fun           Device function handling the call.
- * @param icall_handle  Call handle.
- * @param icall         Call data.
- *
- */
-static void default_connection_handler(ddf_fun_t *fun,
-    cap_call_handle_t icall_handle, ipc_call_t *icall)
+ * @param fun   Device function handling the call.
+ * @param icall Call data.
+ *
+ */
+static void default_connection_handler(ddf_fun_t *fun, ipc_call_t *icall)
 {
         const sysarg_t method = IPC_GET_IMETHOD(*icall);
@@ -357 +355 @@
                 errno_t rc = chardev_write(kbd->chardev, &cmds[0], 1, &nwr);
                 if (rc != EOK) {
-                        async_answer_0(icall_handle, rc);
+                        async_answer_0(icall, rc);
                         break;
                 }
 
                 rc = chardev_write(kbd->chardev, &cmds[1], 1, &nwr);
-                async_answer_0(icall_handle, rc);
+                async_answer_0(icall, rc);
                 break;
         case IPC_M_CONNECT_TO_ME:
@@ -375 +373 @@
                         ddf_msg(LVL_WARN,
                             "Failed creating callback session");
-                        async_answer_0(icall_handle, EAGAIN);
+                        async_answer_0(icall, EAGAIN);
                         break;
                 }
@@ -382 +380 @@
                         kbd->client_sess = sess;
                         ddf_msg(LVL_DEBUG, "Set client session");
-                        async_answer_0(icall_handle, EOK);
+                        async_answer_0(icall, EOK);
                 } else {
                         ddf_msg(LVL_ERROR, "Client session already set");
-                        async_answer_0(icall_handle, ELIMIT);
+                        async_answer_0(icall, ELIMIT);
                 }
 
@@ -391 +389 @@
         default:
                 ddf_msg(LVL_ERROR, "Unknown method: %d.", (int)method);
-                async_answer_0(icall_handle, EINVAL);
+                async_answer_0(icall, EINVAL);
                 break;
         }