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

Timestamp:

2012-08-20T14:52:54Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e7bf5f6

Parents:

c04ff9f

Message:

ab16: Improve event reporting, and state checking.

File:

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

uspace/drv/audio/sb16/dsp.c

@@ -187 +187 @@
 }
 
+static inline void dsp_report_event(sb_dsp_t *dsp, pcm_event_t event)
+{
+        assert(dsp);
+        if (!dsp->event_exchange)
+                ddf_log_warning("No one listening for event %u", event);
+        async_msg_1(dsp->event_exchange, event, dsp->active.frame_count);
+}
+
 static inline size_t sample_count(pcm_sample_format_t format, size_t byte_count)
 {
@@ -235 +243 @@
         {
         case DSP_PLAYBACK_ACTIVE_EVENTS:
-                async_msg_1(dsp->event_exchange,
-                    PCM_EVENT_FRAMES_PLAYED, dsp->active.frame_count);
+                dsp_report_event(dsp, PCM_EVENT_FRAMES_PLAYED);
         case DSP_PLAYBACK_NOEVENTS:
 #ifndef AUTO_DMA_MODE
@@ -243 +250 @@
                 break;
         case DSP_CAPTURE_ACTIVE_EVENTS:
-                async_msg_1(dsp->event_exchange,
-                    PCM_EVENT_FRAMES_CAPTURED, dsp->active.frame_count);
+                dsp_report_event(dsp, PCM_EVENT_FRAMES_CAPTURED);
         case DSP_CAPTURE_NOEVENTS:
 #ifndef AUTO_DMA_MODE
@@ -418 +424 @@
         sb_dsp_change_state(dsp,
             frames ? DSP_PLAYBACK_ACTIVE_EVENTS : DSP_PLAYBACK_NOEVENTS);
+        if (dsp->state == DSP_PLAYBACK_ACTIVE_EVENTS)
+                dsp_report_event(dsp, PCM_EVENT_PLAYBACK_STARTED);
 
         return EOK;
@@ -425 +433 @@
 {
         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.");
-        async_msg_0(dsp->event_exchange, PCM_EVENT_PLAYBACK_TERMINATED);
+        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;
@@ -475 +488 @@
         sb_dsp_change_state(dsp,
             frames ? DSP_CAPTURE_ACTIVE_EVENTS : DSP_CAPTURE_NOEVENTS);
+        if (dsp->state == DSP_CAPTURE_ACTIVE_EVENTS)
+                dsp_report_event(dsp, PCM_EVENT_CAPTURE_STARTED);
         return EOK;
 }
@@ -481 +496 @@
 {
         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");
-        async_msg_0(dsp->event_exchange, PCM_EVENT_CAPTURE_TERMINATED);
+        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;