mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

Report the original command on failures that causes auto sense.

Browse Source 
Keep the ATA_R_QUIET flag if set during autosense.
This commit is contained in:
Søren Schmidt 2004-03-02 14:05:12 +00:00
parent c4c0e4fc3b
commit 37baea5bd5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=126483
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/dev/ata/ata-all.h
View File

@ -193,6 +193,7 @@ struct ata_request {
u_int8_t ccb[16]; /* ATAPI command block */
struct atapi_sense sense_data; /* ATAPI request sense data */
u_int8_t sense_key; /* ATAPI request sense key */
u_int8_t sense_cmd; /* ATAPI saved command */
} atapi;
} u;

10
sys/dev/ata/ata-queue.c
View File

@ -338,14 +338,15 @@ ata_completed(void *context, int dummy)
sizeof(struct atapi_sense),
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
bcopy(ccb, request->u.atapi.ccb, 16);
request->u.atapi.sense_key = request->error;
request->u.atapi.sense_cmd = request->u.atapi.ccb[0];
bcopy(ccb, request->u.atapi.ccb, 16);
request->data = (caddr_t)&request->u.atapi.sense_data;
request->bytecount = sizeof(struct atapi_sense);
request->transfersize = sizeof(struct atapi_sense);
request->timeout = 5;
request->flags =
ATA_R_ATAPI | ATA_R_READ | ATA_R_IMMEDIATE | ATA_R_REQUEUE;
request->flags &= (ATA_R_ATAPI | ATA_R_QUIET);
request->flags |= (ATA_R_READ | ATA_R_IMMEDIATE | ATA_R_REQUEUE);
ata_queue_request(request);
return;
}
@ -466,7 +467,8 @@ ata_cmd2str(struct ata_request *request)
static char buffer[20];
if (request->flags & ATA_R_ATAPI) {
switch (request->u.atapi.ccb[0]) {
switch (request->u.atapi.sense_cmd ?
request->u.atapi.sense_cmd : request->u.atapi.ccb[0]) {
case 0x00: return ("TEST_UNIT_READY");
case 0x01: return ("REZERO");
case 0x03: return ("REQUEST_SENSE");