diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/sg_format.8 | 4 | ||||
| -rw-r--r-- | doc/sg_inq.8 | 16 | ||||
| -rw-r--r-- | doc/sg_logs.8 | 4 | ||||
| -rw-r--r-- | doc/sg_opcodes.8 | 2 | ||||
| -rw-r--r-- | doc/sg_persist.8 | 4 | ||||
| -rw-r--r-- | doc/sg_read_buffer.8 | 2 | ||||
| -rw-r--r-- | doc/sg_requests.8 | 2 | ||||
| -rw-r--r-- | doc/sg_safte.8 | 12 | ||||
| -rw-r--r-- | doc/sg_sat_identify.8 | 2 | ||||
| -rw-r--r-- | doc/sg_sat_set_features.8 | 6 | ||||
| -rw-r--r-- | doc/sg_senddiag.8 | 62 | ||||
| -rw-r--r-- | doc/sg_ses.8 | 6 | ||||
| -rw-r--r-- | doc/sg_start.8 | 6 | ||||
| -rw-r--r-- | doc/sg_stpg.8 | 14 | ||||
| -rw-r--r-- | doc/sg_vpd.8 | 2 | ||||
| -rw-r--r-- | doc/sg_write_buffer.8 | 2 | ||||
| -rw-r--r-- | doc/sgm_dd.8 | 4 | ||||
| -rw-r--r-- | src/sg_vpd.c | 2 | ||||
| -rw-r--r-- | src/sg_vpd_vendor.c | 11 |
20 files changed, 89 insertions, 76 deletions
diff --git a/debian/changelog b/debian/changelog index 3284b892..cfa6a132 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ sg3-utils (1.25-0.1) unstable; urgency=low * New upstream version - -- Doug Gilbert <dgilbert@interlog.com> Tue, 16 Oct 2007 09:00:00 -0400 + -- Doug Gilbert <dgilbert@interlog.com> Tue, 16 Oct 2007 10:00:00 -0400 sg3-utils (1.24-1) unstable; urgency=low diff --git a/doc/sg_format.8 b/doc/sg_format.8 index 6af7c906..e3050664 100644 --- a/doc/sg_format.8 +++ b/doc/sg_format.8 @@ -49,6 +49,8 @@ the "Protection Field Usage" in the parameter header are associated with protection information and can be set by this utility. .SH OPTIONS Arguments to long options are mandatory for short options as well. +The options are arranged in alphabetical order based on the long +option name. .TP \fB\-C\fR, \fB\-\-cmplst\fR=0 | 1 sets the CMPLST ("complete list") bit in the FORMAT cdb to 0 or 1. @@ -278,7 +280,7 @@ to the manufacturer's maximum recommended value in a format or resize operation. This can be done by placing an address of 0xffffffff (or the 64 bit equivalent) in the appropriate block descriptor field to a MODE SELECT command. In signed (two's complement) arithmetic that value -corresponds to '\-1'. So a \fI\-\-count=\fR-1 causes the block count +corresponds to '\-1'. So a \fI\-\-count=\fR\-1 causes the block count to be set back to the manufacturer's maximum recommended value. To see exactly which SCSI commands are being executed and parameters passed add "\-vvv" to the sg_format command line. diff --git a/doc/sg_inq.8 b/doc/sg_inq.8 index 40c73d7d..88e157e2 100644 --- a/doc/sg_inq.8 +++ b/doc/sg_inq.8 @@ -49,6 +49,8 @@ brackets. The reference document for the ATA IDENTIFY (PACKET) DEVICE command is ATA8\-ACS found at http://www.t13.org . .SH OPTIONS Arguments to long options are mandatory for short options as well. +The options are arranged in alphabetical order based on the long +option name. .TP \fB\-a\fR, \fB\-\-ata\fR Assume given \fIDEVICE\fR is an ATA or ATAPI device which can receive ATA @@ -74,11 +76,8 @@ normal components of a standard INQUIRY are output (typically from the first 36 bytes of the response) followed by the version descriptors if any. .TP -\fB\-e\fR, \fB\-\-vpd\fR -set the Enable Vital Product Data (EVPD) bit (defaults to clear(0)). Used in -conjunction with the \fI\-\-page=PG\fR option where \fIPG\fR specifies the -VPD page number to query. If the \fI\-\-page=PG\fR is not given then \fIPG\fR -defaults to zero which is the "Supported VPD page" VPD page. +\fB\-e\fR +see entry below for \fI\-\-vpd\fR. .TP \fB\-E\fR, \fB\-x\fR, \fB\-\-extended\fR prints the extended INQUIRY VPD page [0x86]. @@ -131,8 +130,11 @@ increase level of verbosity. Can be used multiple times. \fB\-V\fR, \fB\-\-version\fR print out version string then exit. .TP -\fB\-\-vpd\fR -see above entry for \fI\-e\fR. +\fB\-e\fR, \fB\-\-vpd\fR +set the Enable Vital Product Data (EVPD) bit (defaults to clear(0)). Used in +conjunction with the \fI\-\-page=PG\fR option where \fIPG\fR specifies the +VPD page number to query. If the \fI\-\-page=PG\fR is not given then \fIPG\fR +defaults to zero which is the "Supported VPD pages" VPD page. .SH NOTES Some devices with weak SCSI command set implementations lock up when they receive commands they don't understand (or even response lengths diff --git a/doc/sg_logs.8 b/doc/sg_logs.8 index 7f1336eb..9c021f44 100644 --- a/doc/sg_logs.8 +++ b/doc/sg_logs.8 @@ -40,7 +40,7 @@ Arguments to long options are mandatory for short options as well. outputs all the log pages supported by the device. This requires a two stage process: first the "supported log pages" log page is fetched, then for each entry in the response, the corresponding log page is fetched and displayed. -When used twice (e.g. '-aa') all log pages and subpages are fetched. +When used twice (e.g. '\-aa') all log pages and subpages are fetched. .TP \fB\-b\fR, \fB\-\-brief\fR shorten the amount of output for some log pages. For example the Tape @@ -71,7 +71,7 @@ hexadecimal. \fB\-l\fR, \fB\-\-list\fR lists the names of all logs sense pages supported by this device. This is done by reading the "supported log pages" log page. When used -twice (e.g. '-ll') lists the names of all logs sense pages and subpages +twice (e.g. '\-ll') lists the names of all logs sense pages and subpages supported by this device. There is a list of common log page codes below. .TP \fB\-m\fR, \fB\-\-maxlen\fR=\fILEN\fR diff --git a/doc/sg_opcodes.8 b/doc/sg_opcodes.8 index 2b67515c..30e299f5 100644 --- a/doc/sg_opcodes.8 +++ b/doc/sg_opcodes.8 @@ -74,7 +74,7 @@ may or may not contain command timeout descriptors. If available they are output. If supported there are two values: a nominal command timeout and a recommended command timeout. Both have units of seconds. A value of zero means that no timeout is indicated and this is shown in -the corresponding decoded output as "-". +the corresponding decoded output as "\-". .TP \fB\-s\fR, \fB\-\-sa\fR=\fISA\fR the \fIDEVICE\fR will be queried for a command with the given service diff --git a/doc/sg_persist.8 b/doc/sg_persist.8 index 296a1071..110e5f19 100644 --- a/doc/sg_persist.8 +++ b/doc/sg_persist.8 @@ -1,4 +1,4 @@ -.TH SG_PERSIST "8" "September 2007" "sg3_utils\-1.25" SG3_UTILS +.TH SG_PERSIST "8" "October 2007" "sg3_utils\-1.25" SG3_UTILS .SH NAME sg_persist \- sends a SCSI PERSISTENT RESERVE (IN or OUT) command to manipulate registrations and reservations @@ -10,7 +10,7 @@ to manipulate registrations and reservations [\fIOPTIONS\fR] \fI\-\-device=DEVICE\fR .PP .B sg_persist -\fI--help\fR | \fI--version\fR +\fI\-\-help\fR | \fI\-\-version\fR .SH DESCRIPTION .\" Add any additional description here .PP diff --git a/doc/sg_read_buffer.8 b/doc/sg_read_buffer.8 index 511f7944..354f3672 100644 --- a/doc/sg_read_buffer.8 +++ b/doc/sg_read_buffer.8 @@ -13,7 +13,7 @@ Sends a SCSI READ BUFFER command to the \fIDEVICE\fR, and if there is a response either decodes it, prints it in hexadecimal or sends it in binary to stdout. If a response is received for a "descriptor" mode then, in the absence of \fI\-\-hex\fR and \fI\-\-raw\fR, it is -decoded. Response for non-descriptor modes are output in hexadecimal +decoded. Response for non\-descriptor modes are output in hexadecimal unless the \fI\-\-raw\fR option is given. .SH OPTIONS Arguments to long options are mandatory for short options as well. diff --git a/doc/sg_requests.8 b/doc/sg_requests.8 index 1e349a62..afed2060 100644 --- a/doc/sg_requests.8 +++ b/doc/sg_requests.8 @@ -54,7 +54,7 @@ of operations per second. .TP \fB\-v\fR, \fB\-\-verbose\fR increase the level of verbosity, (i.e. debug output). -Additionally the response (if received) is output in ASCII-HEX. Use +Additionally the response (if received) is output in ASCII\-HEX. Use this option multiple times for greater verbosity. .TP \fB\-V\fR, \fB\-\-version\fR diff --git a/doc/sg_safte.8 b/doc/sg_safte.8 index 81d3d987..9f0d2661 100644 --- a/doc/sg_safte.8 +++ b/doc/sg_safte.8 @@ -24,6 +24,8 @@ overall enclosure status as reported by the option is reported. .SH OPTIONS Arguments to long options are mandatory for short options as well. +The options are arranged in alphabetical order based on the long +option name. .TP \fB\-c\fR, \fB\-\-config\fR will issues a @@ -103,9 +105,9 @@ http://www.intel.com/design/servers/ipmi/saf\-te.htm As the specification was never finalized this document serves as the de\-facto standard. .PP -A similar functionality is provided by the SPC\-4 SCSI Enclosure -Services devices (Peripheral device type 0xd), which can be queried -with the sg_ses utility. +Similar functionality is provided by SPC\-4 SCSI Enclosure Services +devices (Peripheral device type 0xd), which can be queried with the +sg_ses utility. .SH EXAMPLES To view the configuration: .PP @@ -116,7 +118,7 @@ To view the device slot status: sg_safte \-\-devstatus /dev/sg1 .PP .SH EXIT STATUS -The exit status of sg_ses is 0 when it is successful. Otherwise see +The exit status of sg_safte is 0 when it is successful. Otherwise see the sg3_utils(8) man page. .SH AUTHORS Written by Hannes Reinecke and Douglas Gilbert. @@ -128,4 +130,4 @@ Copyright \(co 2004\-2007 Hannes Reinecke and Douglas Gilbert This software is distributed under a FreeBSD license. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "SEE ALSO" -.B sg_inq, sg_ses (in sg3_utils package); safte-monitor (internet) +.B sg_inq, sg_ses (in sg3_utils package); safte\-monitor (internet) diff --git a/doc/sg_sat_identify.8 b/doc/sg_sat_identify.8 index 572cf276..922f6186 100644 --- a/doc/sg_sat_identify.8 +++ b/doc/sg_sat_identify.8 @@ -15,7 +15,7 @@ PACKET DEVICE command to \fIDEVICE\fR and outputs the response. The devices that respond to these commands are ATA disks and ATAPI devices respectively. Rather than send these commands directly to the device they are sent via a SCSI transport which is assumed to contain a SCSI to ATA Translation (SAT) -Layer (SATL). The SAT standard (SAT ANSI INCITS 431-2007, prior draft: +Layer (SATL). The SAT standard (SAT ANSI INCITS 431\-2007, prior draft: sat\-r09.pdf at www.t10.org) defines two SCSI "ATA PASS\-THROUGH" commands: one using a 16 byte "cdb" and the other with a 12 byte cdb. This utility defaults to using the 16 byte cdb variant. diff --git a/doc/sg_sat_set_features.8 b/doc/sg_sat_set_features.8 index f4ebed5e..0f4128fd 100644 --- a/doc/sg_sat_set_features.8 +++ b/doc/sg_sat_set_features.8 @@ -11,11 +11,11 @@ SCSI to ATA Translation (SAT) layer .\" Add any additional description here .PP This utility sends an ATA SET FEATURES command to the \fIDEVICE\fR. -This command is used to change settings of ATA non-packet (i.e. disks) and +This command is used to change settings of ATA non\-packet (i.e. disks) and packet devices (e.g. cd/dvd drives). Rather than send the SET FEATURES command directly to the device it is sent via a SCSI transport which is assumed to contain a SCSI to ATA Translation (SAT) Layer (SATL). The SAT -standard (SAT ANSI INCITS 431-2007; prior draft: sat\-r09.pdf at www.t10.org) +standard (SAT ANSI INCITS 431\-2007; prior draft: sat\-r09.pdf at www.t10.org) defines two SCSI "ATA PASS\-THROUGH" commands: one using a 16 byte "cdb" and the other with a 12 byte cdb. This utility defaults to the 16 byte cdb variant. @@ -24,7 +24,7 @@ The SATL may be in an operating system driver, in host bus adapter firmware or in some external enclosure. .PP The features can be read using the sg_sat_identify utility which uses either -the ATA IDENTIFY DEVICE (for non-packet devices) or the IDENTIFY PACKET +the ATA IDENTIFY DEVICE (for non\-packet devices) or the IDENTIFY PACKET DEVICE (for packet devices) command. .SH OPTIONS Arguments to long options are mandatory for short options as well. diff --git a/doc/sg_senddiag.8 b/doc/sg_senddiag.8 index 52f3446d..dd880e35 100644 --- a/doc/sg_senddiag.8 +++ b/doc/sg_senddiag.8 @@ -1,4 +1,4 @@ -.TH SG_SENDDIAG "8" "February 2007" "sg3_utils\-1.24" SG3_UTILS +.TH SG_SENDDIAG "8" "October 2007" "sg3_utils\-1.25" SG3_UTILS .SH NAME sg_senddiag \- performs a SCSI SEND DIAGNOSTIC command .SH SYNOPSIS @@ -16,7 +16,7 @@ sg_senddiag \- performs a SCSI SEND DIAGNOSTIC command .\" Add any additional description here .PP This utility sends a SCSI SEND DIAGNOSTIC command to the \fIDEVICE\fR. It -can issue self-tests, find supported diagnostic pages or send arbitrary +can issue self\-tests, find supported diagnostic pages or send arbitrary diagnostic pages. .PP When the \fI\-\-list\fR option and a \fIDEVICE\fR are given then the utility @@ -34,12 +34,12 @@ Arguments to long options are mandatory for short options as well. .TP \fB\-d\fR, \fB\-\-doff\fR set the Device Offline (DevOffL) bit (default is clear). Only significant -when \fI\-\-test\fR option is set for the default self-test. When set other +when \fI\-\-test\fR option is set for the default self\-test. When set other operations on any logical units controlled by the this device server (target) -may be affected (delayed) while a default self-test is underway. +may be affected (delayed) while a default self\-test is underway. .TP \fB\-e\fR, \fB\-\-extdur\fR -outputs the expected extended self-test duration. The duration is given in +outputs the expected extended self\-test duration. The duration is given in seconds (and minutes in parentheses). This figure is obtained from mode page 0xa (i.e. the control mode page). .TP @@ -80,20 +80,20 @@ a diagnostic page to be sent with the SCSI SEND DIAGNOSTIC command. Mostly likely the \fI\-\-pf\fR option should also be given. .TP \fB\-s\fR, \fB\-\-selftest\fR=\fIST\fR -where \fIST\fR is the self-test code. The default value is 0 which is +where \fIST\fR is the self\-test code. The default value is 0 which is inactive. Some other values: .br - \fB1\fR : background short self-test + \fB1\fR : background short self\-test .br - \fB2\fR : background extended self-test + \fB2\fR : background extended self\-test .br - \fB4\fR : aborts a (background) self-test that is in progress + \fB4\fR : aborts a (background) self\-test that is in progress .br - \fB5\fR : foreground short self-test + \fB5\fR : foreground short self\-test .br - \fB6\fR : foreground extended self-test + \fB6\fR : foreground extended self\-test .br -This option is mutually exclusive with default self-test (i.e. +This option is mutually exclusive with default self\-test (i.e. can't have (\fIST\fR > 0) and \fI\-\-test\fR). .TP \fB\-t\fR, \fB\-\-test\fR @@ -104,9 +104,9 @@ with this option. .TP \fB\-u\fR, \fB\-\-uoff\fR set the Unit Offline (UnitOffL) bit (default is clear). Only significant -when \fI\-\-test\fR option is set for the default self-test. When set other +when \fI\-\-test\fR option is set for the default self\-test. When set other operations on this logical unit may be affected (delayed) while a default -self-test is underway. Some devices (e.g. Fujitsu disks) do more tests +self\-test is underway. Some devices (e.g. Fujitsu disks) do more tests when this bit is set. .TP \fB\-v\fR, \fB\-\-verbose\fR @@ -115,21 +115,21 @@ increase level of verbosity. Can be used multiple times. \fB\-V\fR, \fB\-\-version\fR print out version string then exit. .SH NOTES -All devices should support the default self-test. The 'short' self-test -codes should complete in 2 minutes or less. The 'extended' self-test +All devices should support the default self\-test. The 'short' self\-test +codes should complete in 2 minutes or less. The 'extended' self\-test codes' maximum duration is vendor specific (e.g. a little over 10 minutes -with the author's disks). The foreground self-test codes wait until they -are completed while the background self-test codes return immediately. The -results of both foreground and background self-test codes are placed in -the 'self-test results' log page (see sg_logs(8)). The SCSI command timeout +with the author's disks). The foreground self\-test codes wait until they +are completed while the background self\-test codes return immediately. The +results of both foreground and background self\-test codes are placed in +the 'self\-test results' log page (see sg_logs(8)). The SCSI command timeout for this utility is set to 60 minutes to allow for slow foreground extended -self-tests. +self\-tests. .PP If the \fIDEVICE\fR is a disk then no file systems residing on that disk -should be mounted during a foreground self-test. The reason is that other -SCSI commands may become queued behind the foreground self-test and timeout. +should be mounted during a foreground self\-test. The reason is that other +SCSI commands may become queued behind the foreground self\-test and timeout. .PP -When the \fI\-\-raw=H,H...\fR option is given then self-tests should not +When the \fI\-\-raw=H,H...\fR option is given then self\-tests should not be selected. However the \fB\-\-pf\fR (i.e. "page format") option should be given. The length of the diagnostic page to be sent is derived from the number of bytes given to the \fI\-\-raw=H,H...\fR option. The diagnostic @@ -169,11 +169,11 @@ or using '\-\-old' (or '\-O) as the first option. .TP \fB\-doff\fR set the Device Offline (DevOffL) bit (default is clear). Only significant -when \fI\-t\fR option is set for the default self-test. Equivalent to +when \fI\-t\fR option is set for the default self\-test. Equivalent to \fI\-\-doff\fR in the main description. .TP \fB\-e\fR -outputs the expected extended self-test duration. Equivalent to +outputs the expected extended self\-test duration. Equivalent to \fI\-\-extdur\fR in the main description. .TP \fB\-h\fR @@ -214,12 +214,12 @@ a diagnostic page to be sent with the SCSI SEND DIAGNOSTIC command. Mostly likely the \fI\-pf\fR option should also be given. .TP \fB\-s\fR=\fIST\fR -where \fIST\fR is the self-test code. The default value is 0 which is -inactive. A value of 1 selects a background short self-test; 2 selects -a background extended self-test; 5 selects a foreground short self-test; +where \fIST\fR is the self\-test code. The default value is 0 which is +inactive. A value of 1 selects a background short self\-test; 2 selects +a background extended self\-test; 5 selects a foreground short self\-test; 6 selects a foreground extended test. A value of 4 will abort -a (background) self-test that is in progress. This option is mutually -exclusive with default self-test (i.e. \fI\-t\fR). +a (background) self\-test that is in progress. This option is mutually +exclusive with default self\-test (i.e. \fI\-t\fR). .TP \fB\-t\fR sets the _default_ Self Test (SelfTest) bit. By default this is clear (0). diff --git a/doc/sg_ses.8 b/doc/sg_ses.8 index d0b5702d..ee29504c 100644 --- a/doc/sg_ses.8 +++ b/doc/sg_ses.8 @@ -1,4 +1,4 @@ -.TH SG_SES "8" "September 2007" "sg3_utils\-1.25" SG3_UTILS +.TH SG_SES "8" "October 2007" "sg3_utils\-1.25" SG3_UTILS .SH NAME sg_ses \- send controls and fetch status from a SCSI Enclosure Services (SES) device @@ -23,6 +23,8 @@ diagnostic pages supported by the device (including SES pages) are listed. .SH OPTIONS Arguments to long options are mandatory for short options as well. +The options are arranged in alphabetical order based on the long +option name. .TP \fB\-b\fR, \fB\-\-byte\fR=\fIB1\fR some control pages need byte 1 (i.e. the second byte) of the cdb set. @@ -42,7 +44,7 @@ specified (limit 512). This allows the parameters to a control diagnostic page to be specified. The string given should not include the first 4 bytes (i.e. page code and length). See next entry for using stdin. .TP -\fB\-d\fR, \fB\-\-data\fR=- +\fB\-d\fR, \fB\-\-data\fR=\- reads a data string from stdin. Spaces, tabs and line feeds additionally are permitted as separators. .TP diff --git a/doc/sg_start.8 b/doc/sg_start.8 index f129f1a1..86e2d032 100644 --- a/doc/sg_start.8 +++ b/doc/sg_start.8 @@ -1,4 +1,4 @@ -.TH SG_START "8" "January 2007" "sg3_utils\-1.23" SG3_UTILS +.TH SG_START "8" "October 2007" "sg3_utils\-1.25" SG3_UTILS .SH NAME sg_start \- send SCSI START STOP UNIT command to start, stop, load or eject medium @@ -56,9 +56,9 @@ device with removable medium. Might be ignored (prevented), see below. print out the usage message then exit. .TP \fB\-f\fR, \fB\-\-fl\fR=\fIFL\fR -sets the format layer number for the disc to "jump" to (defined in MMC-5). +sets the format layer number for the disc to "jump" to (defined in MMC\-5). Values of \fIFL\fR can be 0 to 3. When this option is chosen, the FL, LoEj -and Start bits are set in the cdb as required by MMC-5; thus the user does +and Start bits are set in the cdb as required by MMC\-5; thus the user does not need to set the \fI\-\-start\fR and/or \fI\-\-load\fR options. .TP \fB\-i\fR, \fB\-\-immed\fR diff --git a/doc/sg_stpg.8 b/doc/sg_stpg.8 index c1739045..9c68cdef 100644 --- a/doc/sg_stpg.8 +++ b/doc/sg_stpg.8 @@ -34,9 +34,11 @@ GROUPS command is also described in that document. .PP .SH OPTIONS Arguments to long options are mandatory for short options as well. +The options are arranged in alphabetical order based on the long +option name. .TP \fB\-a\fR, \fB\-\-active\fR -set active/non-optimized state. +set active/non\-optimized state. .TP \fB\-h\fR, \fB\-\-help\fR output the usage message then exit. @@ -44,16 +46,16 @@ output the usage message then exit. \fB\-H\fR, \fB\-\-hex\fR output response to the REPORT TARGET PORT GROUPS command in hex then exit. .TP -\fB\-o\fR, \fB\-\-optimized\fR -set active/optimized state. If no other state options or \fI\-\-tp=\fR -option are given then active/optimized is the default state. -.TP \fB\-O\fR, \fB\-l\fR, \fB\-\-offline\fR set offline state. This is the appropriate state to set a target port to prior to removing the device. Note that a relative target port identifier should be given with this state (rather than a target port group identifier that all other states take). .TP +\fB\-o\fR, \fB\-\-optimized\fR +set active/optimized state. If no other state options or \fI\-\-tp=\fR +option are given then active/optimized is the default state. +.TP \fB\-r\fR, \fB\-\-raw\fR output response to the REPORT TARGET PORT GROUPS command in binary to stdout then exit. @@ -69,7 +71,7 @@ a number or an abbreviation can be given. A number is assumed to be a decimal number unless it is prefixed by "0x" or has a trailing "h" in which case a hexadecimal value is assumed. Only the values 0, 1, 2, 3 or 14 are accepted. The accepted abbreviations are "an", "ao", "o", "s" -or "u"; which represent active/non-optimized(1), active/optimized(0), +or "u"; which represent active/non\-optimized(1), active/optimized(0), offline(14), standby(2) or unavalable(3) respectively. .TP \fB\-t\fR, \fB\-\-tp\fR=\fIP,P...\fR diff --git a/doc/sg_vpd.8 b/doc/sg_vpd.8 index 2212360a..bdb1fd17 100644 --- a/doc/sg_vpd.8 +++ b/doc/sg_vpd.8 @@ -22,6 +22,8 @@ When no options are given, other than a \fIDEVICE\fR, then the "Supported VPD pages" (0x0) VPD page is fetched and decoded. .SH OPTIONS Arguments to long options are mandatory for short options as well. +The options are arranged in alphabetical order based on the long +option name. .TP \fB\-e\fR, \fB\-\-enumerate\fR list the names of the known VPD pages, first the standard pages, then the diff --git a/doc/sg_write_buffer.8 b/doc/sg_write_buffer.8 index 77b0d2a7..124bc6c0 100644 --- a/doc/sg_write_buffer.8 +++ b/doc/sg_write_buffer.8 @@ -48,7 +48,7 @@ one (e.g. '\-\-mode=xxx') or use the '\-hh' option. .TP \fB\-o\fR, \fB\-\-offset\fR=\fIOFF\fR this option sets the buffer offset field in the cdb. \fIOFF\fR is a value -between 0 (default) and 2**24-1 . It is a byte offset. +between 0 (default) and 2**24\-1 . It is a byte offset. .TP \fB\-r\fR, \fB\-\-raw\fR read data from stdin until an EOF is detected. This data is sent with diff --git a/doc/sgm_dd.8 b/doc/sgm_dd.8 index 1a6ebe15..6e895891 100644 --- a/doc/sgm_dd.8 +++ b/doc/sgm_dd.8 @@ -27,7 +27,7 @@ If both \fIIFILE\fR and \fIOFILE\fR are sg devices then memory mapped transfers are performed on \fIIFILE\fR. If no other flags are specified then indirect IO is performed on \fIOFILE\fR. If 'oflag=dio' is given then direct IO is attempted on \fIOFILE\fR. If 'oflag=smmap' is given then -shared mmap-ed IO (sharing the mmap-ed reserve buffer associated with +shared mmap\-ed IO (sharing the mmap\-ed reserve buffer associated with \fIIFILE\fR) is attempted. In both latter cases if the faster IO option is not available, they fall back to indirect IO and report this at the end of the copy. @@ -193,7 +193,7 @@ has no affect, just a placeholder. smmap is only active for oflag. It sets shared mmap IO usage on \fIOFILE\fR if it is a sg device node. The \fIIFILE\fR also needs to be a sg device -node (or there is no mmap-ed reserve buffer to share). +node (or there is no mmap\-ed reserve buffer to share). .SH RETIRED OPTIONS Here are some retired options that are still present: .TP diff --git a/src/sg_vpd.c b/src/sg_vpd.c index 8b876ab6..55457e96 100644 --- a/src/sg_vpd.c +++ b/src/sg_vpd.c @@ -52,7 +52,7 @@ */ -static char * version_str = "0.24 20071012"; /* spc4r11 + 07-153r1 */ +static char * version_str = "0.24 20071016"; /* spc4r11 + 07-153r1 */ extern void svpd_enumerate_vendor(void); extern int svpd_decode_vendor(int sg_fd, int num_vpd, int subvalue, diff --git a/src/sg_vpd_vendor.c b/src/sg_vpd_vendor.c index 95365fe6..31845f25 100644 --- a/src/sg_vpd_vendor.c +++ b/src/sg_vpd_vendor.c @@ -95,17 +95,18 @@ static unsigned char rsp_buff[MX_ALLOC_LEN + 2]; /* Supported vendor specific VPD pages */ /* 'subvalue' used to disambiguate, 'vendor' should be set */ +/* Arrange in alphabetical order by acronym */ static struct svpd_values_name_t vendor_vpd_pg[] = { {VPD_V_DATC_SEA, 0, -1, 1, "datc", "Date code (Seagate)"}, {VPD_V_DEV_BEH_SEA, 0, -1, 1, "devb", "Device behavior (Seagate)"}, + {VPD_V_EDID_RDAC, 0, -1, 1, "edid", "Extended device identification " + "(RDAC)"}, + {VPD_V_FEAT_RDAC, 1, -1, 1, "feat", "Feature Parameters (RDAC)"}, {VPD_V_FIRM_SEA, 0, -1, 1, "firm", "Firmware numbers (Seagate)"}, {VPD_V_JUMP_SEA, 0, -1, 1, "jump", "Jump setting (Seagate)"}, - {VPD_V_UPR_EMC, 1, -1, 1, "upr", "Unit path report (EMC)"}, - {VPD_V_SVER_RDAC, 1, -1, 1, "sver", "Software version (RDAC)"}, - {VPD_V_FEAT_RDAC, 1, -1, 1, "feat", "Feature Parameters (RDAC)"}, {VPD_V_SUBS_RDAC, 0, -1, 1, "sub", "Subsystem identifier (RDAC)"}, - {VPD_V_EDID_RDAC, 0, -1, 1, "edid", "Extended device identification " - "(RDAC)"}, + {VPD_V_SVER_RDAC, 1, -1, 1, "sver", "Software version (RDAC)"}, + {VPD_V_UPR_EMC, 1, -1, 1, "upr", "Unit path report (EMC)"}, {VPD_V_VAC_RDAC, 0, -1, 1, "vac", "Volume access control (RDAC)"}, {0, 0, 0, 0, NULL, NULL}, }; |