lkml.org 
[lkml]   [2011]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 2/3] usbip: dump the port status difference
From: Márton Németh <nm127@freemail.hu>

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 <nm127@freemail.hu>
---
drivers/staging/usbip/vhci_hcd.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
index 512a97f..d3ce569 100644
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
@@ -92,14 +92,22 @@ 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);
+ pr_debug("status %08x -> %08x:", prev_status, new_status);
for (i = 0; i < 32; i++) {
- if (status & (1 << i))
- pr_debug(" %s", bit_desc[i]);
+ if (!(prev_status & (1 << i)) &&
+ new_status & (1 << i)) {
+ pr_debug(" +%s", bit_desc[i]);
+ } else if (prev_status & (1 << i) &&
+ !(new_status & (1 << i))) {
+ pr_debug(" -%s", bit_desc[i]);
+ } else if (prev_status & (1 << i) &&
+ new_status & (1 << i)) {
+ pr_debug(" %s", bit_desc[i]);
+ }
}
pr_debug("\n");
}
@@ -466,8 +474,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 (0 <= rhport) {
- 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");
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2011-06-13 23:33    [W:0.054 / U:0.932 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site