diff options
| author | dm120769 <none@none> | 2007-09-20 12:07:03 -0700 |
|---|---|---|
| committer | dm120769 <none@none> | 2007-09-20 12:07:03 -0700 |
| commit | 3a27445b7bb9d714bc575b48634a50f1f599fdab (patch) | |
| tree | ff111fa69de3c6176b6a3b70754e835b6007d281 /usr/src/uts/common/sys/scsi | |
| parent | 785e1c389951561abcf4a4601092416472022944 (diff) | |
| download | illumos-gate-3a27445b7bb9d714bc575b48634a50f1f599fdab.tar.gz | |
backout 4046204/6603211: causes 6607084
Diffstat (limited to 'usr/src/uts/common/sys/scsi')
| -rw-r--r-- | usr/src/uts/common/sys/scsi/impl/sense.h | 7 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/scsi/scsi_pkt.h | 3 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/scsi/scsi_resource.h | 3 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/scsi/targets/sddef.h | 5 |
4 files changed, 3 insertions, 15 deletions
diff --git a/usr/src/uts/common/sys/scsi/impl/sense.h b/usr/src/uts/common/sys/scsi/impl/sense.h index d60ea2049b..dd219bd6a8 100644 --- a/usr/src/uts/common/sys/scsi/impl/sense.h +++ b/usr/src/uts/common/sys/scsi/impl/sense.h @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -61,11 +61,6 @@ extern "C" { (roundup(sizeof (struct scsi_extended_sense), sizeof (int))) /* - * Per SPC-3 standard, the maximum length of sense data is 252 bytes. - */ -#define MAX_SENSE_LENGTH 252 - -/* * Minimum useful Sense Length value */ diff --git a/usr/src/uts/common/sys/scsi/scsi_pkt.h b/usr/src/uts/common/sys/scsi/scsi_pkt.h index 9196cc7b28..4a3f6be09b 100644 --- a/usr/src/uts/common/sys/scsi/scsi_pkt.h +++ b/usr/src/uts/common/sys/scsi/scsi_pkt.h @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -177,7 +177,6 @@ struct scsi_pkt { #define STATE_XFERRED_DATA 0x08 /* Data transfer took place */ #define STATE_GOT_STATUS 0x10 /* SCSI status received */ #define STATE_ARQ_DONE 0x20 /* auto rqsense took place */ -#define STATE_XARQ_DONE 0X40 /* extra auto rqsense took place */ /* * Definitions for the pkt_statistics field diff --git a/usr/src/uts/common/sys/scsi/scsi_resource.h b/usr/src/uts/common/sys/scsi/scsi_resource.h index f5c31ac948..2d12ab3ff8 100644 --- a/usr/src/uts/common/sys/scsi/scsi_resource.h +++ b/usr/src/uts/common/sys/scsi/scsi_resource.h @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -54,7 +54,6 @@ extern "C" { */ #define PKT_CONSISTENT 0x0001 /* this is an 'iopb' packet */ #define PKT_DMA_PARTIAL 0x040000 /* partial xfer ok */ -#define PKT_XARQ 0x080000 /* request for extra sense */ /* * Old PKT_CONSISTENT value for binary compatibility with x86 2.1 diff --git a/usr/src/uts/common/sys/scsi/targets/sddef.h b/usr/src/uts/common/sys/scsi/targets/sddef.h index 15537c843f..509e1ba681 100644 --- a/usr/src/uts/common/sys/scsi/targets/sddef.h +++ b/usr/src/uts/common/sys/scsi/targets/sddef.h @@ -1337,11 +1337,6 @@ struct sd_xbuf { ssize_t xb_sense_resid; /* residual of RQS command */ uchar_t xb_sense_status; /* scsi status byte of RQS command */ uchar_t xb_sense_data[SENSE_LENGTH]; /* sense data from RQS cmd */ - /* - * Extra sense larger than SENSE_LENGTH will be allocated - * right after xb_sense_data[SENSE_LENGTH]. Please do not - * add any new field after it. - */ }; _NOTE(SCHEME_PROTECTS_DATA("unique per pkt", sd_xbuf)) |