[haiku-commits] haiku: hrev46067 - src/add-ons/kernel/drivers/disk/usb/usb_disk
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 16 Sep 2013 11:49:03 +0200 (CEST)
hrev46067 adds 1 changeset to branch 'master'
old head: 81cdbc6ae63980490bb3d3f3717631553a68b75b
new head: 367d254419ed612ac5a6b3d4d8c262bc30038c53
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=367d254+%5E81cdbc6
----------------------------------------------------------------------------
367d254: usb_disk: fixes 64bit trace build
[ Jerome Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46067
Commit: 367d254419ed612ac5a6b3d4d8c262bc30038c53
URL: http://cgit.haiku-os.org/haiku/commit/?id=367d254
Author: Jerome Duval <jerome.duval@xxxxxxxxx>
Date: Mon Sep 16 09:47:23 2013 UTC
----------------------------------------------------------------------------
1 file changed, 12 insertions(+), 10 deletions(-)
.../drivers/disk/usb/usb_disk/usb_disk.cpp | 22 +++++++++++---------
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
b/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
index 87383f0..d270798 100644
--- a/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
+++ b/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
@@ -267,8 +267,8 @@ usb_disk_operation(device_lun *lun, uint8 operation, uint8
opLength,
uint32 logicalBlockAddress, uint16 transferLength, void *data,
size_t *dataLength, bool directionIn)
{
- TRACE("operation: lun: %u; op: %u; oplen: %u; lba: %lu; tlen: %u; data:
"
- "%p; dlen: %p (%lu); in: %c\n",
+ TRACE("operation: lun: %u; op: %u; oplen: %u; lba: %" B_PRIu32
+ "; tlen: %u; data: %p; dlen: %p (%lu); in: %c\n",
lun->logical_unit_number, operation, opLength,
logicalBlockAddress,
transferLength, data, dataLength, dataLength ? *dataLength : 0,
directionIn ? 'y' : 'n');
@@ -691,7 +691,7 @@ usb_disk_callback(void *cookie, status_t status, void *data,
static status_t
usb_disk_device_added(usb_device newDevice, void **cookie)
{
- TRACE("device_added(0x%08lx)\n", newDevice);
+ TRACE("device_added(0x%08" B_PRIx32 ")\n", newDevice);
disk_device *device = (disk_device *)malloc(sizeof(disk_device));
device->device = newDevice;
device->removed = false;
@@ -856,7 +856,7 @@ usb_disk_device_added(usb_device newDevice, void **cookie)
sprintf(device->luns[i]->name, DEVICE_NAME,
device->device_number, i);
mutex_unlock(&gDeviceListLock);
- TRACE("new device: 0x%08lx\n", (uint32)device);
+ TRACE("new device: 0x%p\n", device);
*cookie = (void *)device;
return B_OK;
}
@@ -865,7 +865,7 @@ usb_disk_device_added(usb_device newDevice, void **cookie)
static status_t
usb_disk_device_removed(void *cookie)
{
- TRACE("device_removed(0x%08lx)\n", (uint32)cookie);
+ TRACE("device_removed(0x%p)\n", cookie);
disk_device *device = (disk_device *)cookie;
mutex_lock(&gDeviceListLock);
@@ -1096,7 +1096,8 @@ usb_disk_ioctl(void *cookie, uint32 op, void *buffer,
size_t length)
case B_GET_MEDIA_STATUS:
{
*(status_t *)buffer = usb_disk_test_unit_ready(lun);
- TRACE("B_GET_MEDIA_STATUS: 0x%08lx\n", *(status_t
*)buffer);
+ TRACE("B_GET_MEDIA_STATUS: 0x%08" B_PRIx32 "\n",
+ *(status_t *)buffer);
result = B_OK;
break;
}
@@ -1117,8 +1118,9 @@ usb_disk_ioctl(void *cookie, uint32 op, void *buffer,
size_t length)
geometry.removable = lun->removable;
geometry.read_only = lun->write_protected;
geometry.write_once = lun->device_type == B_WORM;
- TRACE("B_GET_GEOMETRY: %ld sectors at %ld bytes per
sector\n",
- geometry.cylinder_count,
geometry.bytes_per_sector);
+ TRACE("B_GET_GEOMETRY: %" B_PRId32 " sectors at %"
B_PRId32
+ " bytes per sector\n", geometry.cylinder_count,
+ geometry.bytes_per_sector);
result = user_memcpy(buffer, &geometry,
sizeof(device_geometry));
break;
}
@@ -1212,7 +1214,7 @@ usb_disk_read(void *cookie, off_t position, void *buffer,
size_t *length)
if (buffer == NULL || length == NULL)
return B_BAD_VALUE;
- TRACE("read(%lld, %ld)\n", position, *length);
+ TRACE("read(%" B_PRIdOFF ", %ld)\n", position, *length);
device_lun *lun = (device_lun *)cookie;
disk_device *device = lun->device;
mutex_lock(&device->lock);
@@ -1260,7 +1262,7 @@ usb_disk_write(void *cookie, off_t position, const void
*buffer,
if (buffer == NULL || length == NULL)
return B_BAD_VALUE;
- TRACE("write(%lld, %ld)\n", position, *length);
+ TRACE("write(%" B_PRIdOFF", %ld)\n", position, *length);
device_lun *lun = (device_lun *)cookie;
disk_device *device = lun->device;
mutex_lock(&device->lock);
Other related posts:
- » [haiku-commits] haiku: hrev46067 - src/add-ons/kernel/drivers/disk/usb/usb_disk - korli
