i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: uses B_PRI* macros

Browse Source
This commit is contained in:
Jérôme Duval
2013-07-02 18:44:42 +02:00
parent db5af29c82
commit 09bac83c5d
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/scsi/dma_buffer.cpp
+6 -6
View File
@@ -310,11 +310,11 @@ dump_sg_table(const physical_entry *sg_list,
{
uint32 cur_idx;
SHOW_FLOW(1, "count=%d", (int)sg_list_count);
SHOW_FLOW(1, "count=%" B_PRIu32, sg_list_count);
for (cur_idx = sg_list_count; cur_idx >= 1; --cur_idx, ++sg_list) {
SHOW_FLOW(1, "addr=%" B_PRIxPHYSADDR ", size=%d", sg_list->address,
(int)sg_list->size);
SHOW_FLOW(1, "addr=%" B_PRIxPHYSADDR ", size=%" B_PRIuPHYSADDR, sg_list->address,
sg_list->size);
}
}
@@ -403,7 +403,7 @@ scsi_get_dma_buffer(scsi_ccb *request)
request->sg_list = buffer->sg_list;
request->sg_count = buffer->sg_count;
SHOW_INFO(1, "bytes: %d", (int)request->data_length);
SHOW_INFO(1, "bytes: %" B_PRIu32, request->data_length);
SHOW_INFO0(3, "we can start now");
request->buffered = true;
@@ -433,9 +433,9 @@ scsi_release_dma_buffer(scsi_ccb *request)
scsi_device_info *device = request->device;
dma_buffer *buffer = request->dma_buffer;
SHOW_FLOW(1, "Buffering finished, %x, %x",
SHOW_FLOW(1, "Buffering finished, %x, %" B_PRIx32,
request->subsys_status & SCSI_SUBSYS_STATUS_MASK,
(int)(request->flags & SCSI_DIR_MASK));
(request->flags & SCSI_DIR_MASK));
// copy data from buffer if required and if operation succeeded
if ((request->subsys_status & SCSI_SUBSYS_STATUS_MASK) == SCSI_REQ_CMP
src/add-ons/kernel/bus_managers/scsi/scsi_io.cpp
+9 -7
View File
@@ -277,9 +277,9 @@ scsi_request_finished(scsi_ccb *request, uint num_requests)
&& request->device_status == SCSI_STATUS_CHECK_CONDITION;
if (request->subsys_status != SCSI_REQ_CMP) {
SHOW_FLOW(3, "subsys=%x, device=%x, flags=%x, manual_auto_sense=%d",
request->subsys_status, request->device_status, (int)request->flags,
device->manual_autosense);
SHOW_FLOW(3, "subsys=%x, device=%x, flags=%" B_PRIx32
", manual_auto_sense=%d", request->subsys_status,
request->device_status, request->flags, device->manual_autosense);
}
if (do_autosense) {
@@ -397,8 +397,10 @@ scsi_async_io(scsi_ccb *request)
//snooze( 1000000 );
// do some sanity tests first
if (request->state != SCSI_STATE_FINISHED)
panic("Passed ccb to scsi_action that isn't ready (state = %d)\n", request->state);
if (request->state != SCSI_STATE_FINISHED) {
panic("Passed ccb to scsi_action that isn't ready (state = %d)\n",
request->state);
}
if (request->cdb_length < func_group_len[request->cdb[0] >> 5]) {
SHOW_ERROR(3, "invalid command len (%d instead of %d)",
@@ -418,8 +420,8 @@ scsi_async_io(scsi_ccb *request)
if ((request->flags & SCSI_DIR_MASK) != SCSI_DIR_NONE
&& request->sg_list == NULL && request->data_length > 0) {
SHOW_ERROR( 3, "Asynchronous SCSI I/O requires S/G list (data is %d bytes)",
(int)request->data_length );
SHOW_ERROR( 3, "Asynchronous SCSI I/O requires S/G list (data is %"
B_PRIu32 " bytes)", request->data_length );
request->subsys_status = SCSI_DATA_RUN_ERR;
goto err;
}