Changeset 3bacee1 in mainline for uspace/srv/audio

Timestamp:

2018-04-12T16:27:17Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

uspace/srv/audio/hound

Files:

• audio_data.c (modified) (2 diffs)
• hound_ctx.c (modified) (5 diffs)

uspace/srv/audio/hound/audio_data.c

@@ -103 +103 @@
  * @return valid pointer to data link structure, NULL on failure.
  */
-static inline audio_data_link_t * audio_data_link_list_instance(link_t *l)
+static inline audio_data_link_t *audio_data_link_list_instance(link_t *l)
 {
         return l ? list_get_instance(l, audio_data_link_t, link) : NULL;
@@ -144 +144 @@
  * @return pointer to the beginning of data buffer.
  */
-static inline const void * audio_data_link_start(audio_data_link_t *alink)
+static inline const void *audio_data_link_start(audio_data_link_t *alink)
 {
         assert(alink);

uspace/srv/audio/hound/hound_ctx.c

@@ -209 +209 @@
         fibril_mutex_lock(&stream->guard);
         if (stream->allowed_size &&
-            (audio_pipe_bytes(&stream->fifo) + adata->size
-                > stream->allowed_size)) {
+            (audio_pipe_bytes(&stream->fifo) + adata->size >
+            stream->allowed_size)) {
                 fibril_mutex_unlock(&stream->guard);
                 return EOVERFLOW;
@@ -246 +246 @@
  */
 hound_ctx_stream_t *hound_ctx_create_stream(hound_ctx_t *ctx, int flags,
-        pcm_format_t format, size_t buffer_size)
+    pcm_format_t format, size_t buffer_size)
 {
         assert(ctx);
@@ -308 +308 @@
         while (stream->allowed_size &&
             (audio_pipe_bytes(&stream->fifo) + size > stream->allowed_size)) {
-            fibril_condvar_wait(&stream->change, &stream->guard);
+                fibril_condvar_wait(&stream->change, &stream->guard);
 
         }
@@ -336 +336 @@
         fibril_mutex_lock(&stream->guard);
         while (audio_pipe_bytes(&stream->fifo) < size) {
-            fibril_condvar_wait(&stream->change, &stream->guard);
+                fibril_condvar_wait(&stream->change, &stream->guard);
         }
 
@@ -466 +466 @@
                 if (ret != EOK)
                         log_error("Failed to push data to stream: %s",
-                                str_error(ret));
+                            str_error(ret));
         }
         audio_data_unref(adata);