Changeset 2b3dd78 in mainline for uspace/lib/drv/generic

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

Location:

uspace/lib/drv/generic

Files:

• logbuf.c (modified) (1 diff)
• private/driver.h (modified) (2 diffs)
• remote_ahci.c (modified) (1 diff)
• remote_audio_mixer.c (modified) (2 diffs)
• remote_audio_pcm.c (modified) (1 diff)

uspace/lib/drv/generic/logbuf.c

@@ -35 +35 @@
 #include <ddf/log.h>
 #include <assert.h>
+#include <str.h>
 
 /** Formatting string for printing number of not-printed items. */

uspace/lib/drv/generic/private/driver.h

@@ -57 +57 @@
         
         /** Device name */
-        const char *name;
+        char *name;
         
         /** Driver-specific data associated with this device */
@@ -84 +84 @@
         
         /** Function name */
-        const char *name;
+        char *name;
         
         /** List of device ids for driver matching */

uspace/lib/drv/generic/remote_ahci.c

@@ -39 +39 @@
 #include <stdio.h>
 #include <macros.h>
+#include <str.h>
 #include "ahci_iface.h"
 #include "ddf/driver.h"

uspace/lib/drv/generic/remote_audio_mixer.c

@@ -94 +94 @@
  * @return Error code.
  */
-errno_t audio_mixer_get_info(async_exch_t *exch, const char **name, unsigned *items)
+errno_t audio_mixer_get_info(async_exch_t *exch, char **name, unsigned *items)
 {
         if (!exch)
@@ -131 +131 @@
  */
 errno_t audio_mixer_get_item_info(async_exch_t *exch, unsigned item,
-    const char **name, unsigned *levels)
+    char **name, unsigned *levels)
 {
         if (!exch)

uspace/lib/drv/generic/remote_audio_pcm.c

@@ -184 +184 @@
  * @note Caller is responsible for freeing newly allocated memory.
  */
-errno_t audio_pcm_get_info_str(audio_pcm_sess_t *sess, const char **name)
+errno_t audio_pcm_get_info_str(audio_pcm_sess_t *sess, char **name)
 {
         if (!name)