Changeset 57e8b3b in mainline for uspace/lib/drv/generic/remote_audio_pcm.c

Timestamp:

2012-07-15T15:25:43Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5cd5079

Parents:

2cc5c835

Message:

Add frame count to event report.

This enables applications to detect underruns.

File:

• uspace/lib/drv/generic/remote_audio_pcm.c (modified) (4 diffs)

uspace/lib/drv/generic/remote_audio_pcm.c

@@ -148 +148 @@
 }
 
-int audio_pcm_start_playback(audio_pcm_sess_t *sess, unsigned parts,
+int audio_pcm_start_playback(audio_pcm_sess_t *sess, unsigned frames,
     unsigned channels, unsigned sample_rate, pcm_sample_format_t format)
 {
-        if (parts > UINT8_MAX || channels > UINT8_MAX)
+        if (channels > UINT16_MAX)
                 return EINVAL;
         assert((format & UINT16_MAX) == format);
-        const sysarg_t packed =
-            (parts << 24) | (channels << 16) | (format & UINT16_MAX);
-        async_exch_t *exch = async_exchange_begin(sess);
-        const int ret = async_req_3_0(exch,
+        const sysarg_t packed = (channels << 16) | (format & UINT16_MAX);
+        async_exch_t *exch = async_exchange_begin(sess);
+        const int ret = async_req_4_0(exch,
             DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE),
             IPC_M_AUDIO_PCM_START_PLAYBACK,
-            sample_rate, packed);
+            frames, sample_rate, packed);
         async_exchange_end(exch);
         return ret;
@@ -175 +174 @@
 }
 
-int audio_pcm_start_record(audio_pcm_sess_t *sess, unsigned parts,
+int audio_pcm_start_record(audio_pcm_sess_t *sess, unsigned frames,
     unsigned channels, unsigned sample_rate, pcm_sample_format_t format)
 {
-        if (parts > UINT8_MAX || channels > UINT8_MAX)
+        if (channels > UINT16_MAX)
                 return EINVAL;
         assert((format & UINT16_MAX) == format);
-        const sysarg_t packed =
-            (parts << 24) | (channels << 16) | (format & UINT16_MAX);
-        async_exch_t *exch = async_exchange_begin(sess);
-        const int ret = async_req_3_0(exch,
+        const sysarg_t packed = (channels << 16) | (format & UINT16_MAX);
+        async_exch_t *exch = async_exchange_begin(sess);
+        const int ret = async_req_4_0(exch,
             DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), IPC_M_AUDIO_PCM_START_RECORD,
-            sample_rate, packed);
+            frames, sample_rate, packed);
         async_exchange_end(exch);
         return ret;
@@ -345 +343 @@
         const audio_pcm_iface_t *pcm_iface = iface;
 
-        const unsigned rate = DEV_IPC_GET_ARG1(*call);
-        const unsigned parts = (DEV_IPC_GET_ARG2(*call) >> 24) & UINT8_MAX;
-        const unsigned channels = (DEV_IPC_GET_ARG2(*call) >> 16) & UINT8_MAX;
-        const pcm_sample_format_t format = DEV_IPC_GET_ARG2(*call) & UINT16_MAX;
+        const unsigned frames = DEV_IPC_GET_ARG1(*call);
+        const unsigned rate = DEV_IPC_GET_ARG2(*call);
+        const unsigned channels = (DEV_IPC_GET_ARG3(*call) >> 16) & UINT8_MAX;
+        const pcm_sample_format_t format = DEV_IPC_GET_ARG3(*call) & UINT16_MAX;
 
         const int ret = pcm_iface->start_playback
-            ? pcm_iface->start_playback(fun, parts, channels, rate, format)
+            ? pcm_iface->start_playback(fun, frames, channels, rate, format)
             : ENOTSUP;
         async_answer_0(callid, ret);
@@ -371 +369 @@
         const audio_pcm_iface_t *pcm_iface = iface;
 
-        const unsigned rate = DEV_IPC_GET_ARG1(*call);
-        const unsigned parts = (DEV_IPC_GET_ARG2(*call) >> 24) & UINT8_MAX;
-        const unsigned channels = (DEV_IPC_GET_ARG2(*call) >> 16) & UINT8_MAX;
-        const pcm_sample_format_t format = DEV_IPC_GET_ARG2(*call) & UINT16_MAX;
+        const unsigned frames = DEV_IPC_GET_ARG1(*call);
+        const unsigned rate = DEV_IPC_GET_ARG2(*call);
+        const unsigned channels = (DEV_IPC_GET_ARG3(*call) >> 16) & UINT16_MAX;
+        const pcm_sample_format_t format = DEV_IPC_GET_ARG3(*call) & UINT16_MAX;
 
         const int ret = pcm_iface->start_record
-            ? pcm_iface->start_record(fun, parts, channels, rate, format)
+            ? pcm_iface->start_record(fun, frames, channels, rate, format)
             : ENOTSUP;
         async_answer_0(callid, ret);