Changeset f3e2663 in mainline for uspace/lib/drv

Timestamp:

2011-04-03T11:17:45Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

106743d

Parents:

10eb754 (diff), b2a081ae (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:

• Makefile (modified) (1 diff)
• generic/driver.c (modified) (2 diffs)
• generic/log.c (moved) (moved from kernel/arch/arm32/include/memstr.h ) (2 diffs)
• include/ddf/log.h (moved) (moved from kernel/arch/ia32/include/memstr.h ) (2 diffs)

uspace/lib/drv/Makefile

@@ -35 +35 @@
         generic/driver.c \
         generic/dev_iface.c \
+        generic/log.c \
         generic/remote_hw_res.c \
         generic/remote_char_dev.c

uspace/lib/drv/generic/driver.c

@@ -273 +273 @@
         
         res = driver->driver_ops->add_device(dev);
-        if (res == EOK) {
-                printf("%s: new device with handle=%" PRIun " was added.\n",
-                    driver->name, dev_handle);
-        } else {
-                printf("%s: failed to add a new device with handle = %" PRIun ".\n",
-                    driver->name, dev_handle);
+        if (res != EOK)
                 delete_device(dev);
-        }
         
         async_answer_0(iid, res);
@@ -408 +402 @@
                             get_remote_method(rem_iface, iface_method_idx);
                         if (iface_method_ptr == NULL) {
-                                // the interface has not such method
+                                /* The interface has not such method */
                                 printf("%s: driver_connection_gen error - "
                                     "invalid interface method.", driver->name);

uspace/lib/drv/generic/log.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Sergey Bondari
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup libdrv
  * @{
  */
-/** @file
- *  @brief Memory manipulating functions declarations.
+
+#include <io/log.h>
+#include <stdarg.h>
+
+#include <ddf/log.h>
+
+/** Initialize the logging system.
+ *
+ * @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)
+{
+        return log_init(drv_name, level);
+}
 
-#ifndef KERN_arm32_MEMSTR_H_
-#define KERN_arm32_MEMSTR_H_
+/** Log a driver message.
+ *
+ * @param level         Message verbosity level. Message is only printed
+ *                      if verbosity is less than or equal to current
+ *                      reporting level.
+ * @param fmt           Format string (no trailing newline)
+ */
+void ddf_msg(log_level_t level, const char *fmt, ...)
+{
+        va_list args;
 
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
-
-extern void memsetw(void *, size_t, uint16_t);
-extern void memsetb(void *, size_t, uint8_t);
-
-#endif
+        va_start(args, fmt);
+        log_msgv(level, fmt, args);
+        va_end(args);
+}
 
 /** @}

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Sergey Bondari
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup libdrv
  * @{
  */
-/** @file
- */
 
-#ifndef KERN_ia32_MEMSTR_H_
-#define KERN_ia32_MEMSTR_H_
+#ifndef DDF_LOG_H_
+#define DDF_LOG_H_
 
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
+#include <io/log.h>
 
-extern void memsetw(void *, size_t, uint16_t);
-extern void memsetb(void *, size_t, uint8_t);
+extern int ddf_log_init(const char *, log_level_t);
+extern void ddf_msg(log_level_t, const char *, ...);
 
 #endif