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

Removed debug output in the read/write path, and added it to other functions.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23435 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2008-01-12 10:32:10 +00:00
parent afb50bcdc0
commit 38d1ee9587
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ata/ata.c
+2 -2
View File
@@ -819,8 +819,8 @@ ata_exec_pio_transfer(ata_request *request)
uint32 timeout = request->ccb->timeout > 0 ? uint32 timeout = request->ccb->timeout > 0 ?
request->ccb->timeout * 1000 : IDE_STD_TIMEOUT; request->ccb->timeout * 1000 : IDE_STD_TIMEOUT;
FLOW("ata_exec_pio_transfer: length %d, left_blocks %d, left_sg_elem %d, cur_sg_ofs %d\n", // FLOW("ata_exec_pio_transfer: length %d, left_blocks %d, left_sg_elem %d, cur_sg_ofs %d\n",
request->ccb->data_length, device->left_blocks, device->left_sg_elem, device->cur_sg_ofs); // request->ccb->data_length, device->left_blocks, device->left_sg_elem, device->cur_sg_ofs);
while (device->left_blocks > 0) { while (device->left_blocks > 0) {
src/add-ons/kernel/bus_managers/ata/ata_request.c
+3 -2
View File
@@ -99,8 +99,9 @@ ata_request_finish(ata_request *request, bool resubmit)
ASSERT(ccb); ASSERT(ccb);
TRACE("ata_request_finish: request %p, subsys_status 0x%02x, senseKey %02x\n", if (ccb->subsys_status != SCSI_REQ_CMP || request->senseKey)
request, ccb->subsys_status, request->senseKey); TRACE("ata_request_finish: request %p, subsys_status 0x%02x, senseKey %02x\n",
request, ccb->subsys_status, request->senseKey);
// when the request completed and has set sense // when the request completed and has set sense
// data, report this to the scsci stack by setting // data, report this to the scsci stack by setting
src/add-ons/kernel/bus_managers/ata/scsi2ata.c
+8
View File
@@ -249,6 +249,8 @@ scsi_test_unit_ready(ide_device_info *device, ata_request *request)
static bool static bool
scsi_synchronize_cache(ide_device_info *device, ata_request *request) scsi_synchronize_cache(ide_device_info *device, ata_request *request)
{ {
TRACE("scsi_synchronize_cache\n");
// we should also ask for FLUSH CACHE support, but everyone denies it // we should also ask for FLUSH CACHE support, but everyone denies it
// (looks like they cheat to gain some performance advantage, but // (looks like they cheat to gain some performance advantage, but
// that's pretty useless: everyone does it...) // that's pretty useless: everyone does it...)
@@ -276,6 +278,8 @@ scsi_synchronize_cache(ide_device_info *device, ata_request *request)
static bool static bool
scsi_load_eject(ide_device_info *device, ata_request *request, bool load) scsi_load_eject(ide_device_info *device, ata_request *request, bool load)
{ {
TRACE("scsi_load_eject\n");
if (load) { if (load) {
// ATA doesn't support loading // ATA doesn't support loading
ata_request_set_sense(request, SCSIS_KEY_ILLEGAL_REQUEST, SCSIS_ASC_PARAM_NOT_SUPPORTED); ata_request_set_sense(request, SCSIS_KEY_ILLEGAL_REQUEST, SCSIS_ASC_PARAM_NOT_SUPPORTED);
@@ -370,6 +374,8 @@ scsi_read_capacity(ide_device_info *device, ata_request *request)
scsi_cmd_read_capacity *cmd = (scsi_cmd_read_capacity *)ccb->cdb; scsi_cmd_read_capacity *cmd = (scsi_cmd_read_capacity *)ccb->cdb;
uint32 lastBlock; uint32 lastBlock;
TRACE("scsi_read_capacity\n");
if (cmd->pmi || cmd->lba) { if (cmd->pmi || cmd->lba) {
ata_request_set_sense(request, SCSIS_KEY_ILLEGAL_REQUEST, SCSIS_ASC_INV_CDB_FIELD); ata_request_set_sense(request, SCSIS_KEY_ILLEGAL_REQUEST, SCSIS_ASC_INV_CDB_FIELD);
return; return;
@@ -394,6 +400,8 @@ scsi_request_sense(ide_device_info *device, ata_request *request)
scsi_sense sense; scsi_sense sense;
uint32 transferSize; uint32 transferSize;
TRACE("scsi_request_sense\n");
// Copy sense data from last request into data buffer of current request. // Copy sense data from last request into data buffer of current request.
// The sense data of last request is still present in the current request, // The sense data of last request is still present in the current request,
// as is isn't been cleared by ata_exec_io for SCSI_OP_REQUEST_SENSE. // as is isn't been cleared by ata_exec_io for SCSI_OP_REQUEST_SENSE.