Changeset 1240bb9 in mainline for uspace/drv/audio/sb16/dsp.c

Timestamp:

2012-07-12T18:20:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d01e635

Parents:

992ef56

Message:

Use named audio events.

audio/sb16: dsp uses more detailed status (not just playing/not-playing).
app/drec: Fix parameter order in.

File:

• uspace/drv/audio/sb16/dsp.c (modified) (8 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -33 +33 @@
  */
 
+#include <bool.h>
 #include <devman.h>
 #include <device/hw_res.h>
@@ -38 +39 @@
 #include <libarch/barrier.h>
 #include <str_error.h>
-#include <bool.h>
+#include <audio_pcm_iface.h>
 
 #include "dma.h"
@@ -162 +163 @@
         dsp->event_exchange = NULL;
         dsp->sb_dev = dev;
+        dsp->status = DSP_STOPPED;
         sb_dsp_reset(dsp);
         /* "DSP takes about 100 microseconds to initialize itself" */
@@ -188 +190 @@
         assert(dsp);
         if (dsp->event_exchange) {
-                async_msg_0(dsp->event_exchange, IPC_FIRST_USER_METHOD);
+                switch (dsp->status) {
+                case DSP_PLAYBACK:
+                        async_msg_0(dsp->event_exchange,
+                            PCM_EVENT_PLAYBACK_DONE);
+                        break;
+                case DSP_RECORDING:
+                        async_msg_0(dsp->event_exchange,
+                            PCM_EVENT_RECORDING_DONE);
+                        break;
+                default:
+                case DSP_STOPPED:
+                        ddf_log_warning("Interrupt while DSP stopped and "
+                            "event exchange present. Terminating exchange");
+                        async_exchange_end(dsp->event_exchange);
+                        dsp->event_exchange = NULL;
+                }
         } else {
                 ddf_log_warning("Interrupt with no event consumer.");
@@ -316 +333 @@
             sampling_rate / (dsp->active.samples * channels));
 
-        dsp->active.playing = true;
+        dsp->status = DSP_PLAYBACK;
 
         return EOK;
@@ -326 +343 @@
         if (id != BUFFER_ID)
                 return ENOENT;
+        sb_dsp_write(dsp, DMA_16B_EXIT);
+        ddf_log_debug("Stopping playback on buffer %u.", id);
+        async_msg_0(dsp->event_exchange, PCM_EVENT_PLAYBACK_TERMINATED);
         async_exchange_end(dsp->event_exchange);
-        sb_dsp_write(dsp, DMA_16B_EXIT);
+        dsp->event_exchange = NULL;
         return EOK;
 }
@@ -389 +409 @@
             "(~1/%u sec)", dsp->active.samples,
             sampling_rate / (dsp->active.samples * channels));
-        dsp->active.playing = false;
+        dsp->status = DSP_RECORDING;
 
         return EOK;
@@ -399 +419 @@
         if (id != BUFFER_ID)
                 return ENOENT;
+        sb_dsp_write(dsp, DMA_16B_EXIT);
+        ddf_log_debug("Stopping playback on buffer %u.", id);
+        async_msg_0(dsp->event_exchange, PCM_EVENT_RECORDING_TERMINATED);
         async_exchange_end(dsp->event_exchange);
-        sb_dsp_write(dsp, DMA_16B_EXIT);
+        dsp->event_exchange = NULL;
         return EOK;
 }