Changeset fedac2f in mainline for uspace/lib/drv

Timestamp:

2012-09-16T11:27:35Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

289fa65

Parents:

8930624 (diff), 00b4a68 (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 mainline changes

Location:

uspace/lib/drv

Files:

• generic/log.c (modified) (2 diffs)
• include/ddf/log.h (modified) (1 diff)

uspace/lib/drv/generic/log.c

@@ -38 +38 @@
  *
  * @param drv_name Driver name, will be printed as part of message
- * @param level    Minimum message level to print
  *
  */
-int ddf_log_init(const char *drv_name, log_level_t level)
+int ddf_log_init(const char *drv_name)
 {
-        return log_init(drv_name, level);
+        return log_init(drv_name);
 }
 
@@ -59 +58 @@
         
         va_start(args, fmt);
-        log_msgv(level, fmt, args);
+        log_msgv(LOG_DEFAULT, level, fmt, args);
         va_end(args);
 }

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

@@ -37 +37 @@
 #include <io/verify.h>
 
-extern int ddf_log_init(const char *, log_level_t);
+extern int ddf_log_init(const char *);
 extern void ddf_msg(log_level_t, const char *, ...)
     PRINTF_ATTRIBUTE(2, 3);