Changeset 57a2208 in mainline for uspace/drv/audio/hdaudio/hdaudio.c

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.

File:

• uspace/drv/audio/hdaudio/hdaudio.c (modified) (2 diffs)

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);
 }