[haiku-commits] r42062 - haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 9 Jun 2011 00:10:59 +0200 (CEST)
Author: kallisti5
Date: 2011-06-09 00:10:59 +0200 (Thu, 09 Jun 2011)
New Revision: 42062
Changeset: https://dev.haiku-os.org/changeset/42062
Modified:
haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
Log:
* Put uint8 back to uint32 as per ML recommendations
* Begin using multi-architecture friendly formatting macros per ML
* Change uint32 snoozeTime to preferred bigtime_t per ML
* Thanks for the great feedback!
Modified: haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
2011-06-08 20:15:06 UTC (rev 42061)
+++ haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
2011-06-08 22:10:59 UTC (rev 42062)
@@ -769,8 +769,9 @@
// initialize this lun
result = usb_disk_inquiry(lun);
- for (uint8 tries = 0; tries < 8; tries++) {
- TRACE("usb lun %d inquiry attempt %d begin\n", i,
tries);
+ for (uint32 tries = 0; tries < 8; tries++) {
+ TRACE("usb lun %"B_PRIu8" inquiry attempt %"B_PRIu32"
begin\n",
+ i, tries);
status_t ready = usb_disk_test_unit_ready(lun);
if (ready == B_OK || ready == B_DEV_NO_MEDIA) {
if (ready == B_OK) {
@@ -781,17 +782,20 @@
else if (/*usb_disk_mode_sense(lun) !=
B_OK*/true)
lun->write_protected = false;
- TRACE("usb lun %d ready. write
protected = %c\n", i,
+ TRACE("usb lun %"B_PRIu8" ready. write
protected = %c\n", i,
lun->write_protected ? 'y' :
'n');
break;
}
- TRACE("usb lun %d not ready, attempt %d\n", i,
tries);
+ TRACE("usb lun %"B_PRIu8" not ready, attempt
%"B_PRIu32"\n",
+ i, tries);
}
- TRACE("usb lun %d inquiry attempt %d failed\n", i,
tries);
+ TRACE("usb lun %"B_PRIu8" inquiry attempt %"B_PRIu32"
failed\n", i,
+ tries);
- uint32 snoozeTime = 1000000 * tries;
- TRACE("snoozing %lu microseconds for usb lun\n",
snoozeTime);
+ bigtime_t snoozeTime = 1000000 * tries;
+ TRACE("snoozing %"B_PRIu64" microseconds for usb lun\n",
+ snoozeTime);
snooze(snoozeTime);
}
Other related posts:
- » [haiku-commits] r42062 - haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk - kallisti5
