Changeset 984a9ba in mainline for uspace/lib/drv/generic/remote_audio_mixer.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/lib/drv/generic/remote_audio_mixer.c (modified) (2 diffs)

uspace/lib/drv/generic/remote_audio_mixer.c

@@ -203 +203 @@
  * SERVER SIDE
  */
-static void remote_audio_mixer_get_info(ddf_fun_t *, void *, cap_call_handle_t, ipc_call_t *);
-static void remote_audio_mixer_get_item_info(ddf_fun_t *, void *, cap_call_handle_t, ipc_call_t *);
-static void remote_audio_mixer_get_item_level(ddf_fun_t *, void *, cap_call_handle_t, ipc_call_t *);
-static void remote_audio_mixer_set_item_level(ddf_fun_t *, void *, cap_call_handle_t, ipc_call_t *);
+static void remote_audio_mixer_get_info(ddf_fun_t *, void *, ipc_call_t *);
+static void remote_audio_mixer_get_item_info(ddf_fun_t *, void *, ipc_call_t *);
+static void remote_audio_mixer_get_item_level(ddf_fun_t *, void *, ipc_call_t *);
+static void remote_audio_mixer_set_item_level(ddf_fun_t *, void *, ipc_call_t *);
 
 /** Remote audio mixer interface operations. */
@@ -222 +222 @@
 };
 
-void remote_audio_mixer_get_info(
-    ddf_fun_t *fun, void *iface, cap_call_handle_t chandle, ipc_call_t *call)
+void remote_audio_mixer_get_info(ddf_fun_t *fun, void *iface, ipc_call_t *icall)
 {
         audio_mixer_iface_t *mixer_iface = iface;
 
         if (!mixer_iface->get_info) {
-                async_answer_0(chandle, ENOTSUP);
+                async_answer_0(icall, ENOTSUP);
                 return;
         }
+
         const char *name = NULL;
         unsigned items = 0;
         const errno_t ret = mixer_iface->get_info(fun, &name, &items);
         const size_t name_size = name ? str_size(name) + 1 : 0;
-        async_answer_2(chandle, ret, name_size, items);
+        async_answer_2(icall, ret, name_size, items);
+
         /* Send the name. */
         if (ret == EOK && name_size > 0) {
+                ipc_call_t call;
                 size_t size;
-                cap_call_handle_t name_id;
-                if (!async_data_read_receive(&name_id, &size)) {
-                        async_answer_0(name_id, EPARTY);
+                if (!async_data_read_receive(&call, &size)) {
+                        async_answer_0(&call, EPARTY);
                         return;
                 }
+
                 if (size != name_size) {
-                        async_answer_0(name_id, ELIMIT);
+                        async_answer_0(&call, ELIMIT);
                         return;
                 }
-                async_data_read_finalize(name_id, name, name_size);
-        }
-}
-
-void remote_audio_mixer_get_item_info(
-    ddf_fun_t *fun, void *iface, cap_call_handle_t chandle, ipc_call_t *call)
+
+                async_data_read_finalize(&call, name, name_size);
+        }
+}
+
+void remote_audio_mixer_get_item_info(ddf_fun_t *fun, void *iface,
+    ipc_call_t *icall)
 {
         audio_mixer_iface_t *mixer_iface = iface;
 
         if (!mixer_iface->get_item_info) {
-                async_answer_0(chandle, ENOTSUP);
+                async_answer_0(icall, ENOTSUP);
                 return;
         }
 
-        const unsigned item = DEV_IPC_GET_ARG1(*call);
+        const unsigned item = DEV_IPC_GET_ARG1(*icall);
         const char *name = NULL;
         unsigned values = 0;
         const errno_t ret = mixer_iface->get_item_info(fun, item, &name, &values);
         const size_t name_size = name ? str_size(name) + 1 : 0;
-        async_answer_2(chandle, ret, name_size, values);
+        async_answer_2(icall, ret, name_size, values);
+
         /* Send the name. */
         if (ret == EOK && name_size > 0) {
+                ipc_call_t call;
                 size_t size;
-                cap_call_handle_t name_id;
-                if (!async_data_read_receive(&name_id, &size)) {
-                        async_answer_0(name_id, EPARTY);
+                if (!async_data_read_receive(&call, &size)) {
+                        async_answer_0(&call, EPARTY);
                         return;
                 }
+
                 if (size != name_size) {
-                        async_answer_0(name_id, ELIMIT);
+                        async_answer_0(&call, ELIMIT);
                         return;
                 }
-                async_data_read_finalize(name_id, name, name_size);
-        }
-}
-
-void remote_audio_mixer_set_item_level(
-    ddf_fun_t *fun, void *iface, cap_call_handle_t chandle, ipc_call_t *call)
+
+                async_data_read_finalize(&call, name, name_size);
+        }
+}
+
+void remote_audio_mixer_set_item_level(ddf_fun_t *fun, void *iface,
+    ipc_call_t *icall)
 {
         audio_mixer_iface_t *mixer_iface = iface;
 
         if (!mixer_iface->set_item_level) {
-                async_answer_0(chandle, ENOTSUP);
+                async_answer_0(icall, ENOTSUP);
                 return;
         }
-        const unsigned item = DEV_IPC_GET_ARG1(*call);
-        const unsigned value = DEV_IPC_GET_ARG2(*call);
+
+        const unsigned item = DEV_IPC_GET_ARG1(*icall);
+        const unsigned value = DEV_IPC_GET_ARG2(*icall);
         const errno_t ret = mixer_iface->set_item_level(fun, item, value);
-        async_answer_0(chandle, ret);
-}
-
-void remote_audio_mixer_get_item_level(
-    ddf_fun_t *fun, void *iface, cap_call_handle_t chandle, ipc_call_t *call)
+        async_answer_0(icall, ret);
+}
+
+void remote_audio_mixer_get_item_level(ddf_fun_t *fun, void *iface,
+    ipc_call_t *icall)
 {
         audio_mixer_iface_t *mixer_iface = iface;
 
         if (!mixer_iface->get_item_level) {
-                async_answer_0(chandle, ENOTSUP);
+                async_answer_0(icall, ENOTSUP);
                 return;
         }
-        const unsigned item = DEV_IPC_GET_ARG1(*call);
+
+        const unsigned item = DEV_IPC_GET_ARG1(*icall);
         unsigned current = 0;
         const errno_t ret =
             mixer_iface->get_item_level(fun, item, &current);
-        async_answer_1(chandle, ret, current);
+        async_answer_1(icall, ret, current);
 }