Changeset 984a9ba in mainline for uspace/drv/hid/usbhid/kbd/kbddev.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/usbhid/kbd/kbddev.c (modified) (7 diffs)

uspace/drv/hid/usbhid/kbd/kbddev.c

@@ -72 +72 @@
 #include "../usbhid.h"
 
-static void default_connection_handler(ddf_fun_t *, cap_call_handle_t, ipc_call_t *);
+static void default_connection_handler(ddf_fun_t *, ipc_call_t *);
 static ddf_dev_ops_t kbdops = { .default_handler = default_connection_handler };
 
@@ -148 +148 @@
 /* IPC method handler                                                         */
 
-/**
- * Default handler for IPC methods not handled by DDF.
+/** Default handler for IPC methods not handled by DDF.
  *
  * Currently recognizes only two methods (IPC_M_CONNECT_TO_ME and KBDEV_SET_IND)
@@ -156 +155 @@
  * KBDEV_SET_IND sets LED keyboard indicators.
  *
- * @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);
@@ -172 +169 @@
                 kbd_dev->mods = IPC_GET_ARG1(*icall);
                 usb_kbd_set_led(kbd_dev->hid_dev, kbd_dev);
-                async_answer_0(icall_handle, EOK);
+                async_answer_0(icall, EOK);
                 break;
                 /*
@@ -184 +181 @@
                         usb_log_warning(
                             "Failed to create start console session.\n");
-                        async_answer_0(icall_handle, EAGAIN);
+                        async_answer_0(icall, EAGAIN);
                         break;
                 }
@@ -190 +187 @@
                         kbd_dev->client_sess = sess;
                         usb_log_debug("%s: OK", __FUNCTION__);
-                        async_answer_0(icall_handle, EOK);
+                        async_answer_0(icall, EOK);
                 } else {
                         usb_log_error("%s: console session already set",
                             __FUNCTION__);
-                        async_answer_0(icall_handle, ELIMIT);
+                        async_answer_0(icall, ELIMIT);
                 }
                 break;
@@ -200 +197 @@
                 usb_log_error("%s: Unknown method: %d.",
                     __FUNCTION__, (int) method);
-                async_answer_0(icall_handle, EINVAL);
+                async_answer_0(icall, EINVAL);
                 break;
         }