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

Timestamp:

2012-08-20T15:14:50Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

03d6e0d

Parents:

e7bf5f6

Message:

sb16: Report termination after the action has actually terminated.

File:

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

uspace/drv/audio/sb16/dsp.c

@@ -256 +256 @@
 #endif
                 break;
+        case DSP_CAPTURE_TERMINATE:
+                dsp_report_event(dsp, PCM_EVENT_CAPTURE_TERMINATED);
+                async_exchange_end(dsp->event_exchange);
+                dsp->event_exchange = NULL;
+                sb_dsp_change_state(dsp, DSP_STOPPED);
+                break;
+        case DSP_PLAYBACK_TERMINATE:
+                dsp_report_event(dsp, PCM_EVENT_PLAYBACK_TERMINATED);
+                async_exchange_end(dsp->event_exchange);
+                dsp->event_exchange = NULL;
+                sb_dsp_change_state(dsp, DSP_STOPPED);
+                break;
         default:
                 ddf_log_warning("Interrupt while DSP not active");
@@ -439 +451 @@
         sb_dsp_write(dsp, DMA_16B_EXIT);
         ddf_log_debug("Stopping playback on buffer.");
-        if (dsp->state == DSP_PLAYBACK_ACTIVE_EVENTS)
-                dsp_report_event(dsp, PCM_EVENT_PLAYBACK_TERMINATED);
-        async_exchange_end(dsp->event_exchange);
-        dsp->event_exchange = NULL;
-        sb_dsp_change_state(dsp, DSP_STOPPED);
+        sb_dsp_change_state(dsp, DSP_PLAYBACK_TERMINATE);
         return EOK;
 }
@@ -502 +510 @@
         sb_dsp_write(dsp, DMA_16B_EXIT);
         ddf_log_debug("Stopped capture");
-        if (dsp->state == DSP_CAPTURE_ACTIVE_EVENTS)
-                dsp_report_event(dsp, PCM_EVENT_CAPTURE_TERMINATED);
-        async_exchange_end(dsp->event_exchange);
-        dsp->event_exchange = NULL;
-        sb_dsp_change_state(dsp, DSP_STOPPED);
+        sb_dsp_change_state(dsp, DSP_CAPTURE_TERMINATE);
         return EOK;
 }