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

uspace/drv/hid/adb-kbd/adb-kbd.c

@@ -43 +43 @@
 #include "ctl.h"
 
-static void adb_kbd_events(cap_call_handle_t, ipc_call_t *, void *);
+static void adb_kbd_events(ipc_call_t *, void *);
 static void adb_kbd_reg0_data(adb_kbd_t *, uint16_t);
-static void adb_kbd_conn(cap_call_handle_t, ipc_call_t *, void *);
+static void adb_kbd_conn(ipc_call_t *, void *);
 
 /** Add ADB keyboard device */
@@ -130 +130 @@
 }
 
-static void adb_kbd_events(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+static void adb_kbd_events(ipc_call_t *icall, void *arg)
 {
         adb_kbd_t *kbd = (adb_kbd_t *) arg;
@@ -136 +136 @@
         /* Ignore parameters, the connection is already opened */
         while (true) {
-
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                async_get_call(&call);
 
                 errno_t retval = EOK;
@@ -154 +153 @@
                         retval = ENOENT;
                 }
-                async_answer_0(chandle, retval);
+                async_answer_0(&call, retval);
         }
 }
@@ -191 +190 @@
 
 /** Handle client connection */
-static void adb_kbd_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
-{
-        cap_call_handle_t chandle;
+static void adb_kbd_conn(ipc_call_t *icall, void *arg)
+{
         ipc_call_t call;
         sysarg_t method;
@@ -201 +199 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        async_answer_0(icall_handle, EOK);
+        async_answer_0(icall, EOK);
 
         kbd = (adb_kbd_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
 
         while (true) {
-                chandle = async_get_call(&call);
+                async_get_call(&call);
                 method = IPC_GET_IMETHOD(call);
 
                 if (!method) {
                         /* The other side has hung up. */
-                        async_answer_0(chandle, EOK);
+                        async_answer_0(&call, EOK);
                         return;
                 }
@@ -219 +217 @@
                 if (sess != NULL) {
                         kbd->client_sess = sess;
-                        async_answer_0(chandle, EOK);
+                        async_answer_0(&call, EOK);
                 } else {
-                        async_answer_0(chandle, EINVAL);
+                        async_answer_0(&call, EINVAL);
                 }
         }