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

Timestamp:

2012-08-30T12:10:06Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5337491

Parents:

5eed99d

Message:

sb16: Merge DSP_STOPPED and DSP_READY.

File:

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

uspace/drv/audio/sb16/dsp.c

@@ -71 +71 @@
                 [DSP_PLAYBACK_TERMINATE] = "PLAYBACK TERMINATE",
                 [DSP_CAPTURE_TERMINATE] = "CAPTURE TERMINATE",
-                [DSP_STOPPED] = "STOPPED",
                 [DSP_READY] = "READY",
                 [DSP_NO_BUFFER] = "NO BUFFER",
@@ -262 +261 @@
                 async_exchange_end(dsp->event_exchange);
                 dsp->event_exchange = NULL;
-                dsp_change_state(dsp, DSP_STOPPED);
+                dsp_change_state(dsp, DSP_READY);
                 break;
         case DSP_PLAYBACK_TERMINATE:
@@ -268 +267 @@
                 async_exchange_end(dsp->event_exchange);
                 dsp->event_exchange = NULL;
-                dsp_change_state(dsp, DSP_STOPPED);
+                dsp_change_state(dsp, DSP_READY);
                 break;
         default:
@@ -384 +383 @@
 {
         assert(dsp);
-        if (dsp->state != DSP_READY && dsp->state != DSP_STOPPED)
+        if (dsp->state != DSP_READY)
                 return EINVAL;
         assert(dsp->buffer.data);
@@ -400 +399 @@
         assert(dsp);
 
-        if (!dsp->buffer.data)
-                return EINVAL;
-
-        if (dsp->state != DSP_READY && dsp->state != DSP_STOPPED)
+        if (!dsp->buffer.data || dsp->state != DSP_READY)
                 return EINVAL;
 
@@ -457 +453 @@
                 dsp_reset(dsp);
                 ddf_log_debug("Stopped playback");
-                dsp_change_state(dsp, DSP_STOPPED);
+                dsp_change_state(dsp, DSP_READY);
                 return EOK;
         }
@@ -476 +472 @@
 {
         assert(dsp);
-        if (!dsp->buffer.data)
-                return EINVAL;
-        if (dsp->state != DSP_READY && dsp->state != DSP_STOPPED)
+        if (!dsp->buffer.data || dsp->state != DSP_READY)
                 return EINVAL;
 
@@ -530 +524 @@
                 dsp_reset(dsp);
                 ddf_log_debug("Stopped capture fragment");
-                dsp_change_state(dsp, DSP_STOPPED);
+                dsp_change_state(dsp, DSP_READY);
                 return EOK;
         }