Changeset 7364c6ee in mainline

Timestamp:

2012-07-05T22:16:06Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9d5244f

Parents:

4bbfb93

Message:

libdrv,audio: Fix sending of shared memory flags.

Fix calling buffer release in error paths.

File:

• uspace/lib/drv/generic/remote_audio_pcm_buffer.c (modified) (3 diffs)

uspace/lib/drv/generic/remote_audio_pcm_buffer.c

@@ -94 +94 @@
         if (ret == EOK) {
                 void *dst = NULL;
-                // FIXME Do we need to know the flags?
                 int ret = async_share_in_start_0_0(exch, buffer_size, &dst);
                 if (ret != EOK) {
@@ -238 +237 @@
         size_t share_size = 0;
         ipc_callid_t share_id = 0;
-        ddf_msg(LVL_DEBUG2, "Calling share receive.");
+
+        ddf_msg(LVL_DEBUG2, "Receiving share request.");
         if (!async_share_in_receive(&share_id, &share_size)) {
                 ddf_msg(LVL_DEBUG, "Failed to share pcm buffer.");
-                if (pcm_iface->release_buffer)
-                        pcm_iface->release_buffer(fun, id);
+                pcm_iface->release_buffer(fun, id);
                 async_answer_0(share_id, EPARTY);
                 return;
         }
-        ddf_msg(LVL_DEBUG2, "Checking requested share size");
+
+        ddf_msg(LVL_DEBUG2, "Checking requested share size.");
         if (share_size != size) {
                 ddf_msg(LVL_DEBUG, "Incorrect pcm buffer size requested.");
-                if (pcm_iface->release_buffer)
-                        pcm_iface->release_buffer(fun, id);
+                pcm_iface->release_buffer(fun, id);
                 async_answer_0(share_id, ELIMIT);
                 return;
         }
-        ddf_msg(LVL_DEBUG2, "Calling share finalize");
-        ret = async_share_in_finalize(share_id, buffer, 0);
+
+        ddf_msg(LVL_DEBUG2, "Calling share finalize.");
+        ret = async_share_in_finalize(share_id, buffer, AS_AREA_WRITE
+        | AS_AREA_READ);
         if (ret != EOK) {
-                ddf_msg(LVL_DEBUG, "Failed to share buffer");
-                if (pcm_iface->release_buffer)
-                        pcm_iface->release_buffer(fun, id);
-                return;
-
-        }
+                ddf_msg(LVL_DEBUG, "Failed to share buffer.");
+                pcm_iface->release_buffer(fun, id);
+                return;
+        }
+
         ddf_msg(LVL_DEBUG2, "Buffer shared with size %zu, creating callback.",
             share_size);
@@ -280 +280 @@
                         ddf_msg(LVL_DEBUG, "Failed to set event callback.");
                         pcm_iface->release_buffer(fun, id);
-                }
-                async_answer_0(callid, ret);
+                        async_answer_0(callid, ret);
+                        return;
+                }
+                ddf_msg(LVL_DEBUG2, "Buffer and event session setup OK.");
+                async_answer_0(callid, EOK);
         }
 }