Changeset bc8bc6e in mainline for uspace/drv/bus/usb/uhci/uhci_rh.c

Timestamp:

2015-07-05T03:35:14Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

51cc6cef

Parents:

9e9d018e

Message:

uhci/rh: Fix debug printing macro format

Only print debug output on port status change.

File:

• uspace/drv/bus/usb/uhci/uhci_rh.c (modified) (2 diffs)

uspace/drv/bus/usb/uhci/uhci_rh.c

@@ -169 +169 @@
 
 #define RH_DEBUG(hub, port, msg, ...) \
+do { \
         if ((int)port >= 0) \
                 usb_log_debug("RH(%p-%d): " msg, hub, port, ##__VA_ARGS__); \
         else \
-                usb_log_debug("RH(%p):" msg, hub, ##__VA_ARGS__) \
+                usb_log_debug("RH(%p):" msg, hub, ##__VA_ARGS__); \
+} while (0)
 
 /** USB HUB port state request handler.
@@ -411 +413 @@
             ((((status_b & STATUS_CHANGE_BITS) != 0) || hub->reset_changed[1]) ?
                 0x4 : 0);
-
-        RH_DEBUG(hub, -1, "Event mask %" PRIx8
-            " (status_a %" PRIx16 "%s),"
-            " (status_b %" PRIx16 "%s)\n", status,
-            status_a, hub->reset_changed[0] ? "-reset" : "",
-            status_b, hub->reset_changed[1] ? "-reset" : "" );
+        if (status)
+                RH_DEBUG(hub, -1, "Event mask %" PRIx8
+                    " (status_a %" PRIx16 "%s),"
+                    " (status_b %" PRIx16 "%s)\n", status,
+                    status_a, hub->reset_changed[0] ? "-reset" : "",
+                    status_b, hub->reset_changed[1] ? "-reset" : "" );
         ((uint8_t *)buffer)[0] = status;
         *actual_size = 1;