Changeset 2b3dd78 in mainline for uspace/lib/drv/include/audio_pcm_iface.h

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/drv/include/audio_pcm_iface.h (modified) (2 diffs)

uspace/lib/drv/include/audio_pcm_iface.h

@@ -80 +80 @@
 void audio_pcm_close(audio_pcm_sess_t *);
 
-errno_t audio_pcm_get_info_str(audio_pcm_sess_t *, const char **);
+errno_t audio_pcm_get_info_str(audio_pcm_sess_t *, char **);
 errno_t audio_pcm_test_format(audio_pcm_sess_t *, unsigned *, unsigned *,
     pcm_sample_format_t *);
@@ -120 +120 @@
         errno_t (*release_buffer)(ddf_fun_t *);
         errno_t (*set_event_session)(ddf_fun_t *, async_sess_t *);
-        async_sess_t * (*get_event_session)(ddf_fun_t *);
+        async_sess_t *(*get_event_session)(ddf_fun_t *);
         errno_t (*start_playback)(ddf_fun_t *, unsigned,
             unsigned, unsigned, pcm_sample_format_t);