Load sg3_utils-1.19 into trunk/.

git-svn-id: svn://localhost/trunk@65 6180dd3e-e324-4e3e-922d-17de1ae2f315

Author: doug-gilbert

CHANGELOG

@@ -2,6 +2,43 @@ 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.
 
+Changelog for sg3_utils-1.19 [20060127]
+  - sg_start: accept '--' options (e.g. 'sg_start --stop')
+    - add '--fl=<n>' option for jump to format layer (mmc5)
+  - sg_logs: background scan log page, resync with sbc3r03
+    - add '-scum' and '-sthr' for setting defaults
+    - add device statistics log page (ssc + adc)
+    - fix "last n" deferred errors/error events incrementing
+    - partial addition of log subpages (spc4r03)
+  - sg_get_config: sync features with mmc5 rev 02b
+  - sg_wr_mode: mask out dpofua bit in mode select header
+  - sg_inq: try harder with '-A' to identify ATA device
+    - broaden meaning of '-d' option to decode ...
+    - decode software interface id VPD page ('-p=84 -d')
+    - decode device capabilities (ssc) VPD page ('-p=b0 -d')
+  - sginfo: correct defect list handling ('-d' and '-G')
+  - sg_verify: improve error processing (e.g. medium errors)
+  - sg_ses: scsi target_initiator port additional element
+     status (06-036r0)
+  - many: arguments that currently accept '0x' or '0X' to
+     indicate a hex number may alternatively take a trailing
+     'h' or 'H' to indicate hex
+  - sg_lib: update asc/ascq strings (spc4r03)
+  - sg_lib+sg_cmds: make independent of linux via
+    sg_pt.h function based interface.
+    - linux pass through code placed in sg_pt_linux.c
+    - rename sg_include.h to sg_linux_inc.h
+    - linux specific code in sg_lib.[hc] moved to
+      sg_io_linux.[hc]
+  - port to FreeBSD: using sg_pt_freebsd.c
+  - port to Tru64: using sg_pt_osf1.c
+  - sg_cmds: add sg_ll_get_config(), sg_ll_format_unit(),
+     sg_ll_reassign_blocks(), sg_ll_persistent_reserve_in+out(),
+     sg_ll_read_long10(), sg_ll_verify10(), sg_ll_write_long10()
+  - sg_persist: add "allow commands" to report capabilities
+  - sg_persist_tst: (examples) takes device node as argument
+  - sg_luns: add "security protocol" wlun
+
 Changelog for sg3_utils-1.18 [20051118]
   - sg_map26: new utility to map sg devices in lk 2.6
   - sg_luns: luns > 16,384 (sam-4 rev 4)

COVERAGE

@@ -6,12 +6,12 @@ on the right. The second table lists supported ATA commands.
 
 SCSI command        sg3_utils utilities that use this SCSI command
 ------------        -------------------------------------------------
-GET CONFIGURATION   sg_get_config
+GET CONFIGURATION   sg_get_config, ++
 INQUIRY             sg_dd, sg_format, sg_inq, sginfo,
 		    sg_logs, sg_map('-i'), sg_modes, sg_opcodes,
 		    sg_persist, sg_scan, sg_ses, ++
-FORMAT UNIT         sg_format
-LOG SELECT          sg_logs('-r'), ++
+FORMAT UNIT         sg_format, ++
+LOG SELECT          sg_logs('-r', '-scum' or '-sthr'), ++
 LOG SENSE           sg_logs, ++
 MODE SELECT(6)      sg_wr_mode, sginfo, sg_format,
 		    sg_emc_trespass, ++
@@ -21,9 +21,9 @@ MODE SENSE(6)       sg_modes, sg_wr_mode, sginfo, sg_format,
 		    sg_senddiag('-e'), ++
 MODE SENSE(10)      sg_modes, sg_wr_mode, sginfo, sg_format,
 		    sg_senddiag('-e'), ++
-PERSISTENT IN       sg_persist
-PERSISTENT OUT      sg_persist
-PREVENT ALLOW MEDIUM REMOVAL            sg_prevent, ++
+PERSISTENT IN       sg_persist ++
+PERSISTENT OUT      sg_persist ++
+PREVENT ALLOW MEDIUM REMOVAL        sg_prevent, ++
 READ(6)             sg_dd, sgm_dd, sgp_dd, sg_read
 READ(10)            sg_dd, sgm_dd, sgp_dd, sg_read
 READ(12)            sg_dd, sgm_dd, sgp_dd, sg_read
