Changeset 818dc00 in mainline for uspace/drv/vhc

Timestamp:

2010-12-09T00:02:25Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

040068c

Parents:

aca85e4 (diff), 07b9203e (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 with vojtechhorky/

Location:

uspace/drv/vhc

Files:

• connhost.c (modified) (1 diff)
• debug.c (modified) (1 diff)
• hcd.c (modified) (1 diff)
• vhcd.h (modified) (2 diffs)

uspace/drv/vhc/connhost.c

@@ -58 +58 @@
                 case USB_DIRECTION_IN:
                         transfer->in_callback(transfer->dev,
-                            size, outcome,
+                            outcome, size,
                             transfer->arg);
                         break;

uspace/drv/vhc/debug.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <ipc/ipc.h>
+#include <usb/debug.h>
 
 #include "vhcd.h"
 
-/** Current debug level. */
-int debug_level = 0;
-
-/** Debugging printf.
- * This function is intended for single-line messages as it
- * automatically prints debugging prefix at the beginning of the
- * line.
- *
- * @see printf
- * @param level Debugging level.
- */
-void dprintf(int level, const char *format, ...)
-{
-        if (level > debug_level) {
-                return;
-        }
-        
-        printf("%s(%d): ", NAME, level);
-        va_list args;
-        va_start(args, format);
-        vprintf(format, args);
-        va_end(args);
-        printf("\n");
-}
 
 /** Debug print informing of invalid call.

uspace/drv/vhc/hcd.c

@@ -111 +111 @@
         printf("%s: virtual USB host controller driver.\n", NAME);
 
-        debug_level = 10;
+        usb_dprintf_enable(NAME, 10);
 
         fid_t fid = fibril_create(hc_manager_fibril, NULL);

uspace/drv/vhc/vhcd.h

@@ -36 +36 @@
 #define VHCD_VHCD_H_
 
+#include <usb/debug.h>
+
 #define NAME "vhc"
 #define NAME_DEV "hcd-virt-dev"
@@ -43 +45 @@
 #define DEVMAP_PATH_DEV NAMESPACE "/" NAME_DEV
 
-extern int debug_level;
-void dprintf(int, const char *, ...);
+#define dprintf(level, format, ...) \
+        usb_dprintf(NAME, (level), format "\n", ##__VA_ARGS__)
 void dprintf_inval_call(int, ipc_call_t, ipcarg_t);