correct sg_get_lba_status parameter data length calculation; script doco and cleanup

git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@308 6180dd3e-e324-4e3e-922d-17de1ae2f315

3 files changed, 25 insertions, 8 deletions

diff --git a/scripts/scsi_readcap b/scripts/scsi_readcap
index d4b21a5d..69ad8de9 100755
--- a/scripts/scsi_readcap
+++ b/scripts/scsi_readcap
@@ -10,13 +10,15 @@
 
 verbose=""
 brief=""
+long_opt=""
 
 usage()
 {
-  echo "Usage: scsi_readcap [-b] [-h] [-v] <device>+"
+  echo "Usage: scsi_readcap [-b] [-h] [-l] [-v] <device>+"
   echo "  where:"
   echo "    -b, --brief          output brief capacity data"
   echo "    -h, --help           print usage message"
+  echo "    -1, --long           send longer SCSI READ CAPACITY (16) cdb"
   echo "    -v, --verbose        more verbose output"
   echo ""
   echo "Use SCSI READ CAPACITY command to fetch the size of each <device>"
@@ -34,8 +36,10 @@ while test ! -z "$opt" -a -z "${opt##-*}"; do
   case "$opt" in
     b|-brief) brief="-b" ;;
     h|-help) usage ; exit 0 ;;
+    l|-long) long_opt="--16" ;;
     v|-verbose) verbose="-v" ;;
     vv) verbose="-vv" ;;
+    vvv) verbose="-vvv" ;;
     *) echo "Unknown option: -$opt " ; exit 1 ;;
   esac
   shift
@@ -44,6 +48,10 @@ done
 
 for i
 do
-	echo "sg_readcap $brief $verbose $i"
-        sg_readcap $brief $verbose $i
+	if [ $brief ] ; then
+        	sg_readcap $brief $long_opt $verbose $i 2> /dev/null
+	else
+		echo "sg_readcap $brief $long_opt $verbose $i"
+        	sg_readcap $brief $long_opt $verbose $i
+	fi
 done
diff --git a/scripts/scsi_ready b/scripts/scsi_ready
index 338f671c..371efb72 100755
--- a/scripts/scsi_ready
+++ b/scripts/scsi_ready
@@ -4,16 +4,19 @@
 #
 #  Send a TEST UNIT READY SCSI command to each given device.
 #
-#  This script assumes the sg3_utils package is installed.
+#  This script assumes the sg3_utils package is installed and uses
+#  the sg_turs utility..
 #
 ###############################################
 
 verbose=""
+brief=""
 
 usage()
 {
-  echo "Usage: scsi_ready [-h] [-v] <device>+"
+  echo "Usage: scsi_ready [-b] [-h] [-v] <device>+"
   echo "  where:"
+  echo "    -b, --brief          print 'ready' or 'device not ready' only"
   echo "    -h, --help           print usage message"
   echo "    -v, --verbose        more verbose output"
   echo ""
@@ -30,8 +33,11 @@ opt="$1"
 while test ! -z "$opt" -a -z "${opt##-*}"; do
   opt=${opt#-}
   case "$opt" in
+    b|-brief) brief="1" ;;
     h|-help) usage ; exit 0 ;;
     v|-verbose) verbose="-v" ;;
+    vv) verbose="-vv" ;;
+    vvv) verbose="-vvv" ;;
     *) echo "Unknown option: -$opt " ; exit 1 ;;
   esac
   shift
@@ -40,7 +46,9 @@ done
 
 for i
 do
-	echo "sg_turs $verbose $i"
+	if [ ! $brief ] ; then
+		echo "sg_turs $verbose $i"
+	fi
 	echo -n "    "
         if sg_turs $verbose $i ; then
 		echo "ready"
diff --git a/scripts/scsi_satl b/scripts/scsi_satl
index 12b4c10a..abaa6fc4 100755
--- a/scripts/scsi_satl
+++ b/scripts/scsi_satl
@@ -4,6 +4,7 @@
 # Script to test compliance of SCSI commands on a SCSI to ATA
 # Translation (SAT) Layer (SATL). This script was compiled using
 # sat-r09.pdf found at www.t10.org .
+# The scripts still seems to be valid for sat2r09.pdf .
 # The vintage is SPC-3 and SPC-4 (see www.t10.org).
 #
 # Coverage:
@@ -22,9 +23,9 @@
 #                        device, if packet device add "-p" option
 #
 # This script uses utilities from sg3_utils package (version
-# 1.22 or later) and sdparm (version 0.99 or later)
+# 1.22 or later)
 #
-# Douglas Gilbert 20090815
+# Douglas Gilbert 20090930
 
 
 log=0