Changeset a3ab774 in mainline

Timestamp:

2012-07-07T21:26:04Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e1b7e36

Parents:

ef246b9

Message:

libdrv/audio,drv/audio/sb16: Update and implement recording interface.

Untested.

Location:

uspace

Files:

• drv/audio/sb16/dsp.c (modified) (4 diffs)
• drv/audio/sb16/dsp.h (modified) (2 diffs)
• drv/audio/sb16/pcm_iface.c (modified) (2 diffs)
• lib/drv/generic/remote_audio_pcm_buffer.c (modified) (2 diffs)
• lib/drv/include/audio_pcm_buffer_iface.h (modified) (2 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -196 +196 @@
         }
 #ifndef AUTO_DMA_MODE
-        sb_dsp_write(dsp, SINGLE_DMA_16B_DA);
-        sb_dsp_write(dsp, dsp->playing.mode);
-        sb_dsp_write(dsp, (dsp->playing.samples - 1) & 0xff);
-        sb_dsp_write(dsp, (dsp->playing.samples - 1) >> 8);
+        if (dsp->active.playing)
+                sb_dsp_write(dsp, SINGLE_DMA_16B_DA);
+        else
+                sb_dsp_write(dsp, SINGLE_DMA_16B_AD);
+
+        sb_dsp_write(dsp, dsp->active.mode);
+        sb_dsp_write(dsp, (dsp->active.samples - 1) & 0xff);
+        sb_dsp_write(dsp, (dsp->active.samples - 1) >> 8);
 #endif
 }
@@ -271 +275 @@
 
         /* Check supported parameters */
-        ddf_log_debug("Requested playback on buffer \"%u\" (%u parts): %uHz, "
+        ddf_log_debug("Requested recording on buffer \"%u\" (%u parts): %uHz, "
             "%ssinged %u bit, %u channel(s).", id, parts, sampling_rate,
             sign ? "" : "un", sample_size, channels);
@@ -300 +304 @@
 #endif
 
-        dsp->playing.mode = 0 |
+        dsp->active.mode = 0 |
             (sign ? DSP_MODE_SIGNED : 0) | (channels == 2 ? DSP_MODE_STEREO : 0);
-        sb_dsp_write(dsp, dsp->playing.mode);
-
-        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);
+        sb_dsp_write(dsp, dsp->active.mode);
+
+        dsp->active.samples = sample_count(sample_size, play_block_size);
+        sb_dsp_write(dsp, (dsp->active.samples - 1) & 0xff);
+        sb_dsp_write(dsp, (dsp->active.samples - 1) >> 8);
 
         ddf_log_verbose("Playback started, interrupt every %u samples "
-            "(~1/%u sec)", dsp->playing.samples,
-            sampling_rate / dsp->playing.samples);
+            "(~1/%u sec)", dsp->active.samples,
+            sampling_rate / dsp->active.samples);
+
+        dsp->active.playing = true;
 
         return EOK;
@@ -325 +331 @@
 }
 