@@ -34,8 +34,8 @@ READ CAPACITY(16)   sg_readcap, sg_dd, sgm_dd, sgp_dd, sg_format, ++
 READ DEFECT(10)     sginfo, sg_reassign, ++
 READ DEFECT(12)     sginfo
 READ LONG (10)      sg_read_long, sg_dd
-READ MEDIA SERIAL NUMBER        sg_rmsn, ++
-REASSIGN BLOCKS     sg_reassign
+READ MEDIA SERIAL NUMBER     sg_rmsn, ++
+REASSIGN BLOCKS     sg_reassign, ++
 RECEIVE DIAGNOSTIC  sg_senddiag, sg_ses, ++
 REPORT DEVICE IDENTIFIER     sg_ident, ++
 REPORT LUNS         sg_luns, ++
@@ -44,7 +44,7 @@ REPORT SUPPORTED TASK MANAGEMENT FUNCTIONS    sg_opcodes
 REPORT TARGET PORT GROUPS       sg_rtpg, ++
 REQUEST SENSE       sg_requests, ++
 SEND DIAGNOSTIC     sg_senddiag, sg_ses, ++
-SET DEVICE IDENTIFIER        sg_ident, ++
+SET DEVICE IDENTIFIER   sg_ident, ++
 START STOP          sg_start, ++
 SYNCHRONIZE CACHE(10)   sg_sync, sg_dd, sgm_dd, sgp_dd, ++
 TEST UNIT READY     sg_turs, sg_format, ++
@@ -66,4 +66,4 @@ IDENTIFY PACKET DEVICE     sg_inq
 ++  command wrapper found in sg_cmds.c for this command
 
 Doug Gilbert
-14th November 2005
+27th December 2005

CREDITS

@@ -11,6 +11,9 @@ Christophe Varoqui <christophe dot varoqui at free dot fr> original sg_rtpg
 
 Clayton Weaver <cgweav at email dot com> contributed safe_strerror().
 
+Dave Johnson <ddj at ccv dot brown dot edu> improved disk defect list
+      handling [20051218]
+
 Eric Schwartz <emschwar at debian dot org> who wrote these man pages:
         sg_readcap, sg_reset, sg_scan, sg_start, sg_test_rwbuf,
         sg_turs and sginfo
@@ -63,4 +66,4 @@ Trent Piepho <xyzzy at speakeasy dot org> print out some "sense key specific"
 
 
 Doug Gilbert
-26th April 2005
+20th December 2005

INSTALL

@@ -1,22 +1,29 @@
+Unless otherwise noted, these install instructions are for the
+Linux operating system.
+
+By default, the Makefile will build for Linux with a shared library.
+The invocation sequence is:
+
 make
-make install
+make install	[may need root permission]
 
 Unless overridden or edited in the Makefile, INSTDIR places the executables
 in the /usr/local/bin directory, LIBDIR places libraries in the
 /usr/local/lib directory, MANDIR places the man pages in the
-/usr/local/man directory and INCLUDEDIR places header files in the
-/usr/local/include/scsi directory.
+/usr/local/share/man directory and INCLUDEDIR places header files in the
+/usr/local/include/scsi directory. For FreeBSD the default MANDIR is
+/usr/local/man .
 
 Other Makefile targets that might be useful:
 make clean      # remove .o, executables, core and .depend file
 make depend     # generate dependency hierarchy in .depend file
 make dep        # same as 'make depend'
 make sg_inq     # build a specific executable (e.g. 'sg_inq')
 make uninstall  # removes executables, libraries and build remnants
-make -f lib_no_lib/Makefile.no_lib  # build without a library
+make -f no_lib/Makefile.linux  # build without a library
 
 ./make_no_lib.sh sg_inq  # is a simple script; in this case it expands to:
-                         # make -f lib_no_lib/Makefile.no_lib sg_inq
+                         # make -f no_lib/Makefile.linux sg_inq
 
 Note that the main Makefile does _not_ call the Makefiles in the
 subdirectories (i.e. archive, examples and utils directories).
@@ -36,19 +43,18 @@ directory. If an executable cannot find the libsgutils shared library
 to the /etc/ld.so.conf file may be required in some distributions.
 
 A "spec" file is included for building rpm packages. It is called
