Changeset 984a9ba in mainline for uspace/drv/bus

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/drv/bus

Files:

• adb/cuda_adb/cuda_adb.c (modified) (3 diffs)
• usb/vhc/conndev.c (modified) (3 diffs)
• usb/vhc/vhcd.h (modified) (1 diff)

uspace/drv/bus/adb/cuda_adb/cuda_adb.c

@@ -55 +55 @@
 #define NAME  "cuda_adb"
 
-static void cuda_dev_connection(cap_call_handle_t, ipc_call_t *, void *);
+static void cuda_dev_connection(ipc_call_t *, void *);
 static errno_t cuda_init(cuda_t *);
 static void cuda_irq_handler(ipc_call_t *, void *);
@@ -198 +198 @@
 
 /** Device connection handler */
-static void cuda_dev_connection(cap_call_handle_t icall_handle,
-    ipc_call_t *icall, void *arg)
+static void cuda_dev_connection(ipc_call_t *icall, void *arg)
 {
         adb_dev_t *dev = (adb_dev_t *) ddf_fun_data_get((ddf_fun_t *) arg);
-        cap_call_handle_t chandle;
         ipc_call_t call;
         sysarg_t method;
 
         /* Answer the IPC_M_CONNECT_ME_TO call. */
-        async_answer_0(icall_handle, EOK);
+        async_answer_0(icall, EOK);
 
         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;
                 }
@@ -223 +221 @@
                 if (sess != NULL) {
                         dev->client_sess = sess;
-                        async_answer_0(chandle, EOK);
+                        async_answer_0(&call, EOK);
                 } else {
-                        async_answer_0(chandle, EINVAL);
+                        async_answer_0(&call, EINVAL);
                 }
         }

uspace/drv/bus/usb/vhc/conndev.c

@@ -89 +89 @@
 /** Default handler for IPC methods not handled by DDF.
  *
- * @param fun           Device handling the call.
- * @param icall_handle  Call handle.
- * @param icall         Call data.
+ * @param fun   Device handling the call.
+ * @param icall Call data.
+ *
  */
-void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
-    ipc_call_t *icall)
+void default_connection_handler(ddf_fun_t *fun, ipc_call_t *icall)
 {
         vhc_data_t *vhc = ddf_fun_data_get(fun);
@@ -104 +103 @@
                 errno_t rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle);
                 if (rc != EOK) {
-                        async_answer_0(icall_handle, rc);
+                        async_answer_0(icall, rc);
                         async_hangup(callback);
                         return;
                 }
 
-                async_answer_0(icall_handle, EOK);
+                async_answer_0(icall, EOK);
 
                 receive_device_name(callback);
@@ -116 +115 @@
                     plugged_device_name, plugged_device_handle);
         } else
-                async_answer_0(icall_handle, EINVAL);
+                async_answer_0(icall, EINVAL);
 }
 

uspace/drv/bus/usb/vhc/vhcd.h

@@ -88 +88 @@
 
 void on_client_close(ddf_fun_t *fun);
-void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
-    ipc_call_t *icall);
+void default_connection_handler(ddf_fun_t *fun, ipc_call_t *icall);
 
 errno_t vhc_virtdev_plug(vhc_data_t *, async_sess_t *, uintptr_t *);