Changeset 984a9ba in mainline for uspace/srv/hid/input

Timestamp:

2018-07-05T09:34:09Z (7 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.

Location:

uspace/srv/hid/input

Files:

• ctl/kbdev.c (modified) (4 diffs)
• input.c (modified) (4 diffs)
• proto/mousedev.c (modified) (3 diffs)

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

@@ -54 +54 @@
 static void kbdev_ctl_set_ind(kbd_dev_t *, unsigned int);
 
-static void kbdev_callback_conn(cap_call_handle_t, ipc_call_t *, void *arg);
+static void kbdev_callback_conn(ipc_call_t *, void *arg);
 
 kbd_ctl_ops_t kbdev_ctl = {
@@ -147 +147 @@
 }
 
-static void kbdev_callback_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+static void kbdev_callback_conn(ipc_call_t *icall, void *arg)
 {
         kbdev_t *kbdev;
@@ -158 +158 @@
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle;
+                async_get_call(&call);
 
-                chandle = async_get_call(&call);
                 if (!IPC_GET_IMETHOD(call)) {
                         kbdev_destroy(kbdev);
@@ -179 +178 @@
                 }
 
-                async_answer_0(chandle, retval);
+                async_answer_0(&call, retval);
         }
 }

uspace/srv/hid/input/input.c

@@ -320 +320 @@
 
 /** New client connection */
-static void client_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+static void client_connection(ipc_call_t *icall, void *arg)
 {
         client_t *client = (client_t *) async_get_client_data();
         if (client == NULL) {
-                async_answer_0(icall_handle, ENOMEM);
+                async_answer_0(icall, ENOMEM);
                 return;
         }
 
-        async_answer_0(icall_handle, EOK);
+        async_answer_0(icall, EOK);
 
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call)) {
@@ -340 +340 @@
                         }
 
-                        async_answer_0(chandle, EOK);
+                        async_answer_0(&call, EOK);
                         return;
                 }
@@ -349 +349 @@
                         if (client->sess == NULL) {
                                 client->sess = sess;
-                                async_answer_0(chandle, EOK);
+                                async_answer_0(&call, EOK);
                         } else
-                                async_answer_0(chandle, ELIMIT);
+                                async_answer_0(&call, ELIMIT);
                 } else {
                         switch (IPC_GET_IMETHOD(call)) {
@@ -357 +357 @@
                                 active_client = client;
                                 client_arbitration();
-                                async_answer_0(chandle, EOK);
+                                async_answer_0(&call, EOK);
                                 break;
                         default:
-                                async_answer_0(chandle, EINVAL);
+                                async_answer_0(&call, EINVAL);
                         }
                 }

uspace/srv/hid/input/proto/mousedev.c

@@ -70 +70 @@
 }
 
-static void mousedev_callback_conn(cap_call_handle_t icall_handle, ipc_call_t *icall,
-    void *arg)
+static void mousedev_callback_conn(ipc_call_t *icall, void *arg)
 {
         /* Mousedev device structure */
@@ -78 +77 @@
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call)) {
@@ -110 +109 @@
                 }
 
-                async_answer_0(chandle, retval);
+                async_answer_0(&call, retval);
         }
 }