Changeset b7c080c in mainline

Timestamp:

2012-07-15T18:55:48Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a9aae16e

Parents:

63c34d7

Message:

sb16: Implement test_format call.

Location:

uspace/drv/audio/sb16

Files:

• dsp.c (modified) (4 diffs)
• dsp.h (modified) (1 diff)
• pcm_iface.c (modified) (2 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -53 +53 @@
 
 #define DSP_RESET_RESPONSE 0xaa
+#define DSP_RATE_LIMIT 45000
 
 #define AUTO_DMA_MODE
@@ -223 +224 @@
 }
 
+int sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate,
+  pcm_sample_format_t *format)
+{
+        int ret = EOK;
+        if (*channels == 0 || *channels > 2) {
+                *channels = 2;
+                ret = ELIMIT;
+        }
+        if (*rate > DSP_RATE_LIMIT) {
+                *rate = DSP_RATE_LIMIT;
+                ret = ELIMIT;
+        }
+        //TODO 8bit DMA supports 8bit formats
+        if (*format != PCM_SAMPLE_SINT16_LE && *format != PCM_SAMPLE_UINT16_LE) {
+                *format = pcm_sample_format_is_signed(*format) ?
+                    PCM_SAMPLE_SINT16_LE : PCM_SAMPLE_UINT16_LE;
+                ret = ELIMIT;
+        }
+        return ret;
+}
+
 int sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size)
 {
@@ -283 +305 @@
         if (channels != 1 && channels != 2)
                 return ENOTSUP;
-        if (sampling_rate > 44100)
+        if (sampling_rate > DSP_RATE_LIMIT)
                 return ENOTSUP;
         // FIXME We only support 16 bit playback
@@ -351 +373 @@
         if (channels != 1 && channels != 2)
                 return ENOTSUP;
-        if (sampling_rate > 44100)
+        if (sampling_rate > DSP_RATE_LIMIT)
                 return ENOTSUP;
         // FIXME We only support 16 bit recording

uspace/drv/audio/sb16/dsp.h

@@ -73 +73 @@
 void sb_dsp_interrupt(sb_dsp_t *dsp);
 
+int sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate,
+  pcm_sample_format_t *format);
 int sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size);
 int sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session);

uspace/drv/audio/sb16/pcm_iface.c

@@ -46 +46 @@
         return EOK;
 }
-
+static int sb_test_format(ddf_fun_t *fun, unsigned *channels, unsigned *rate,
+    pcm_sample_format_t *format)
+{
+        assert(fun);
+        assert(fun->driver_data);
+        sb_dsp_t *dsp = fun->driver_data;
+        return sb_dsp_test_format(dsp, channels, rate, format);
+}
 static int sb_get_buffer(ddf_fun_t *fun, void **buffer, size_t *size)
 {
@@ -108 +115 @@
 audio_pcm_iface_t sb_pcm_iface = {
         .get_info_str = sb_get_info_str,
+        .test_format = sb_test_format,
 
         .get_buffer = sb_get_buffer,