Changeset 947d788 in mainline

Timestamp:

2010-12-08T14:30:49Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9501cced

Parents:

bb95594

Message:

Virtual HC uses unified usb_dprintf function

Location:

uspace/drv

Files:

• uhci/main.c (modified) (4 diffs)
• vhc/debug.c (modified) (1 diff)
• vhc/hcd.c (modified) (1 diff)
• vhc/vhcd.h (modified) (2 diffs)

uspace/drv/uhci/main.c

@@ -27 +27 @@
  */
 #include <usb/hcdhubd.h>
+#include <usb/debug.h>
 #include <errno.h>
 #include "uhci.h"
@@ -36 +37 @@
 static int uhci_add_device(device_t *device)
 {
+        usb_dprintf(NAME, 1, "uhci_add_device() called\n");
         device->ops = &uhci_ops;
 
@@ -41 +43 @@
          * We need to announce the presence of our root hub.
          */
+        usb_dprintf(NAME, 2, "adding root hub\n");
         usb_hcd_add_root_hub(device);
 
@@ -61 +64 @@
          */
         sleep(5);
+        usb_dprintf_enable(NAME, 5);
 
         return driver_main(&uhci_driver);

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