Changeset efdfebc in mainline for uspace/lib/usb/include/usb/debug.h

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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.

File:

• uspace/lib/usb/include/usb/debug.h (modified) (2 diffs)

uspace/lib/usb/include/usb/debug.h

@@ -38 +38 @@
 #include <inttypes.h>
 #include <usb/usb.h>
+#include <io/log.h>
 #include <assert.h>
 
@@ -43 +44 @@
     const uint8_t *, size_t);
 
-/** Logging level. */
-typedef enum {
-        /** Fatal, unrecoverable, error.
-         * Such error prevents the driver from working at all.
-         */
-        USB_LOG_LEVEL_FATAL,
+#define USB_LOG_LEVEL_FATAL LVL_FATAL
+#define USB_LOG_LEVEL_ERROR LVL_ERROR
+#define USB_LOG_LEVEL_WARNING LVL_WARN
+#define USB_LOG_LEVEL_INFO LVL_NOTE
+#define USB_LOG_LEVEL_DEBUG LVL_DEBUG
+#define USB_LOG_LEVEL_DEBUG2 LVL_DEBUG2
 
-        /** Serious but recoverable error
-         * Shall be used for errors fatal for single device but not for
-         * driver itself.
-         */
-        USB_LOG_LEVEL_ERROR,
-
-        /** Warning.
-         * Problems from which the driver is able to recover gracefully.
-         */
-        USB_LOG_LEVEL_WARNING,
-
-        /** Information message.
-         * This should be the last level that is printed by default to
-         * the screen.
-         * Typical usage is to inform that new device was found and what
-         * are its capabilities.
-         * Do not use for repetitive actions (such as device polling).
-         */
-        USB_LOG_LEVEL_INFO,
-
-        /** Debugging message. */
-        USB_LOG_LEVEL_DEBUG,
-
-        /** More detailed debugging message. */
-        USB_LOG_LEVEL_DEBUG2,
-
-        /** Terminating constant for logging levels. */
-        USB_LOG_LEVEL_MAX
-} usb_log_level_t;
-
-/** Default log level. */
-#ifdef CONFIG_USB_VERBOSE
-        #define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_DEBUG
-#else
-        #define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_INFO
-#endif
-
-void usb_log_enable(usb_log_level_t, const char *);
-
-void usb_log_printf(usb_log_level_t, const char *, ...)
-        PRINTF_ATTRIBUTE(2, 3);
+#define usb_log_printf(level, format, ...) \
+        log_msg(LOG_DEFAULT, level, format, ##__VA_ARGS__)
 
 /** Log fatal error. */