Changeset aae11d0 in mainline

Timestamp:

2012-08-20T14:25:15Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c04ff9f

Parents:

6f57933

Message:

b16: Use helper function for fun→driver_data conversion.

File:

• uspace/drv/audio/sb16/pcm_iface.c (modified) (5 diffs)

uspace/drv/audio/sb16/pcm_iface.c

@@ -40 +40 @@
 #include "dsp.h"
 
+static inline sb_dsp_t * fun_to_dsp(ddf_fun_t *fun)
+{
+        assert(fun);
+        assert(fun->driver_data);
+        return fun->driver_data;
+}
+
 static int sb_get_info_str(ddf_fun_t *fun, const char** name)
 {
@@ -49 +56 @@
 static unsigned sb_query_cap(ddf_fun_t *fun, audio_cap_t cap)
 {
-        assert(fun);
-        assert(fun->driver_data);
-        sb_dsp_t *dsp = fun->driver_data;
-        return sb_dsp_query_cap(dsp, cap);
+        return sb_dsp_query_cap(fun_to_dsp(fun), cap);
 }
 
@@ -58 +62 @@
     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);
+        return sb_dsp_test_format(fun_to_dsp(fun), channels, rate, format);
 }
 static int sb_get_buffer(ddf_fun_t *fun, void **buffer, size_t *size)
 {
-        assert(fun);
-        assert(fun->driver_data);
-        sb_dsp_t *dsp = fun->driver_data;
-        return sb_dsp_get_buffer(dsp, buffer, size);
+        return sb_dsp_get_buffer(fun_to_dsp(fun), buffer, size);
 }
 
 static int sb_get_buffer_position(ddf_fun_t *fun, size_t *size)
 {
-        assert(fun);
-        assert(fun->driver_data);
-        sb_dsp_t *dsp = fun->driver_data;
-        return sb_dsp_get_buffer_position(dsp, size);
+        return sb_dsp_get_buffer_position(fun_to_dsp(fun), size);
 }
 
 static int sb_set_event_session(ddf_fun_t *fun, async_sess_t *sess)
 {
-        assert(fun);
-        assert(fun->driver_data);
-        sb_dsp_t *dsp = fun->driver_data;
-        return sb_dsp_set_event_session(dsp, sess);
+        return sb_dsp_set_event_session(fun_to_dsp(fun), sess);
 }
 
 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);
+        return sb_dsp_get_event_session(fun_to_dsp(fun));
 }
 
 static int sb_release_buffer(ddf_fun_t *fun)
 {
-        assert(fun);
-        assert(fun->driver_data);
-        sb_dsp_t *dsp = fun->driver_data;
-        return sb_dsp_release_buffer(dsp);
+        return sb_dsp_release_buffer(fun_to_dsp(fun));
 }
 
@@ -106 +92 @@
     unsigned channels, unsigned sample_rate, pcm_sample_format_t format)
 {
-        assert(fun);
-        assert(fun->driver_data);
-        sb_dsp_t *dsp = fun->driver_data;
         return sb_dsp_start_playback(
-            dsp, frames, channels, sample_rate, format);
+            fun_to_dsp(fun), frames, channels, sample_rate, format);
 }
 
 static int sb_stop_playback(ddf_fun_t *fun)
 {
-        assert(fun);
-        assert(fun->driver_data);
-        sb_dsp_t *dsp = fun->driver_data;
-        return sb_dsp_stop_playback(dsp);
+        return sb_dsp_stop_playback(fun_to_dsp(fun));
 }
 
@@ -124 +104 @@
     unsigned channels, unsigned sample_rate, pcm_sample_format_t format)
 {
-        assert(fun);
-        assert(fun->driver_data);
-        sb_dsp_t *dsp = fun->driver_data;
         return sb_dsp_start_capture(
-            dsp, frames, channels, sample_rate, format);
+            fun_to_dsp(fun), frames, channels, sample_rate, format);
 }
 
 static int sb_stop_capture(ddf_fun_t *fun)
 {
-        assert(fun);
-        assert(fun->driver_data);
-        sb_dsp_t *dsp = fun->driver_data;
-        return sb_dsp_stop_capture(dsp);
+        return sb_dsp_stop_capture(fun_to_dsp(fun));
 }