Changeset 57a2208 in mainline for uspace/drv/audio

Timestamp:

2014-09-09T22:10:03Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c4f67c8

Parents:

b14e9749

Message:

Hound should use the logging framework. Prevent hdaudio from sending frames played event after sending playback termination event. Remove unnecessary delays.

Location:

uspace/drv/audio/hdaudio

Files:

• hdactl.c (modified) (1 diff)
• hdaudio.c (modified) (2 diffs)
• hdaudio.h (modified) (3 diffs)
• pcm_iface.c (modified) (8 diffs)
• stream.c (modified) (1 diff)

uspace/drv/audio/hdaudio/hdactl.c

@@ -595 +595 @@
         }
 
-        async_usleep(5*1000*1000);
         ddf_msg(LVL_NOTE, "intsts=0x%x", hda_reg32_read(&hda->regs->intsts));
         ddf_msg(LVL_NOTE, "sdesc[%d].sts=0x%x",

uspace/drv/audio/hdaudio/hdaudio.c

@@ -172 +172 @@
         }
 
+        fibril_mutex_initialize(&hda->lock);
+
         ddf_msg(LVL_NOTE, "create parent sess");
         hda->parent_sess = ddf_dev_parent_sess_create(dev,
@@ -373 +375 @@
         if (0) ddf_msg(LVL_NOTE, "## interrupt ##");
 //      ddf_msg(LVL_NOTE, "interrupt arg4=0x%x", (int)IPC_GET_ARG4(*icall));
+        hda_ctl_interrupt(hda->ctl);
+
         if (IPC_GET_ARG3(*icall) != 0) {
-                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
-                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
-                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
-                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
-/*              hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
-                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
-                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
-                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);*/
-        }
-        hda_ctl_interrupt(hda->ctl);
+                /* Buffer completed */
+                hda_lock(hda);
+                if (hda->playing) {
+                        hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
+                        hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
+                        hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
+                        hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
+                }
+                hda_unlock(hda);
+        }
+}
+
+void hda_lock(hda_t *hda)
+{
+        fibril_mutex_lock(&hda->lock);
+}
+
+void hda_unlock(hda_t *hda)
+{
+        fibril_mutex_unlock(&hda->lock);
 }
 

uspace/drv/audio/hdaudio/hdaudio.h

@@ -38 +38 @@
 #include <async.h>
 #include <ddf/driver.h>
+#include <fibril_synch.h>
+#include <stdbool.h>
 #include <stdint.h>
 
@@ -44 +46 @@
 /** High Definition Audio driver instance */
 typedef struct hda {
+        fibril_mutex_t lock;
         async_sess_t *parent_sess;
         async_sess_t *ev_sess;
@@ -52 +55 @@
         struct hda_ctl *ctl;
         struct hda_stream *pcm_stream;
+        bool playing;
 } hda_t;
+
+extern void hda_lock(hda_t *);
+extern void hda_unlock(hda_t *);
 
 #endif

uspace/drv/audio/hdaudio/pcm_iface.c

@@ -149 +149 @@
         hda_t *hda = fun_to_hda(fun);
 
+        hda_lock(hda);
+
         ddf_msg(LVL_NOTE, "hda_get_buffer(): hda=%p", hda);
-        if (hda->pcm_stream != NULL)
+        if (hda->pcm_stream != NULL) {
+                hda_unlock(hda);
                 return EBUSY;
+        }
 
         /* XXX Choose appropriate parameters */
@@ -160 +164 @@
         ddf_msg(LVL_NOTE, "hda_get_buffer() - create stream");
         hda->pcm_stream = hda_stream_create(hda, sdir_output, fmt);
-        if (hda->pcm_stream == NULL)
+        if (hda->pcm_stream == NULL) {
+                hda_unlock(hda);
                 return EIO;
+        }
 
         ddf_msg(LVL_NOTE, "hda_get_buffer() - fill info");
@@ -170 +176 @@
         ddf_msg(LVL_NOTE, "hda_get_buffer() retturing EOK, buffer=%p, size=%zu",
             *buffer, *size);
+
+        hda_unlock(hda);
         return EOK;
 }
@@ -184 +192 @@
 
         ddf_msg(LVL_NOTE, "hda_set_event_session()");
+        hda_lock(hda);
         hda->ev_sess = sess;
+        hda_unlock(hda);
+
         return EOK;
 }
@@ -191 +202 @@
 {
         hda_t *hda = fun_to_hda(fun);
+        async_sess_t *sess;
 
         ddf_msg(LVL_NOTE, "hda_get_event_session()");
-        return hda->ev_sess;
+
+        hda_lock(hda);
+        sess = hda->ev_sess;
+        hda_unlock(hda);
+
+        return sess;
 }
 
@@ -200 +217 @@
         hda_t *hda = fun_to_hda(fun);
 
+        hda_lock(hda);
+
         ddf_msg(LVL_NOTE, "hda_release_buffer()");
-        if (hda->pcm_stream == NULL)
+        if (hda->pcm_stream == NULL) {
+                hda_unlock(hda);
                 return EINVAL;
+        }
 
         hda_stream_destroy(hda->pcm_stream);
         hda->pcm_stream = NULL;
+
+        hda_unlock(hda);
         return EOK;
 }
@@ -216 +239 @@
 
         ddf_msg(LVL_NOTE, "hda_start_playback()");
+        hda_lock(hda);
 
         rc = hda_out_converter_setup(hda->ctl->codec, hda->pcm_stream);
-        if (rc != EOK)
+        if (rc != EOK) {
+                hda_unlock(hda);
                 return rc;
-
-        async_usleep(1000*1000);
+        }
+
         hda_stream_start(hda->pcm_stream);
+        hda->playing = true;
+        hda_unlock(hda);
         return EOK;
 }
@@ -231 +258 @@
 
         ddf_msg(LVL_NOTE, "hda_stop_playback()");
+        hda_lock(hda);
         hda_stream_stop(hda->pcm_stream);
         hda_stream_reset(hda->pcm_stream);
+        hda->playing = false;
+        hda_unlock(hda);
 
         hda_pcm_event(hda, PCM_EVENT_PLAYBACK_TERMINATED);

uspace/drv/audio/hdaudio/stream.c

@@ -109 +109 @@
         }
 */
-//      async_usleep(1000*1000);
         /* audio_pcm_iface requires a single contiguous buffer */
         buffer = AS_AREA_ANY;