Commit cdd51621 authored by Matthew Dharm's avatar Matthew Dharm Committed by Greg Kroah-Hartman

[PATCH] USB storage: clean up debugging

This patch makes the debug system only print out the valid bytes of a
command.  Greg, please apply.

Andries suggested this... while some would think that seeing the extra
bytes might be good, it is kinda noisy.
parent bdf826b2
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
void usb_stor_show_command(Scsi_Cmnd *srb) void usb_stor_show_command(Scsi_Cmnd *srb)
{ {
char *what = NULL; char *what = NULL;
int i;
switch (srb->cmnd[0]) { switch (srb->cmnd[0]) {
case TEST_UNIT_READY: what = "TEST_UNIT_READY"; break; case TEST_UNIT_READY: what = "TEST_UNIT_READY"; break;
...@@ -143,29 +144,25 @@ void usb_stor_show_command(Scsi_Cmnd *srb) ...@@ -143,29 +144,25 @@ void usb_stor_show_command(Scsi_Cmnd *srb)
default: what = "(unknown command)"; break; default: what = "(unknown command)"; break;
} }
US_DEBUGP("Command %s (%d bytes)\n", what, srb->cmd_len); US_DEBUGP("Command %s (%d bytes)\n", what, srb->cmd_len);
US_DEBUGP("%02x %02x %02x %02x " US_DEBUGP("");
"%02x %02x %02x %02x " for (i = 0; i < srb->cmd_len && i < 16; i++)
"%02x %02x %02x %02x\n", US_DEBUGPX(" %02x", srb->cmnd[i]);
srb->cmnd[0], srb->cmnd[1], srb->cmnd[2], srb->cmnd[3], US_DEBUGPX("\n");
srb->cmnd[4], srb->cmnd[5], srb->cmnd[6], srb->cmnd[7],
srb->cmnd[8], srb->cmnd[9], srb->cmnd[10],
srb->cmnd[11]);
} }
void usb_stor_print_Scsi_Cmnd( Scsi_Cmnd* cmd ) void usb_stor_print_Scsi_Cmnd(Scsi_Cmnd *cmd)
{ {
int i=0, bufferSize = cmd->request_bufflen; int i=0, bufferSize = cmd->request_bufflen;
u8* buffer = cmd->request_buffer; u8 *buffer = cmd->request_buffer;
struct scatterlist* sg = (struct scatterlist*)cmd->request_buffer; struct scatterlist *sg = (struct scatterlist*)cmd->request_buffer;
US_DEBUGP("Dumping information about %p.\n", cmd ); US_DEBUGP("Dumping information about %p.\n", cmd);
US_DEBUGP("cmd->cmnd[0] value is %d.\n", cmd->cmnd[0] ); US_DEBUGP("cmd->cmnd[0] value is %d.\n", cmd->cmnd[0]);
US_DEBUGP("(MODE_SENSE is %d and MODE_SENSE_10 is %d)\n", US_DEBUGP("(MODE_SENSE is %d and MODE_SENSE_10 is %d)\n",
MODE_SENSE, MODE_SENSE_10 ); MODE_SENSE, MODE_SENSE_10);
US_DEBUGP("buffer is %p with length %d.\n", buffer, bufferSize ); US_DEBUGP("buffer is %p with length %d.\n", buffer, bufferSize);
for ( i=0; i<bufferSize; i+=16 ) for (i=0; i<bufferSize; i+=16) {
{
US_DEBUGP("%02x %02x %02x %02x %02x %02x %02x %02x\n" US_DEBUGP("%02x %02x %02x %02x %02x %02x %02x %02x\n"
"%02x %02x %02x %02x %02x %02x %02x %02x\n", "%02x %02x %02x %02x %02x %02x %02x %02x\n",
buffer[i], buffer[i],
...@@ -187,8 +184,7 @@ void usb_stor_print_Scsi_Cmnd( Scsi_Cmnd* cmd ) ...@@ -187,8 +184,7 @@ void usb_stor_print_Scsi_Cmnd( Scsi_Cmnd* cmd )
} }
US_DEBUGP("Buffer has %d scatterlists.\n", cmd->use_sg ); US_DEBUGP("Buffer has %d scatterlists.\n", cmd->use_sg );
for ( i=0; i<cmd->use_sg; i++ ) for (i=0; i<cmd->use_sg; i++) {
{
char *adr = sg_address(sg[i]); char *adr = sg_address(sg[i]);
US_DEBUGP("Length of scatterlist %d is %d.\n",i,sg[i].length); US_DEBUGP("Length of scatterlist %d is %d.\n",i,sg[i].length);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment