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

fix bugs exposed by ASSERT

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23377 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2008-01-11 01:33:10 +00:00
parent 978e434d72
commit ddb73d9f46
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ata/ata_request.c
+3 -3
View File
@@ -120,9 +120,9 @@ ata_request_finish(ata_request *request, bool resubmit)
// we cannot copy sense directly as sense buffer may be too small // we cannot copy sense directly as sense buffer may be too small
scsi_set_sense(&sense, request); scsi_set_sense(&sense, request);
ASSERT(sizeof(*request->ccb->sense) == SCSI_MAX_SENSE_SIZE); ASSERT(sizeof(request->ccb->sense) == SCSI_MAX_SENSE_SIZE);
sense_len = min(sizeof(*request->ccb->sense), sizeof(sense)); sense_len = min(sizeof(request->ccb->sense), sizeof(sense));
memcpy(request->ccb->sense, &sense, sense_len); memcpy(request->ccb->sense, &sense, sense_len);
request->ccb->sense_resid = SCSI_MAX_SENSE_SIZE - sense_len; request->ccb->sense_resid = SCSI_MAX_SENSE_SIZE - sense_len;
@@ -131,7 +131,7 @@ ata_request_finish(ata_request *request, bool resubmit)
// device sense gets reset once it's read // device sense gets reset once it's read
ata_request_clear_sense(request); ata_request_clear_sense(request);
ASSERT(request->ccb->subsys_status == SCSI_REQ_CMP_ERR); ASSERT(request->ccb->subsys_status == SCSI_REQ_CMP_ERR | SCSI_AUTOSNS_VALID);
ASSERT(request->ccb->device_status == SCSI_STATUS_CHECK_CONDITION); ASSERT(request->ccb->device_status == SCSI_STATUS_CHECK_CONDITION);
} }
} }