diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | doc/sg_copy_results.8 | 4 | ||||
| -rw-r--r-- | doc/sg_get_config.8 | 6 | ||||
| -rw-r--r-- | doc/sg_raw.8 | 6 | ||||
| -rw-r--r-- | doc/sg_read_block_limits.8 | 6 | ||||
| -rw-r--r-- | doc/sg_read_buffer.8 | 6 | ||||
| -rw-r--r-- | doc/sg_readcap.8 | 6 | ||||
| -rw-r--r-- | doc/sg_reassign.8 | 6 | ||||
| -rw-r--r-- | doc/sg_referrals.8 | 6 | ||||
| -rw-r--r-- | doc/sg_rmsn.8 | 6 | ||||
| -rw-r--r-- | doc/sg_rtpg.8 | 6 | ||||
| -rw-r--r-- | doc/sg_sanitize.8 | 4 | ||||
| -rw-r--r-- | doc/sg_ses.8 | 9 | ||||
| -rw-r--r-- | src/sg_ses.c | 13 |
14 files changed, 49 insertions, 40 deletions
@@ -2,10 +2,13 @@ Each utility has its own version number, date of last change and some description at the top of its ".c" file. All utilities in the main directory have their own "man" pages. There is also a sg3_utils man page. -Changelog for sg3_utils-1.35 [20121119] [svn: r466] +Changelog for sg3_utils-1.35 [20121124] [svn: r467] - sg_stpg: with --offline fix 'Invalid state 0xe' + - sg_ses: Door Lock element changed to Door element and + abbreviation changed frm 'dl' to 'do' (ses3r05) - sync to sbc3r33 - sg_pt_win32, sg_scan(win32): changes for cygwin 1.7.17 + - clean up man page summary lines Changelog for sg3_utils-1.34 [20121013] [svn: r461] - sg_xcopy: new dd like utility for extended copy command diff --git a/doc/sg_copy_results.8 b/doc/sg_copy_results.8 index ad6c7c56..8b749a37 100644 --- a/doc/sg_copy_results.8 +++ b/doc/sg_copy_results.8 @@ -1,6 +1,6 @@ -.TH SG_COPY_RESULTS "8" "September 2012" "sg3_utils\-1.34" SG3_UTILS +.TH SG_COPY_RESULTS "8" "November 2012" "sg3_utils\-1.35" SG3_UTILS .SH NAME -sg_copy_results \- sends a SCSI RECEIVE COPY RESULTS command +sg_copy_results \- send SCSI RECEIVE COPY RESULTS command (XCOPY related) .SH SYNOPSIS .B sg_copy_results [\fI\-\-failed\fR|\fI\-\-params\fR|\fI\-\-receive\fR|\fI\-\-status\fR] diff --git a/doc/sg_get_config.8 b/doc/sg_get_config.8 index 2dde6a5b..f82e905e 100644 --- a/doc/sg_get_config.8 +++ b/doc/sg_get_config.8 @@ -1,6 +1,6 @@ -.TH SG_GET_CONFIG "8" "February 2011" "sg3_utils\-1.31" SG3_UTILS +.TH SG_GET_CONFIG "8" "November 2012" "sg3_utils\-1.35" SG3_UTILS .SH NAME -sg_get_config \- sends a SCSI GET CONFIGURATION command (MMC-4 +) +sg_get_config \- send SCSI GET CONFIGURATION command (MMC-4 +) .SH SYNOPSIS .B sg_get_config [\fI\-\-brief\fR] [\fI\-\-current\fR] [\fI\-\-help\fR] [\fI\-\-hex\fR] @@ -133,7 +133,7 @@ Written by Douglas Gilbert. .SH "REPORTING BUGS" Report bugs to <dgilbert at interlog dot com>. .SH COPYRIGHT -Copyright \(co 2004\-2011 Douglas Gilbert +Copyright \(co 2004\-2012 Douglas Gilbert .br This software is distributed under a FreeBSD license. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/doc/sg_raw.8 b/doc/sg_raw.8 index 5416aeac..692b9f39 100644 --- a/doc/sg_raw.8 +++ b/doc/sg_raw.8 @@ -1,6 +1,6 @@ -.TH SG_RAW "8" "February 2011" "sg3_utils\-1.31" SG3_UTILS +.TH SG_RAW "8" "November 2012" "sg3_utils\-1.35" SG3_UTILS .SH NAME -sg_raw \- sends an arbitrary SCSI command to a device +sg_raw \- send arbitrary SCSI command to a device .SH SYNOPSIS .B sg_raw [\fIOPTIONS\fR] \fIDEVICE\fR CDB0 CDB1 ... .SH DESCRIPTION @@ -125,7 +125,7 @@ Written by Ingo van Lil .SH "REPORTING BUGS" Report bugs to <inguin at gmx dot de>. .SH COPYRIGHT -Copyright \(co 2001\-2011 Ingo van Lil +Copyright \(co 2001\-2012 Ingo van Lil .br This software is distributed under the GPL version 2. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/doc/sg_read_block_limits.8 b/doc/sg_read_block_limits.8 index 1d4e0135..0ef2a52e 100644 --- a/doc/sg_read_block_limits.8 +++ b/doc/sg_read_block_limits.8 @@ -1,6 +1,6 @@ -.TH SG_READ_BLOCK_LIMITS "8" "February 2011" "sg3_utils\-1.31" SG3_UTILS +.TH SG_READ_BLOCK_LIMITS "8" "November 2012" "sg3_utils\-1.35" SG3_UTILS .SH NAME -sg_read_block_limits \- sends a SCSI READ BLOCK LIMITS command +sg_read_block_limits \- send SCSI READ BLOCK LIMITS command .SH SYNOPSIS .B sg_read_block_limits [\fI\-\-help\fR] [\fI\-\-hex\fR] [\fI\-\-raw\fR] [\fI\-\-verbose\fR] @@ -48,7 +48,7 @@ Written by Douglas Gilbert. .SH "REPORTING BUGS" Report bugs to <dgilbert at interlog dot com>. .SH COPYRIGHT -Copyright \(co 2009\-2011 Douglas Gilbert +Copyright \(co 2009\-2012 Douglas Gilbert .br This software is distributed under a FreeBSD license. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/doc/sg_read_buffer.8 b/doc/sg_read_buffer.8 index c001218a..271b11c1 100644 --- a/doc/sg_read_buffer.8 +++ b/doc/sg_read_buffer.8 @@ -1,6 +1,6 @@ -.TH SG_READ_BUFFER "8" "February 2011" "sg3_utils\-1.31" SG3_UTILS +.TH SG_READ_BUFFER "8" "November 2012" "sg3_utils\-1.35" SG3_UTILS .SH NAME -sg_read_buffer \- send a SCSI READ BUFFER command +sg_read_buffer \- send SCSI READ BUFFER command .SH SYNOPSIS .B sg_read_buffer [\fI\-\-help\fR] [\fI\-\-hex\fR] [\fI\-\-id=ID\fR] [\fI\-\-length=LEN\fR] @@ -67,7 +67,7 @@ Written by Luben Tuikov and Douglas Gilbert. .SH "REPORTING BUGS" Report bugs to <dgilbert at interlog dot com>. .SH COPYRIGHT -Copyright \(co 2006\-2011 Luben Tuikov and Douglas Gilbert +Copyright \(co 2006\-2012 Luben Tuikov and Douglas Gilbert .br This software is distributed under a FreeBSD license. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/doc/sg_readcap.8 b/doc/sg_readcap.8 index a52f329f..8f10a029 100644 --- a/doc/sg_readcap.8 +++ b/doc/sg_readcap.8 @@ -1,6 +1,6 @@ -.TH SG_READCAP "8" "January 2011" "sg3_utils\-1.31" SG3_UTILS +.TH SG_READCAP "8" "November 2012" "sg3_utils\-1.35" SG3_UTILS .SH NAME -sg_readcap \- sends a SCSI READ CAPACITY command +sg_readcap \- send SCSI READ CAPACITY command .SH SYNOPSIS .B sg_readcap [\fI\-\-16\fR] [\fI\-\-brief\fR] [\fI\-\-help\fR] [\fI\-\-hex\fR] @@ -157,7 +157,7 @@ outputs version string then exits. .SH AUTHORS Written by Douglas Gilbert .SH COPYRIGHT -Copyright \(co 1999\-2011 Douglas Gilbert +Copyright \(co 1999\-2012 Douglas Gilbert .br This software is distributed under the GPL version 2. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/doc/sg_reassign.8 b/doc/sg_reassign.8 index 46db8002..00731c38 100644 --- a/doc/sg_reassign.8 +++ b/doc/sg_reassign.8 @@ -1,6 +1,6 @@ -.TH SG_REASSIGN "8" "April 2009" "sg3_utils\-1.27" SG3_UTILS +.TH SG_REASSIGN "8" "November 2012" "sg3_utils\-1.35" SG3_UTILS .SH NAME -sg_reassign \- sends a SCSI REASSIGN BLOCKS command +sg_reassign \- send SCSI REASSIGN BLOCKS command .SH SYNOPSIS .B sg_reassign [\fI\-\-address=A,A...\fR] [\fI\-\-dummy\fR] [\fI\-\-eight=0|1\fR] @@ -136,7 +136,7 @@ Written by Douglas Gilbert. .SH "REPORTING BUGS" Report bugs to <dgilbert at interlog dot com>. .SH COPYRIGHT -Copyright \(co 2005\-2009 Douglas Gilbert +Copyright \(co 2005\-2012 Douglas Gilbert .br This software is distributed under a FreeBSD license. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/doc/sg_referrals.8 b/doc/sg_referrals.8 index 2aec7b19..22ca08dc 100644 --- a/doc/sg_referrals.8 +++ b/doc/sg_referrals.8 @@ -1,6 +1,6 @@ -.TH SG_REFERRALS "8" "November 2010" "sg3_utils\-1.30" SG3_UTILS +.TH SG_REFERRALS "8" "November 2012" "sg3_utils\-1.35" SG3_UTILS .SH NAME -sg_referrals \- send the SCSI REPORT REFERRALS command +sg_referrals \- send SCSI REPORT REFERRALS command .SH SYNOPSIS .B sg_referrals [\fI\-\-help\fR] [\fI\-\-hex\fR] [\fI\-\-lba=LBA\fR] [\fI\-\-maxlen=LEN\fR] @@ -59,7 +59,7 @@ Written by Douglas Gilbert and Hannes Reinecke. .SH "REPORTING BUGS" Report bugs to <dgilbert at interlog dot com>. .SH COPYRIGHT -Copyright \(co 2009\-2010 Douglas Gilbert and Hannes Reinecke +Copyright \(co 2009\-2012 Douglas Gilbert and Hannes Reinecke .br This software is distributed under a FreeBSD license. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/doc/sg_rmsn.8 b/doc/sg_rmsn.8 index 94978131..294c85ae 100644 --- a/doc/sg_rmsn.8 +++ b/doc/sg_rmsn.8 @@ -1,6 +1,6 @@ -.TH SG_RMSN "8" "February 2011" "sg3_utils\-1.31" SG3_UTILS +.TH SG_RMSN "8" "November 2012" "sg3_utils\-1.31" SG3_UTILS .SH NAME -sg_rmsn \- sends a SCSI READ MEDIA SERIAL NUMBER command +sg_rmsn \- send SCSI READ MEDIA SERIAL NUMBER command .SH SYNOPSIS .B sg_rmsn [\fI\-\-help\fR] [\fI\-\-raw\fR] [\fI\-\-readonly\fR] [\fI\-\-verbose\fR] @@ -56,7 +56,7 @@ Written by Douglas Gilbert. .SH "REPORTING BUGS" Report bugs to <dgilbert at interlog dot com>. .SH COPYRIGHT -Copyright \(co 2005\-2011 Douglas Gilbert +Copyright \(co 2005\-2012 Douglas Gilbert .br This software is distributed under a FreeBSD license. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/doc/sg_rtpg.8 b/doc/sg_rtpg.8 index 0fe3de7b..7e3ffc95 100644 --- a/doc/sg_rtpg.8 +++ b/doc/sg_rtpg.8 @@ -1,6 +1,6 @@ -.TH SG_RTPG "8" "January 2007" "sg3_utils\-1.23" SG3_UTILS +.TH SG_RTPG "8" "November 2012" "sg3_utils\-1.35" SG3_UTILS .SH NAME -sg_rtpg \- sends a SCSI REPORT TARGET PORT GROUPS command +sg_rtpg \- send SCSI REPORT TARGET PORT GROUPS command .SH SYNOPSIS .B sg_rtpg [\fI\-\-decode\fR] [\fI\-\-help\fR] [\fI\-\-hex\fR] [\fI\-\-raw\fR] @@ -51,7 +51,7 @@ Written by Douglas Gilbert. .SH "REPORTING BUGS" Report bugs to <dgilbert at interlog dot com>. .SH COPYRIGHT -Copyright \(co 2004\-2007 Christophe Varoqui and Douglas Gilbert +Copyright \(co 2004\-2012 Christophe Varoqui and Douglas Gilbert .br This software is distributed under a FreeBSD license. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/doc/sg_sanitize.8 b/doc/sg_sanitize.8 index b9a93f0b..dae4f1f0 100644 --- a/doc/sg_sanitize.8 +++ b/doc/sg_sanitize.8 @@ -1,6 +1,6 @@ -.TH SG_SANITIZE "8" "February 2012" "sg3_utils\-1.34" SG3_UTILS +.TH SG_SANITIZE "8" "November 2012" "sg3_utils\-1.35" SG3_UTILS .SH NAME -sg_sanitize \- remove all user data from a SCSI disk +sg_sanitize \- remove all user data from disk with SCSI SANITIZE command .SH SYNOPSIS .B sg_sanitize [\fI\-\-ause\fR] [\fI\-\-block\fR] [\fI\-\-count=OC\fR] [\fI\-\-crypto\fR] diff --git a/doc/sg_ses.8 b/doc/sg_ses.8 index a91954d2..e8043022 100644 --- a/doc/sg_ses.8 +++ b/doc/sg_ses.8 @@ -1,4 +1,4 @@ -.TH SG_SES "8" "August 2012" "sg3_utils\-1.34" SG3_UTILS +.TH SG_SES "8" "November 2012" "sg3_utils\-1.35" SG3_UTILS .SH NAME sg_ses \- access a SCSI Enclosure Services (SES) device .SH SYNOPSIS @@ -25,7 +25,7 @@ If no options are given (i.e. only the \fIDEVICE\fR argument is given) then the names of all diagnostic pages supported are listed. Most, but not necessarily all, of the named diagnostic pages are defined in the SES standards and drafts. The most recent reference for this utility is the -draft SCSI Enclosure Services 3 document T10/2149\-D Revision 3 at +draft SCSI Enclosure Services 3 document T10/2149\-D Revision 5 at http://www.t10.org . Existing standards for SES and SES\-2 are ANSI INCITS 305\-1998 and ANSI INCITS 448\-2008 respectively. .PP @@ -307,6 +307,11 @@ code in this utility interprets the "element index" field as per the SES\-2 standard and if that yields an inappropriate Element type, adjusts its indexing to follow that vendor's misinterpretation. .PP +In draft SES\-3 revision 5 the "Door Lock" element name was changed to +the "Door" (and an OPEN field was added to the status element). As a +consequence the former 'dl' element type abbreviation has been changed +to 'do'. +.PP There is a related command set called SAF\-TE (SCSI attached fault\-tolerant enclosure) for enclosure (including RAID) status and control. SCSI devices that support SAF\-TE report "Processor" peripheral device type (0x3) in their diff --git a/src/sg_ses.c b/src/sg_ses.c index 7ba53ed6..0af842ad 100644 --- a/src/sg_ses.c +++ b/src/sg_ses.c @@ -27,7 +27,7 @@ * commands tailored for SES (enclosure) devices. */ -static char * version_str = "1.69 20121112"; /* ses3r04 */ +static char * version_str = "1.70 20121124"; /* ses3r05 */ #define MX_ALLOC_LEN ((64 * 1024) - 1) #define MX_ELEM_HDR 1024 @@ -64,7 +64,7 @@ static char * version_str = "1.69 20121112"; /* ses3r04 */ #define POWER_SUPPLY_ETC 0x2 #define COOLING_ETC 0x3 #define TEMPERATURE_ETC 0x4 -#define DOOR_LOCK_ETC 0x5 +#define DOOR_ETC 0x5 /* prior to ses3r05 was DOOR_LOCK_ETC */ #define AUD_ALARM_ETC 0x6 #define ESC_ELECTRONICS_ETC 0x7 #define SCC_CELECTR_ETC 0x8 @@ -324,7 +324,8 @@ static struct element_type_t element_type_arr[] = { {POWER_SUPPLY_ETC, "ps", "Power supply"}, {COOLING_ETC, "coo", "Cooling"}, {TEMPERATURE_ETC, "ts", "Temperature sensor"}, - {DOOR_LOCK_ETC, "dl", "Door lock"}, + {DOOR_ETC, "do", "Door"}, /* prior to ses3r05 was 'dl' (for Door Lock) + but the "Lock" has been dropped */ {AUD_ALARM_ETC, "aa", "Audible alarm"}, {ESC_ELECTRONICS_ETC, "esc", "Enclosure services controller electronics"}, {SCC_CELECTR_ETC, "sce", "SCC controller electronics"}, @@ -1556,11 +1557,11 @@ enc_status_helper(const char * pad, const unsigned char * statp, int etype, else printf("%sTemperature: <reserved>\n", pad); break; - case DOOR_LOCK_ETC: + case DOOR_ETC: /* OPEN field added in ses3r05 */ if ((! filter) || ((0xc0 & statp[1]) || (0x1 & statp[3]))) - printf("%sIdent=%d, Fail=%d, Unlock=%d\n", pad, + printf("%sIdent=%d, Fail=%d, Open=%d, Unlock=%d\n", pad, !!(statp[1] & 0x80), !!(statp[1] & 0x40), - !!(statp[3] & 0x1)); + !!(statp[3] & 0x2), !!(statp[3] & 0x1)); break; case AUD_ALARM_ETC: /* audible alarm */ if ((! filter) || ((0xc0 & statp[1]) || (0xd0 & statp[3]))) |