-int sb_dsp_start_record(sb_dsp_t *dsp, unsigned id, unsigned sample_rate,
-    unsigned sample_size, unsigned channels, bool sign)
-{
-        return ENOTSUP;
+int sb_dsp_start_record(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 */
+        ddf_log_debug("Requested playback on buffer \"%u\" (%u parts): %uHz, "
+            "%ssinged %u bit, %u channel(s).", id, parts, sampling_rate,
+            sign ? "" : "un", sample_size, channels);
+        if (id != BUFFER_ID)
+                return ENOENT;
+        if (sample_size != 16) // FIXME We only support 16 bit playback
+                return ENOTSUP;
+        if (channels != 1 && channels != 2)
+                return ENOTSUP;
+        if (sampling_rate > 44100)
+                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);
+        sb_dsp_write(dsp, sampling_rate >> 8);
+        sb_dsp_write(dsp, sampling_rate & 0xff);
+
+        ddf_log_verbose("Sampling rate: %hhx:%hhx.",
+            sampling_rate >> 8, sampling_rate & 0xff);
+
+#ifdef AUTO_DMA_MODE
+        sb_dsp_write(dsp, AUTO_DMA_16B_AD_FIFO);
+#else
+        sb_dsp_write(dsp, SINGLE_DMA_16B_AD_FIFO);
+#endif
+
+        dsp->active.mode = 0 |
+            (sign ? DSP_MODE_SIGNED : 0) | (channels == 2 ? DSP_MODE_STEREO : 0);
+        sb_dsp_write(dsp, dsp->active.mode);
+
+        dsp->active.samples = sample_count(sample_size, play_block_size);
+        sb_dsp_write(dsp, (dsp->active.samples - 1) & 0xff);
+        sb_dsp_write(dsp, (dsp->active.samples - 1) >> 8);
+
+        ddf_log_verbose("Recording started started, interrupt every %u samples "
+            "(~1/%u sec)", dsp->active.samples,
+            sampling_rate / dsp->active.samples);
+        dsp->active.playing = false;
+
+        return EOK;
 }
 
 int sb_dsp_stop_record(sb_dsp_t *dsp, unsigned id)
 {
-        return ENOTSUP;
+        assert(dsp);
+        if (id != BUFFER_ID)
+                return ENOENT;
+        async_exchange_end(dsp->event_exchange);
+        sb_dsp_write(dsp, DMA_16B_EXIT);
+        return EOK;
 }
 /**

uspace/drv/audio/sb16/dsp.h

@@ -56 +56 @@
                 uint8_t mode;
                 uint16_t samples;
-        } playing;
+                bool playing;
+        } active;
         async_sess_t *event_session;
         async_exch_t *event_exchange;
@@ -72 +73 @@
     unsigned sample_rate, unsigned sample_size, unsigned channels, bool sign);
 int sb_dsp_stop_playback(sb_dsp_t *dsp, unsigned id);
-int sb_dsp_start_record(sb_dsp_t *dsp, unsigned id, unsigned sample_rate,
-    unsigned sample_size, unsigned channels, bool sign);
+int sb_dsp_start_record(sb_dsp_t *dsp, unsigned id, unsigned parts,
+    unsigned sample_rate, unsigned sample_size, unsigned channels, bool sign);
 int sb_dsp_stop_record(sb_dsp_t *dsp, unsigned id);
 

uspace/drv/audio/sb16/pcm_iface.c

@@ -88 +88 @@
 }
 
-static int sb_start_record(ddf_fun_t *fun, unsigned id,
+static int sb_start_record(ddf_fun_t *fun, unsigned id, unsigned parts,
     unsigned sample_rate, unsigned sample_size, unsigned channels, bool sign)
 {
@@ -95 +95 @@
         sb_dsp_t *dsp = fun->driver_data;
         return sb_dsp_start_record(
-            dsp, id, sample_rate, sample_size, channels, sign);
+            dsp, id, parts, sample_rate, sample_size, channels, sign);
 }
 

uspace/lib/drv/generic/remote_audio_pcm_buffer.c

@@ -140 +140 @@
 
 int audio_pcm_buffer_start_record(async_exch_t *exch, unsigned id,
-    unsigned sample_rate, unsigned sample_size, unsigned channels, bool sign)
-{
-        if (!exch || sample_size > UINT16_MAX || channels > (UINT16_MAX >> 1))
-                return EINVAL;
-        sysarg_t packed = sample_size << 16 | channels << 1 | sign ? 1 : 0;
+    unsigned parts, unsigned sample_rate, uint16_t sample_size,
+    uint8_t channels, bool sign)
+{
+        if (!exch)
+                return EINVAL;
+        sysarg_t packed =
+            (sample_size << 16) | (channels << 8) |
+            ((parts & 0x7f) << 1) | (sign ? 1 : 0);
         return async_req_4_0(exch, DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE),
             IPC_M_AUDIO_PCM_START_RECORD, id, sample_rate, packed);
@@ -336 +339 @@
         const unsigned rate = DEV_IPC_GET_ARG2(*call);
         const unsigned size = DEV_IPC_GET_ARG3(*call) >> 16;
-        const unsigned channels = (DEV_IPC_GET_ARG3(*call) & UINT16_MAX) >> 1;
+        const unsigned channels = (DEV_IPC_GET_ARG3(*call) >> 8) & UINT8_MAX;
+        const unsigned parts = (DEV_IPC_GET_ARG3(*call) >> 1) & 0x7f;
         const bool sign = (bool)(DEV_IPC_GET_ARG3(*call) & 1);
 
         const int ret = pcm_iface->start_record
-            ? pcm_iface->start_record(fun, id, rate, size, channels, sign)
+            ? pcm_iface->start_record(fun, id, parts, rate, size, channels, sign)
             : ENOTSUP;
         async_answer_0(callid, ret);

uspace/lib/drv/include/audio_pcm_buffer_iface.h

@@ -51 +51 @@
 int audio_pcm_buffer_stop_playback(async_exch_t *, unsigned);
 
-int audio_pcm_buffer_start_record(async_exch_t *, unsigned,
-    unsigned, unsigned, unsigned, bool);
+int audio_pcm_buffer_start_record(async_exch_t *, unsigned, unsigned,
+    unsigned, uint16_t, uint8_t, bool);
 int audio_pcm_buffer_stop_record(async_exch_t *, unsigned);
 
@@ -64 +64 @@
             unsigned, unsigned, unsigned, bool);
         int (*stop_playback)(ddf_fun_t *, unsigned);
-        int (*start_record)(ddf_fun_t *, unsigned,
+        int (*start_record)(ddf_fun_t *, unsigned, unsigned,
             unsigned, unsigned, unsigned, bool);
         int (*stop_record)(ddf_fun_t *, unsigned);