Changeset 984a9ba in mainline for uspace/app/wavplay/dplay.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/app/wavplay/dplay.c (modified) (2 diffs)

uspace/app/wavplay/dplay.c

@@ -88 +88 @@
 }
 
-/**
- * Fragment playback callback function.
+/** Fragment playback callback function.
  *
- * @param icall_handle  Call capability handle.
- * @param icall         Pointer to the call structure
- * @param arg           Argument, pointer to the playback helper function
- */
-static void device_event_callback(cap_call_handle_t icall_handle,
-    ipc_call_t *icall, void *arg)
-{
-        async_answer_0(icall_handle, EOK);
+ * @param icall Pointer to the call structure
+ * @param arg   Argument, pointer to the playback helper function
+ *
+ */
+static void device_event_callback(ipc_call_t *icall, void *arg)
+{
+        async_answer_0(icall, EOK);
         playback_t *pb = arg;
         const size_t fragment_size = pb->buffer.size / DEFAULT_FRAGMENTS;
+
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                async_get_call(&call);
+
                 switch (IPC_GET_IMETHOD(call)) {
                 case PCM_EVENT_PLAYBACK_STARTED:
                 case PCM_EVENT_FRAMES_PLAYED:
                         printf("%" PRIun " frames: ", IPC_GET_ARG1(call));
-                        async_answer_0(chandle, EOK);
+                        async_answer_0(&call, EOK);
                         break;
                 case PCM_EVENT_PLAYBACK_TERMINATED:
@@ -115 +115 @@
                         pb->playing = false;
                         fibril_condvar_signal(&pb->cv);
-                        async_answer_0(chandle, EOK);
+                        async_answer_0(&call, EOK);
                         fibril_mutex_unlock(&pb->mutex);
                         return;
                 default:
                         printf("Unknown event %" PRIun ".\n", IPC_GET_IMETHOD(call));
-                        async_answer_0(chandle, ENOTSUP);
+                        async_answer_0(&call, ENOTSUP);
                         continue;