Changeset a46e56b in mainline for uspace/app/wavplay/dplay.c

Timestamp:

2018-03-22T06:49:35Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

77f0a1d

Parents:

3e242d2

git-author:

Jakub Jermar <jakub@…> (2018-03-21 23:29:06)

git-committer:

Jakub Jermar <jakub@…> (2018-03-22 06:49:35)

Message:

Prefer handle over ID in naming handle variables

File:

• uspace/app/wavplay/dplay.c (modified) (2 diffs)

uspace/app/wavplay/dplay.c

@@ -90 +90 @@
 /**
  * Fragment playback callback function.
- * @param iid IPC call id.
- * @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 iid, ipc_call_t *icall, void* arg)
-{
-        async_answer_0(iid, EOK);
+ *
+ * @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);
         playback_t *pb = arg;
         const size_t fragment_size = pb->buffer.size / DEFAULT_FRAGMENTS;
         while (1) {
                 ipc_call_t call;
-                cap_call_handle_t callid = async_get_call(&call);
+                cap_call_handle_t chandle = 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(callid, EOK);
+                        async_answer_0(chandle, EOK);
                         break;
                 case PCM_EVENT_PLAYBACK_TERMINATED:
@@ -113 +115 @@
                         pb->playing = false;
                         fibril_condvar_signal(&pb->cv);
-                        async_answer_0(callid, EOK);
+                        async_answer_0(chandle, EOK);
                         fibril_mutex_unlock(&pb->mutex);
                         return;
                 default:
                         printf("Unknown event %" PRIun ".\n", IPC_GET_IMETHOD(call));
-                        async_answer_0(callid, ENOTSUP);
+                        async_answer_0(chandle, ENOTSUP);
                         continue;