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

Timestamp:

2012-07-05T19:32:58Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

725d038

Parents:

8de7ef2

Message:

drv/audio/sb16: Accept event session and send USER_METHOD on playback interrupt.

File:

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

uspace/drv/audio/sb16/dsp.c

@@ -162 +162 @@
         dsp->dma8_channel = dma8;
         dsp->dma16_channel = dma16;
+        dsp->event_session = NULL;
+        dsp->event_exchange = NULL;
         dsp->sb_dev = dev;
         sb_dsp_reset(dsp);
@@ -187 +189 @@
 void sb_dsp_interrupt(sb_dsp_t *dsp)
 {
+        assert(dsp);
+        if (dsp->event_exchange) {
+                async_msg_0(dsp->event_exchange, IPC_FIRST_USER_METHOD);
+        } else {
+                ddf_log_warning("Interrupt with no event consumer.");
+        }
 #ifndef AUTO_DMA_MODE
-        assert(dsp);
         sb_dsp_write(dsp, SINGLE_DMA_16B_DA);
         sb_dsp_write(dsp, dsp->playing.mode);
@@ -200 +207 @@
         assert(dsp);
         assert(size);
+
+        /* buffer is already setup by for someone, refuse to work until
+         * it's released */
+        if (dsp->buffer.data)
+                return EBUSY;
 
         const int ret = sb_setup_buffer(dsp, *size);
@@ -213 +225 @@
         return ret;
 }
+
+int sb_dsp_set_event_session(sb_dsp_t *dsp, unsigned id, async_sess_t *session)
+{
+        assert(dsp);
+        assert(session);
+        if (id != BUFFER_ID)
+                return ENOENT;
+        if (dsp->event_session)
+                return EBUSY;
+        dsp->event_session = session;
+        return EOK;
+}
 /*----------------------------------------------------------------------------*/
 int sb_dsp_release_buffer(sb_dsp_t *dsp, unsigned id)
@@ -220 +244 @@
                 return ENOENT;
         sb_clear_buffer(dsp);
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
-int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned id, unsigned sampling_rate,
-    unsigned sample_size, unsigned channels, bool sign)
-{
-        assert(dsp);
+        if (dsp->event_exchange)
+                async_exchange_end(dsp->event_exchange);
+        dsp->event_exchange = NULL;
+        if (dsp->event_session)
+                async_hangup(dsp->event_session);
+        dsp->event_session = NULL;
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned id, unsigned parts,
+    unsigned sampling_rate, unsigned sample_size, unsigned channels, bool sign)
+{
+        assert(dsp);
+
+        if (!dsp->event_session)
+                return EINVAL;
+
+        /* Play block size must be even number (we use DMA 16)*/
+        if (dsp->buffer.size % (parts * 2))
+                return EINVAL;
+
+        const unsigned play_block_size = dsp->buffer.size / parts;
 
         /* Check supported parameters */
@@ -241 +280 @@
                 return ENOTSUP;
 
+        dsp->event_exchange = async_exchange_begin(dsp->event_session);
+        if (!dsp->event_exchange)
+                return ENOMEM;
 
         sb_dsp_write(dsp, SET_SAMPLING_RATE_OUTPUT);
@@ -259 +301 @@
         sb_dsp_write(dsp, dsp->playing.mode);
 
-        dsp->playing.samples = sample_count(sample_size, PLAY_BLOCK_SIZE);
+        dsp->playing.samples = sample_count(sample_size, play_block_size);
         sb_dsp_write(dsp, (dsp->playing.samples - 1) & 0xff);
         sb_dsp_write(dsp, (dsp->playing.samples - 1) >> 8);
 
         return EOK;
-        return ENOTSUP;
 }
 /*----------------------------------------------------------------------------*/
@@ -272 +313 @@
         if (id != BUFFER_ID)
                 return ENOENT;
+        async_exchange_end(dsp->event_exchange);
         sb_dsp_write(dsp, DMA_16B_EXIT);
         return EOK;