Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clarify that Sense Key 1 is a "RECOVERED ERROR"- not just an error.

Browse Source
This commit is contained in:
mjacob 1998-07-11 00:52:09 +00:00
parent e7910d8d32
commit 0978d23cc4
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/scsipi/atapi_base.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: atapi_base.c,v 1.6 1998/07/01 17:16:47 mjacob Exp $ */ /* $NetBSD: atapi_base.c,v 1.7 1998/07/11 00:52:09 mjacob Exp $ */
/* /*
* Copyright (c) 1994, 1995, 1997 Charles M. Hannum. All rights reserved. * Copyright (c) 1994, 1995, 1997 Charles M. Hannum. All rights reserved.
@ -79,7 +79,7 @@ atapi_interpret_sense(xs)
} }
/* otherwise use the default */ /* otherwise use the default */
switch (key) { switch (key) {
case SKEY_RECOVERABLE_ERROR: case SKEY_RECOVERED_ERROR:
msg = "soft error (corrected)"; msg = "soft error (corrected)";
case SKEY_NO_SENSE: case SKEY_NO_SENSE:
if (xs->resid == xs->datalen) if (xs->resid == xs->datalen)

10
sys/dev/scsipi/scsi_base.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi_base.c,v 1.61 1998/07/01 17:16:46 mjacob Exp $ */ /* $NetBSD: scsi_base.c,v 1.62 1998/07/11 00:52:09 mjacob Exp $ */
/* /*
* Copyright (c) 1994, 1995, 1997 Charles M. Hannum. All rights reserved. * Copyright (c) 1994, 1995, 1997 Charles M. Hannum. All rights reserved.
@ -209,9 +209,13 @@ scsi_interpret_sense(xs)
switch (key) { switch (key) {
case SKEY_NO_SENSE: case SKEY_NO_SENSE:
case SKEY_RECOVERABLE_ERROR: case SKEY_RECOVERED_ERROR:
if (xs->resid == xs->datalen) if (xs->resid == xs->datalen && xs->datalen) {
/*
* Why is this here?
*/
xs->resid = 0; /* not short read */ xs->resid = 0; /* not short read */
}
case SKEY_EQUAL: case SKEY_EQUAL:
error = 0; error = 0;
break; break;

6
sys/dev/scsipi/scsi_verbose.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi_verbose.c,v 1.5 1998/07/10 19:37:18 mjacob Exp $ */ /* $NetBSD: scsi_verbose.c,v 1.6 1998/07/11 00:52:10 mjacob Exp $ */
/* /*
* Copyright (c) 1994, 1995, 1997 Charles M. Hannum. All rights reserved. * Copyright (c) 1994, 1995, 1997 Charles M. Hannum. All rights reserved.
@ -49,7 +49,7 @@
static const char *sense_keys[16] = { static const char *sense_keys[16] = {
"No Additional Sense", "No Additional Sense",
"Soft Error", "Recovered Error",
"Not Ready", "Not Ready",
"Media Error", "Media Error",
"Hardware Error", "Hardware Error",
@ -454,7 +454,7 @@ scsi_decode_sense(sinfo, flag)
(snsbuf[16] & 0xff) << 8 | (snsbuf[16] & 0xff) << 8 |
(snsbuf[17] & 0xff)); (snsbuf[17] & 0xff));
return (rqsbuf); return (rqsbuf);
case SKEY_RECOVERABLE_ERROR: case SKEY_RECOVERED_ERROR:
case SKEY_MEDIUM_ERROR: case SKEY_MEDIUM_ERROR:
case SKEY_HARDWARE_ERROR: case SKEY_HARDWARE_ERROR:
(void)sprintf(rqsbuf, "Actual Retry Count: %d", (void)sprintf(rqsbuf, "Actual Retry Count: %d",

4
sys/dev/scsipi/scsipi_all.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsipi_all.h,v 1.9 1998/07/01 17:04:31 mjacob Exp $ */ /* $NetBSD: scsipi_all.h,v 1.10 1998/07/11 00:52:10 mjacob Exp $ */
/* /*
* SCSI and SCSI-like general interface description * SCSI and SCSI-like general interface description
@ -116,7 +116,7 @@ struct scsipi_sense_data {
}; };
#define SKEY_NO_SENSE 0x00 #define SKEY_NO_SENSE 0x00
#define SKEY_RECOVERABLE_ERROR 0x01 #define SKEY_RECOVERED_ERROR 0x01
#define SKEY_NOT_READY 0x02 #define SKEY_NOT_READY 0x02
#define SKEY_MEDIUM_ERROR 0x03 #define SKEY_MEDIUM_ERROR 0x03
#define SKEY_HARDWARE_ERROR 0x04 #define SKEY_HARDWARE_ERROR 0x04

6
sys/dev/scsipi/scsipi_verbose.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsipi_verbose.c,v 1.5 1998/07/10 19:37:18 mjacob Exp $ */ /* $NetBSD: scsipi_verbose.c,v 1.6 1998/07/11 00:52:10 mjacob Exp $ */
/* /*
* Copyright (c) 1994, 1995, 1997 Charles M. Hannum. All rights reserved. * Copyright (c) 1994, 1995, 1997 Charles M. Hannum. All rights reserved.
@ -49,7 +49,7 @@
static const char *sense_keys[16] = { static const char *sense_keys[16] = {
"No Additional Sense", "No Additional Sense",
"Soft Error", "Recovered Error",
"Not Ready", "Not Ready",
"Media Error", "Media Error",
"Hardware Error", "Hardware Error",
@ -454,7 +454,7 @@ scsi_decode_sense(sinfo, flag)
(snsbuf[16] & 0xff) << 8 | (snsbuf[16] & 0xff) << 8 |
(snsbuf[17] & 0xff)); (snsbuf[17] & 0xff));
return (rqsbuf); return (rqsbuf);
case SKEY_RECOVERABLE_ERROR: case SKEY_RECOVERED_ERROR:
case SKEY_MEDIUM_ERROR: case SKEY_MEDIUM_ERROR:
case SKEY_HARDWARE_ERROR: case SKEY_HARDWARE_ERROR:
(void)sprintf(rqsbuf, "Actual Retry Count: %d", (void)sprintf(rqsbuf, "Actual Retry Count: %d",