Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/drv/include/audio_mixer_iface.h

    ra0a9cc2 r2b3dd78  
    4343#include "ddf/driver.h"
    4444
    45 errno_t audio_mixer_get_info(async_exch_t *, const char **, unsigned *);
     45errno_t audio_mixer_get_info(async_exch_t *, char **, unsigned *);
    4646errno_t audio_mixer_get_item_info(async_exch_t *, unsigned,
    47     const char **, unsigned *);
     47    char **, unsigned *);
    4848errno_t audio_mixer_get_item_level(async_exch_t *, unsigned, unsigned *);
    4949errno_t audio_mixer_set_item_level(async_exch_t *, unsigned, unsigned);
Note: See TracChangeset for help on using the changeset viewer.