Changeset 018ab50 in mainline for uspace/drv/audio/sb16

Timestamp:

2012-08-20T11:28:46Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fb6c98f

Parents:

20840922

Message:

audio: Move event callback into separate API calls.

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

@@ -55 +55 @@
 
 #define DSP_RESET_RESPONSE 0xaa
-#define DSP_RATE_LIMIT 45000
+
+/* These are only for SB16 (DSP4.00+) */
+#define DSP_RATE_UPPER_LIMIT 44100
+#define DSP_RATE_LOWER_LIMIT 5000
 
 #define AUTO_DMA_MODE
@@ -294 +297 @@
                 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) {
@@ -304 +303 @@
                 ret = ELIMIT;
         }
+        if (*rate > DSP_RATE_UPPER_LIMIT) {
+                *rate = DSP_RATE_UPPER_LIMIT;
+                ret = ELIMIT;
+        }
+        if (*rate < DSP_RATE_LOWER_LIMIT) {
+                *rate = DSP_RATE_LOWER_LIMIT;
+                ret = ELIMIT;
+        }
         return ret;
 }
@@ -333 +340 @@
 {
         assert(dsp);
-        assert(session);
         if (dsp->event_session)
                 return EBUSY;
         dsp->event_session = session;
-        ddf_log_debug("Set event session.");
-        return EOK;
+        ddf_log_debug("Set event session to %p.", session);
+        return EOK;
+}
+
+async_sess_t * sb_dsp_get_event_session(sb_dsp_t *dsp)
+{
+        assert(dsp);
+        ddf_log_debug("Get event session: %p.", dsp->event_session);
+        return dsp->event_session;
 }
 

uspace/drv/audio/sb16/dsp.h

@@ -80 +80 @@
 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);
+async_sess_t * sb_dsp_get_event_session(sb_dsp_t *dsp);
 int sb_dsp_release_buffer(sb_dsp_t *dsp);
 int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames,

uspace/drv/audio/sb16/pcm_iface.c

@@ -87 +87 @@
 }
 
+static async_sess_t * sb_get_event_session(ddf_fun_t *fun)
+{
+        assert(fun);
+        assert(fun->driver_data);
+        sb_dsp_t *dsp = fun->driver_data;
+        return sb_dsp_get_event_session(dsp);
+}
+
 static int sb_release_buffer(ddf_fun_t *fun)
 {
@@ -139 +147 @@
         .release_buffer = sb_release_buffer,
         .set_event_session = sb_set_event_session,
+        .get_event_session = sb_get_event_session,
         .get_buffer_pos = sb_get_buffer_position,