-sg3_utils.spec and is in the "rpm" subdirectory. To build binary and
-source rpms place a copy of the gzipped tarball in the "SOURCES" directory
-and place a copy of sg3_utils.spec in the "SPEC" directory. These
-directories are found under /usr/src/redhat on redhat distributions. Then
-from the "SPEC" directory execute "rpmbuild -ba sg3_utils.spec". If all
-goes well a source rpm should be found in the SRPMS directory and binary
-rpms in the RPMS/i386 directory (for i386 architecture). Note the spec
-file will only build those utilities in the main directory. When the
-sg3_utils binary rpm is installed the executables and their associated man
-pages should be placed in appropriate places. The sg3_utils.spec file also
-builds a libsgutils shared object (shared library) and a libsgutils-*-devel
-shared object with a static library and the sg_lib.h and sg_cmds.h header
-files.
+sg3_utils.spec . To build binary and source rpms place a copy of the
+gzipped tarball in the "SOURCES" directory and place a copy of
+sg3_utils.spec in the "SPEC" directory. These directories are found under
+/usr/src/redhat on redhat/fedora distributions. Then from the "SPEC"
+directory execute "rpmbuild -ba sg3_utils.spec". If all goes well a source
+rpm should be found in the SRPMS directory and binary rpms in the RPMS/i386
+directory (for i386 architecture). Note the spec file will only build those
+utilities found in the main directory. When the sg3_utils binary rpm is
+installed the executables and their associated man pages should be placed in
+appropriate places. The sg3_utils.spec file also builds a libsgutils shared
+object (shared library) and a libsgutils-*-devel shared object with a static
+library and the sg_lib.h, sg_cmds.h and sg_pt.h header files.
 
 Binary rpms (at least in the RedHat distribution) tend to install
 executables in /usr/bin and libraries in /usr/lib .
@@ -62,7 +68,27 @@ the sg3_utils source directory) if all goes well.
 
 If the shared object (library) is troublesome or unwanted then
 a "no_lib" version of the Makefile and the sg3_utils.spec file
-can be found in the "lib_no_lib" subdirectory.
+can be found in the "no_lib" subdirectory.
+
+
+In FreeBSD, the utilities can be built with "make -f Makefile.freebsd".
+This will build a shared object (i.e. libsgutils.so and friends) that
+the utilities depend on. To install use "make -f Makefile.freebsd install".
+These makes depend on libtool. To build without reliance on a shared
+library (and thus libtool) use "make -f no_lib/Makefile.freebsd" (or
+execute the "make_no_lib_freebsd.sh" script which does the same thing).
+Utilities that are linux specific (e.g. sg_map) are not built for
+FreeBSD.
+
+
+In Tru64, the utilities can be built with "make -f Makefile.osf1".
+This will build a shared object (i.e. libsgutils.so and friends) that
+the utilities depend on. To install use "make -f Makefile.osf1 install".
+These makes depend on libtool. To build without reliance on a shared
+library (and thus libtool) use "make -f no_lib/Makefile.osf1" (or
+execute the "make_no_lib_osf1.sh" script which does the same thing).
+Utilities that are linux specific (e.g. sg_map) are not built for
+Tru64.
 
 
-28th August 2005
+24th January 2006

Makefile

@@ -27,15 +27,16 @@ MAN_PGS = sg_dd.8 sgp_dd.8 sgm_dd.8 sg_read.8 sg_map.8 sg_scan.8 sg_rbuf.8 \
 	sg_map26.8
 MAN_PREF = man8
 
-HEADERS = sg_lib.h sg_cmds.h
-
+HEADERS = sg_lib.h sg_cmds.h sg_pt.h
 
+OS_FLAGS = -DSG3_UTILS_LINUX
 LARGE_FILE_FLAGS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+# S_CFLAGS = $(OS_FLAGS) $(LARGE_FILE_FLAGS) -DSG_KERNEL_INCLUDES
+S_CFLAGS = $(OS_FLAGS) $(LARGE_FILE_FLAGS)
 
-# CFLAGS = -O2 -Wall -W $(LARGE_FILE_FLAGS)
-CFLAGS = -g -O2 -Wall -W $(LARGE_FILE_FLAGS)
-# CFLAGS = -g -O2 -W -DSG_KERNEL_INCLUDES $(LARGE_FILE_FLAGS)
-# CFLAGS = -g -O2 -Wall -W -pedantic -std=c99 $(LARGE_FILE_FLAGS)
+# CFLAGS = -O2 -Wall -W
+CFLAGS = -g -O2 -Wall -W
+# CFLAGS = -g -O2 -Wall -W -pedantic -std=c99
 
 CFLAGS_PTHREADS = -D_REENTRANT
 
