diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2006-11-27 20:15:10 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2006-11-27 20:15:10 +0000 |
| commit | 28a3f24d7c8fcd82cc666e76680f97650632e619 (patch) | |
| tree | 2804d56ca9b451defbd3239ac0f193189520b701 /sys/scsi/sd.c | |
| parent | ae8084266ef6e3547ec0e866f97699672b909dfd (diff) | |
get rid of the rest of the asc/ascq magic codes in scsi
ok marco@, deraadt@
Diffstat (limited to 'sys/scsi/sd.c')
| -rw-r--r-- | sys/scsi/sd.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 0e3bca0a547..affb97e41b1 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.111 2006/10/07 23:40:07 beck Exp $ */ +/* $OpenBSD: sd.c,v 1.112 2006/11/27 20:15:09 beck Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -1081,17 +1081,16 @@ sd_interpret_sense(xs) if (((sc_link->flags & SDEV_OPEN) == 0) || (serr != 0x70 && serr != 0x71) || ((sense->flags & SSD_KEY) != SKEY_NOT_READY) || - (sense->extra_len < 6) || - (sense->add_sense_code != 0x04)) + (sense->extra_len < 6)) return (EJUSTRETURN); - switch (sense->add_sense_code_qual) { - case 0x01: /* In process of becoming ready. */ + switch (ASC_ASCQ(sense)) { + case SENSE_NOT_READY_BECOMING_READY: SC_DEBUG(sc_link, SDEV_DB1, ("becoming ready.\n")); retval = scsi_delay(xs, 5); break; - case 0x02: /* Initialization command required. */ + case SENSE_NOT_READY_INIT_REQUIRED: SC_DEBUG(sc_link, SDEV_DB1, ("spinning up\n")); retval = scsi_start(sd->sc_link, SSS_START, SCSI_IGNORE_ILLEGAL_REQUEST | SCSI_URGENT | SCSI_NOSLEEP); |