From 4a3ca2bebe090b7db7c0f663d502f9319a26a1f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A1rton=20N=C3=A9meth?= Date: Tue, 14 Jun 2011 08:28:26 +0200 Subject: [PATCH] usbip: dump the port status difference MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit At the beginning of vhci_hub_control() function the port status is saved to show what are the differences between the previous and the new status. Change the dump function to really show the differences in the status bit changes: put a '+' sign before the symbolic name of a bit where a bit was set, a '-' sign where the bit was cleared and a SPACE where the bit was not changed. This is similar to the way "diff -u" shows the changes and easy to understand. Signed-off-by: Márton Németh Cc: Joe Perches Signed-off-by: Greg Kroah-Hartman --- drivers/staging/usbip/vhci_hcd.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c index 658c674b878..d3f11a34d51 100644 --- a/drivers/staging/usbip/vhci_hcd.c +++ b/drivers/staging/usbip/vhci_hcd.c @@ -92,14 +92,28 @@ static const char * const bit_desc[] = { "R31", /*31*/ }; -static void dump_port_status(u32 status) +static void dump_port_status_diff(u32 prev_status, u32 new_status) { int i = 0; - - pr_debug("status %08x:", status); - for (i = 0; i < 32; i++) { - if (status & (1 << i)) - pr_debug(" %s", bit_desc[i]); + u32 bit = 1; + + pr_debug("status prev -> new: %08x -> %08x\n", prev_status, new_status); + while (bit) { + u32 prev = prev_status & bit; + u32 new = new_status & bit; + char change; + + if (!prev && new) + change = '+'; + else if (prev && !new) + change = '-'; + else + change = ' '; + + if (prev || new) + pr_debug(" %c%s\n", change, bit_desc[i]); + bit <<= 1; + i++; } pr_debug("\n"); } @@ -466,8 +480,8 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, pr_debug("port %d\n", rhport); /* Only dump valid port status */ if (rhport >= 0) { - dump_port_status(prev_port_status[rhport]); - dump_port_status(dum->port_status[rhport]); + dump_port_status_diff(prev_port_status[rhport], + dum->port_status[rhport]); } } usbip_dbg_vhci_rh(" bye\n"); -- 2.11.4.GIT