vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix mismerge

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-07-17 00:56:38 +02:00
parent 1b43dba911
commit 9c17c6411a
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
disk/usbms.c
View file

@ -292,11 +292,15 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
goto CheckCSW; goto CheckCSW;
} }
/* Debug print of received data. */ /* Debug print of received data. */
grub_dprintf ("usb", "First 16 bytes of received data:\n %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", grub_dprintf ("usb", "buf:\n");
buf[ 0], buf[ 1], buf[ 2], buf[ 3], if (size <= 64)
buf[ 4], buf[ 5], buf[ 6], buf[ 7], {
buf[ 8], buf[ 9], buf[10], buf[11], unsigned i;
buf[12], buf[13], buf[14], buf[15]); for (i = 0; i < size; i++)
grub_dprintf ("usb", "0x%02x: 0x%02x\n", i, buf[i]);
}
else
grub_dprintf ("usb", "Too much data for debug print...\n");
} }
else if (size) else if (size)
{ {
@ -313,6 +317,15 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
grub_usb_clear_halt (dev->dev, dev->out->endp_addr); grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
goto CheckCSW; goto CheckCSW;
} }
/* Debug print of sent data. */
if (size <= 256)
{
unsigned i;
for (i=0; i<size; i++)
grub_dprintf ("usb", "0x%02x: 0x%02x\n", i, buf[i]);
}
else
grub_dprintf ("usb", "Too much data for debug print...\n");
} }
/* Read the status - (maybe) according to specification. */ /* Read the status - (maybe) according to specification. */