d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix atapi_wait_ready, it returned prematurely.

Browse Source 
Less verbosity on non-fatal errors.
This commit is contained in:
sos 1999-11-26 19:26:04 +00:00
parent 46311663f3
commit 68549e7015
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/ata/atapi-all.c
View File

@ -471,12 +471,6 @@ atapi_interrupt(struct atapi_request *request)
else {
request->error = 0;
if (request->result) {
printf("atapi: %s - %s skey=%01x asc=%02x ascq=%02x error=%02x\n",
atapi_cmd2str(atp->cmd),
atapi_skey2str(request->sense.sense_key),
request->sense.sense_key, request->sense.asc,
request->sense.ascq, request->result & ATAPI_E_MASK);
switch ((request->result & ATAPI_SK_MASK)) {
case ATAPI_SK_RESERVED:
printf("atapi_error: %s - timeout error = %02x\n",
@ -495,7 +489,6 @@ atapi_interrupt(struct atapi_request *request)
break;
case ATAPI_SK_NOT_READY:
atp->flags |= ATAPI_F_MEDIA_CHANGED;
request->error = EBUSY;
break;
@ -505,6 +498,11 @@ atapi_interrupt(struct atapi_request *request)
break;
default:
printf("atapi: %s - %s asc=%02x ascq=%02x error=%02x\n",
atapi_cmd2str(atp->cmd),
atapi_skey2str(request->sense.sense_key),
request->sense.asc, request->sense.ascq,
request->result & ATAPI_E_MASK);
request->error = EIO;
}
}
@ -548,12 +546,8 @@ atapi_wait_ready(struct atapi_softc *atp, int32_t timeout)
int32_t error = 0, timout = timeout * hz;
while (timout > 0) {
error = atapi_test_ready(atp);
if ((error & ATAPI_SK_MASK) != ATAPI_SK_NOT_READY)
if ((error = atapi_test_ready(atp)) != EBUSY)
break;
#ifdef ATAPI_DEBUG
printf("atapi: waiting on error=%02x\n", error);
#endif
tsleep((caddr_t)&error, PRIBIO, "atpwt", 50);
timout -= 50;
}