Changeset 92b638c in mainline for uspace/drv/audio/sb16

Timestamp:

2012-08-30T11:41:48Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5eed99d

Parents:

ed3816d

Message:

audio, sb16: Add and implement API for playback/capture with or without fragments.

Location:

uspace/drv/audio/sb16

Files:

• dsp.c (modified) (4 diffs)
• dsp.h (modified) (1 diff)
• pcm_iface.c (modified) (2 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -403 +403 @@
                 return EINVAL;
 
+        if (dsp->state != DSP_READY && dsp->state != DSP_STOPPED)
+                return EINVAL;
+
         /* Check supported parameters */
         ddf_log_debug("Requested playback: %u frames, %uHz, %s, %u channel(s).",
@@ -444 +447 @@
 }
 
-int sb_dsp_stop_playback(sb_dsp_t *dsp)
-{
-        assert(dsp);
-        if (dsp->state != DSP_PLAYBACK_NOEVENTS &&
-            dsp->state != DSP_PLAYBACK_ACTIVE_EVENTS)
-                return EINVAL;
-
-        sb_dsp_write(dsp, DMA_16B_EXIT);
-        ddf_log_debug("Stopping playback on buffer.");
-        sb_dsp_change_state(dsp, DSP_PLAYBACK_TERMINATE);
-        return EOK;
+int sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate)
+{
+        assert(dsp);
+        if ((dsp->state == DSP_PLAYBACK_NOEVENTS ||
+            dsp->state == DSP_PLAYBACK_ACTIVE_EVENTS) &&
+            immediate)
+        {
+                sb_dsp_write(dsp, DMA_16B_PAUSE);
+                sb_dsp_reset(dsp);
+                ddf_log_debug("Stopped playback");
+                sb_dsp_change_state(dsp, DSP_STOPPED);
+                return EOK;
+        }
+        if (dsp->state == DSP_PLAYBACK_ACTIVE_EVENTS)
+        {
+                /* Stop after current fragment */
+                assert(!immediate);
+                sb_dsp_write(dsp, DMA_16B_EXIT);
+                ddf_log_debug("Last playback fragment");
+                sb_dsp_change_state(dsp, DSP_PLAYBACK_TERMINATE);
+                return EOK;
+        }
+        return EINVAL;
 }
 
@@ -462 +477 @@
         assert(dsp);
         if (!dsp->buffer.data)
+                return EINVAL;
+        if (dsp->state != DSP_READY && dsp->state != DSP_STOPPED)
                 return EINVAL;
 
@@ -503 +520 @@
 }
 
-int sb_dsp_stop_capture(sb_dsp_t *dsp)
-{
-        assert(dsp);
-        if (dsp->state != DSP_CAPTURE_NOEVENTS &&
-            dsp->state != DSP_CAPTURE_ACTIVE_EVENTS)
-                return EINVAL;
-
-        sb_dsp_write(dsp, DMA_16B_EXIT);
-        ddf_log_debug("Stopped capture");
-        sb_dsp_change_state(dsp, DSP_CAPTURE_TERMINATE);
-        return EOK;
+int sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate)
+{
+        assert(dsp);
+        if ((dsp->state == DSP_CAPTURE_NOEVENTS ||
+            dsp->state == DSP_CAPTURE_ACTIVE_EVENTS) &&
+            immediate)
+        {
+                sb_dsp_write(dsp, DMA_16B_PAUSE);
+                sb_dsp_reset(dsp);
+                ddf_log_debug("Stopped capture fragment");
+                sb_dsp_change_state(dsp, DSP_STOPPED);
+                return EOK;
+        }
+        if (dsp->state == DSP_CAPTURE_ACTIVE_EVENTS)
+        {
+                /* Stop after current fragment */
+                assert(!immediate);
+                sb_dsp_write(dsp, DMA_16B_EXIT);
+                ddf_log_debug("Last capture fragment");
+                sb_dsp_change_state(dsp, DSP_CAPTURE_TERMINATE);
+                return EOK;
+        }
+        return EINVAL;
 }
 /**

uspace/drv/audio/sb16/dsp.h

@@ -90 +90 @@
 int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames,
     unsigned channels, unsigned sample_rate, pcm_sample_format_t format);
-int sb_dsp_stop_playback(sb_dsp_t *dsp);
+int sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate);
 int sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames,
     unsigned channels, unsigned sample_rate, pcm_sample_format_t format);
-int sb_dsp_stop_capture(sb_dsp_t *dsp);
+int sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate);
 
 #endif

uspace/drv/audio/sb16/pcm_iface.c

@@ -96 +96 @@
 }
 
-static int sb_stop_playback(ddf_fun_t *fun)
+static int sb_stop_playback(ddf_fun_t *fun, bool immediate)
 {
-        return sb_dsp_stop_playback(fun_to_dsp(fun));
+        return sb_dsp_stop_playback(fun_to_dsp(fun), immediate);
 }
 
@@ -108 +108 @@
 }
 
-static int sb_stop_capture(ddf_fun_t *fun)
+static int sb_stop_capture(ddf_fun_t *fun, bool immediate)
 {
-        return sb_dsp_stop_capture(fun_to_dsp(fun));
+        return sb_dsp_stop_capture(fun_to_dsp(fun), immediate);
 }