Changeset 2b3dd78 in mainline for uspace/lib/drv

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

Files:

• generic/logbuf.c (modified) (1 diff)
• generic/private/driver.h (modified) (2 diffs)
• generic/remote_ahci.c (modified) (1 diff)
• generic/remote_audio_mixer.c (modified) (2 diffs)
• generic/remote_audio_pcm.c (modified) (1 diff)
• include/ahci_iface.h (modified) (1 diff)
• include/audio_mixer_iface.h (modified) (1 diff)
• include/audio_pcm_iface.h (modified) (2 diffs)
• include/ddf/log.h (modified) (1 diff)
• include/ops/nic.h (modified) (1 diff)
• include/ops/pio_window.h (modified) (1 diff)
• include/usbhid_iface.h (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)

uspace/lib/drv/include/ahci_iface.h

@@ -41 +41 @@
 #include <async.h>
 
-extern async_sess_t* ahci_get_sess(devman_handle_t, char **);
+extern async_sess_t *ahci_get_sess(devman_handle_t, char **);
 
 extern errno_t ahci_get_sata_device_name(async_sess_t *, size_t, char *);

uspace/lib/drv/include/audio_mixer_iface.h

@@ -43 +43 @@
 #include "ddf/driver.h"
 
-errno_t audio_mixer_get_info(async_exch_t *, const char **, unsigned *);
+errno_t audio_mixer_get_info(async_exch_t *, char **, unsigned *);
 errno_t audio_mixer_get_item_info(async_exch_t *, unsigned,
-    const char **, unsigned *);
+    char **, unsigned *);
 errno_t audio_mixer_get_item_level(async_exch_t *, unsigned, unsigned *);
 errno_t audio_mixer_set_item_level(async_exch_t *, unsigned, unsigned);

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);

uspace/lib/drv/include/ddf/log.h

@@ -39 +39 @@
 extern errno_t ddf_log_init(const char *);
 extern void ddf_msg(log_level_t, const char *, ...)
-    PRINTF_ATTRIBUTE(2, 3);
+    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 
 extern void ddf_dump_buffer(char *, size_t, const void *, size_t, size_t,

uspace/lib/drv/include/ops/nic.h

@@ -66 +66 @@
         errno_t (*autoneg_restart)(ddf_fun_t *);
         errno_t (*get_pause)(ddf_fun_t *, nic_result_t *, nic_result_t *,
-                uint16_t *);
+            uint16_t *);
         errno_t (*set_pause)(ddf_fun_t *, int, int, uint16_t);
         

uspace/lib/drv/include/ops/pio_window.h

@@ -40 +40 @@
 
 typedef struct {
-        pio_window_t *(* get_pio_window)(ddf_fun_t *);
+        pio_window_t *(*get_pio_window)(ddf_fun_t *);
 } pio_window_ops_t;
 

uspace/lib/drv/include/usbhid_iface.h

@@ -81 +81 @@
          * @return Error code.
          */
-        errno_t (*get_report_descriptor)(ddf_fun_t *fun, uint8_t *desc, 
+        errno_t (*get_report_descriptor)(ddf_fun_t *fun, uint8_t *desc,
             size_t size, size_t *act_size);
 } usbhid_iface_t;