Changeset 5a6cc679 in mainline for uspace/drv/audio/hdaudio/pcm_iface.c

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/drv/audio/hdaudio/pcm_iface.c (modified) (11 diffs)

uspace/drv/audio/hdaudio/pcm_iface.c

@@ -47 +47 @@
 #include "stream.h"
 
-static int hda_get_info_str(ddf_fun_t *, const char **);
+static errno_t hda_get_info_str(ddf_fun_t *, const char **);
 static unsigned hda_query_cap(ddf_fun_t *, audio_cap_t);
-static int hda_test_format(ddf_fun_t *, unsigned *, unsigned *,
+static errno_t hda_test_format(ddf_fun_t *, unsigned *, unsigned *,
     pcm_sample_format_t *);
-static int hda_get_buffer(ddf_fun_t *, void **, size_t *);
-static int hda_get_buffer_position(ddf_fun_t *, size_t *);
-static int hda_set_event_session(ddf_fun_t *, async_sess_t *);
+static errno_t hda_get_buffer(ddf_fun_t *, void **, size_t *);
+static errno_t hda_get_buffer_position(ddf_fun_t *, size_t *);
+static errno_t hda_set_event_session(ddf_fun_t *, async_sess_t *);
 static async_sess_t *hda_get_event_session(ddf_fun_t *);
-static int hda_release_buffer(ddf_fun_t *);
-static int hda_start_playback(ddf_fun_t *, unsigned, unsigned, unsigned,
+static errno_t hda_release_buffer(ddf_fun_t *);
+static errno_t hda_start_playback(ddf_fun_t *, unsigned, unsigned, unsigned,
     pcm_sample_format_t);
-static int hda_stop_playback(ddf_fun_t *, bool);
-static int hda_start_capture(ddf_fun_t *, unsigned, unsigned, unsigned,
+static errno_t hda_stop_playback(ddf_fun_t *, bool);
+static errno_t hda_start_capture(ddf_fun_t *, unsigned, unsigned, unsigned,
     pcm_sample_format_t);
-static int hda_stop_capture(ddf_fun_t *, bool);
+static errno_t hda_stop_capture(ddf_fun_t *, bool);
 
 audio_pcm_iface_t hda_pcm_iface = {
@@ -90 +90 @@
 }
 
-static int hda_get_info_str(ddf_fun_t *fun, const char **name)
+static errno_t hda_get_info_str(ddf_fun_t *fun, const char **name)
 {
         ddf_msg(LVL_NOTE, "hda_get_info_str()");
@@ -124 +124 @@
 }
 
-static int hda_test_format(ddf_fun_t *fun, unsigned *channels,
+static errno_t hda_test_format(ddf_fun_t *fun, unsigned *channels,
     unsigned *rate, pcm_sample_format_t *format)
 {
-        int rc = EOK;
+        errno_t rc = EOK;
 
         ddf_msg(LVL_NOTE, "hda_test_format(%u, %u, %d)\n",
@@ -150 +150 @@
 }
 
-static int hda_get_buffer(ddf_fun_t *fun, void **buffer, size_t *size)
-{
-        hda_t *hda = fun_to_hda(fun);
-        int rc;
+static errno_t hda_get_buffer(ddf_fun_t *fun, void **buffer, size_t *size)
+{
+        hda_t *hda = fun_to_hda(fun);
+        errno_t rc;
 
         hda_lock(hda);
@@ -183 +183 @@
 }
 
-static int hda_get_buffer_position(ddf_fun_t *fun, size_t *pos)
+static errno_t hda_get_buffer_position(ddf_fun_t *fun, size_t *pos)
 {
         ddf_msg(LVL_NOTE, "hda_get_buffer_position()");
@@ -189 +189 @@
 }
 
-static int hda_set_event_session(ddf_fun_t *fun, async_sess_t *sess)
+static errno_t hda_set_event_session(ddf_fun_t *fun, async_sess_t *sess)
 {
         hda_t *hda = fun_to_hda(fun);
@@ -215 +215 @@
 }
 
-static int hda_release_buffer(ddf_fun_t *fun)
+static errno_t hda_release_buffer(ddf_fun_t *fun)
 {
         hda_t *hda = fun_to_hda(fun);
@@ -234 +234 @@
 }
 
-static int hda_start_playback(ddf_fun_t *fun, unsigned frames,
+static errno_t hda_start_playback(ddf_fun_t *fun, unsigned frames,
     unsigned channels, unsigned rate, pcm_sample_format_t format)
 {
         hda_t *hda = fun_to_hda(fun);
-        int rc;
+        errno_t rc;
 
         ddf_msg(LVL_NOTE, "hda_start_playback()");
@@ -275 +275 @@
 }
 
-static int hda_stop_playback(ddf_fun_t *fun, bool immediate)
+static errno_t hda_stop_playback(ddf_fun_t *fun, bool immediate)
 {
         hda_t *hda = fun_to_hda(fun);
@@ -293 +293 @@
 }
 
-static int hda_start_capture(ddf_fun_t *fun, unsigned frames, unsigned channels,
+static errno_t hda_start_capture(ddf_fun_t *fun, unsigned frames, unsigned channels,
     unsigned rate, pcm_sample_format_t format)
 {
         hda_t *hda = fun_to_hda(fun);
-        int rc;
+        errno_t rc;
 
         ddf_msg(LVL_NOTE, "hda_start_capture()");
@@ -334 +334 @@
 }
 
-static int hda_stop_capture(ddf_fun_t *fun, bool immediate)
+static errno_t hda_stop_capture(ddf_fun_t *fun, bool immediate)
 {
         hda_t *hda = fun_to_hda(fun);