@@ -49,23 +50,29 @@ LIB_VINFO = 1:0:0
 all: $(EXECS)
 
 depend dep:
-	for i in *.c; do $(CC) $(INCLUDES) $(CFLAGS) -M $$i; \
+	for i in *.c; do $(CC) $(INCLUDES) $(CFLAGS) $(S_CFLAGS) -M $$i; \
 	done > .depend
 
 clean:
 	/bin/rm -f *.o $(EXECS) core* .depend *.a *.la *.lo
 	/bin/rm -rf .libs
 
 
+.c.o:
+	$(CC) $(INCLUDES) $(CFLAGS) $(S_CFLAGS) -c -o $@ $<
+
 sg_lib.lo: sg_lib.o
 	libtool --mode=compile $(CC) -c sg_lib.c
 
 sg_cmds.lo: sg_cmds.o
 	libtool --mode=compile $(CC) -c sg_cmds.c
 
-libsgutils.la: sg_lib.lo sg_cmds.lo
+sg_pt_linux.lo: sg_pt_linux.o
+	libtool --mode=compile $(CC) -c sg_pt_linux.c
+
+libsgutils.la: sg_lib.lo sg_cmds.lo sg_pt_linux.lo
 	libtool --mode=link $(LD) -o libsgutils.la sg_lib.lo sg_cmds.lo \
-	-rpath $(LIBDIR) -version-info $(LIB_VINFO)
+	sg_pt_linux.lo -rpath $(LIBDIR) -version-info $(LIB_VINFO)
 
 # libsgutils.la: sg_lib.lo sg_cmds.lo
 #	libtool --mode=link $(LD) -o libsgutils.la sg_lib.lo sg_cmds.lo \
@@ -74,43 +81,44 @@ libsgutils.la: sg_lib.lo sg_cmds.lo
 sg_inq: sg_inq.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^ 
 
-sg_dd: sg_dd.o llseek.o libsgutils.la
+sg_dd: sg_dd.o llseek.o sg_io_linux.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^
 
-sg_scan: sg_scan.o libsgutils.la
+sg_scan: sg_scan.o sg_io_linux.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^ 
 
-sginfo: sginfo.o libsgutils.la
+sginfo: sginfo.o sg_io_linux.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^
 
 sg_start: sg_start.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^ 
 
-sg_rbuf: sg_rbuf.o libsgutils.la
+sg_rbuf: sg_rbuf.o sg_io_linux.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^
 
 sg_readcap: sg_readcap.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^
 
 sgp_dd.o: sgp_dd.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(CFLAGS_PTHREADS) -c $<
+	$(CC) $(INCLUDES) $(CFLAGS) $(S_CFLAGS) $(CFLAGS_PTHREADS) \
+	-c -o sgp_dd.o $<
 
-sgp_dd: sgp_dd.o llseek.o libsgutils.la
+sgp_dd: sgp_dd.o llseek.o sg_io_linux.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^ -lpthread
 
-sgm_dd: sgm_dd.o llseek.o libsgutils.la
+sgm_dd: sgm_dd.o llseek.o sg_io_linux.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^
 
-sg_map: sg_map.o libsgutils.la
+sg_map: sg_map.o sg_io_linux.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^
 
 sg_turs: sg_turs.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^
 
-sg_test_rwbuf: sg_test_rwbuf.o libsgutils.la
+sg_test_rwbuf: sg_test_rwbuf.o sg_io_linux.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^
 
-sg_read: sg_read.o llseek.o libsgutils.la
+sg_read: sg_read.o llseek.o sg_io_linux.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^
 
 sg_reset: sg_reset.o
@@ -125,7 +133,7 @@ sg_logs: sg_logs.o libsgutils.la
 sg_senddiag: sg_senddiag.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^
 
-sg_opcodes: sg_opcodes.o libsgutils.la
+sg_opcodes: sg_opcodes.o sg_io_linux.o libsgutils.la
 	libtool --mode=link $(LD) -o $@ $(LDFLAGS) $^
 
 sg_persist: sg_persist.o libsgutils.la