sg_inq: update version descriptors to spc5r21; scripts/scsi-sg3_id: update rules; testing folder work

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

3 files changed, 12 insertions, 8 deletions

diff --git a/src/sg_inq.c b/src/sg_inq.c
index 186e5bf6..d3534cb8 100644
--- a/src/sg_inq.c
+++ b/src/sg_inq.c
@@ -51,7 +51,7 @@
 #include "sg_pt_nvme.h"
 #endif
 
-static const char * version_str = "1.99 20190109";    /* SPC-5 rev 20 */
+static const char * version_str = "2.00 20190313";    /* SPC-5 rev 21 */
 
 /* INQUIRY notes:
  * It is recommended that the initial allocation length given to a
diff --git a/src/sg_inq_data.c b/src/sg_inq_data.c
index 96792c58..cd33f755 100644
--- a/src/sg_inq_data.c
+++ b/src/sg_inq_data.c
@@ -47,7 +47,7 @@ const char * sg_ansi_version_arr[16] =
 
 /* table from SPC-5 revision 16 [sorted numerically (from Annex E.9)] */
 /* Can also be obtained from : http://www.t10.org/lists/stds.txt 20170114 */
-/* Corrected against spc5r18 on 20180201 */
+/* Corrected against spc5r21 on 20190312 */
 
 #ifdef SG_SCSI_STRINGS
 
@@ -487,7 +487,8 @@ struct sg_lib_simple_value_name_t sg_version_descriptor_arr[] = {
     {0x1749, "UAS ISO/IEC 14776-251:2014"},
     {0x1761, "ACS-2 (no version claimed)"},
     {0x1762, "ACS-2 ANSI INCITS 482-2013"},
-    {0x1765, "ACS-3 (no version claimed)"},
+    {0x1765, "ACS-3 INCITS 522-2014"},
+    {0x1767, "ACS-4 INCITS 529-2018"},
     {0x1780, "UAS-2 (no version claimed)"},
     {0x1ea0, "SAT (no version claimed)"},
     {0x1ea7, "SAT T10/1711-D rev 8"},
@@ -538,6 +539,8 @@ struct sg_lib_simple_value_name_t sg_version_descriptor_arr[] = {
     {0xffc0, "IEEE 1667 (no version claimed)"},
     {0xffc1, "IEEE 1667-2006"},
     {0xffc2, "IEEE 1667-2009"},
+    {0xffc3, "IEEE 1667-2015"},
+    {0xffc4, "IEEE 1667-2018"},
     {0xffff, NULL},     /* sentinel, leave at end */
 };
 
diff --git a/src/sgp_dd.c b/src/sgp_dd.c
index 6a85c4aa..9321b9af 100644
--- a/src/sgp_dd.c
+++ b/src/sgp_dd.c
@@ -1,7 +1,7 @@
 /* A utility program for copying files. Specialised for "files" that
  * represent devices that understand the SCSI command set.
  *
- * Copyright (C) 1999 - 2018 D. Gilbert and P. Allworth
+ * Copyright (C) 1999 - 2019 D. Gilbert and P. Allworth
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
@@ -68,7 +68,7 @@
 #include "sg_pr2serr.h"
 
 
-static const char * version_str = "5.71 20181227";
+static const char * version_str = "5.72 20190324";
 
 #define DEF_BLOCK_SIZE 512
 #define DEF_BLOCKS_PER_TRANSFER 128
@@ -86,7 +86,7 @@ static const char * version_str = "5.71 20181227";
 #define SGP_READ10 0x28
 #define SGP_WRITE10 0x2a
 #define DEF_NUM_THREADS 4
-#define MAX_NUM_THREADS SG_MAX_QUEUE
+#define MAX_NUM_THREADS 1024  /* was SG_MAX_QUEUE (16) but no longer applies */
 
 #ifndef RAW_MAJOR
 #define RAW_MAJOR 255   /*unlikely value */
@@ -187,6 +187,8 @@ static int sg_finish_io(bool wr, Rq_elem * rep, pthread_mutex_t * a_mutp);
 
 static pthread_mutex_t strerr_mut = PTHREAD_MUTEX_INITIALIZER;
 
+static pthread_t threads[MAX_NUM_THREADS];
+
 static bool shutting_down = false;
 static bool do_sync = false;
 static bool do_time = false;
@@ -383,7 +385,7 @@ usage()
             "    sync        0->no sync(def), 1->SYNCHRONIZE CACHE on OFILE "
             "after copy\n"
             "    thr         is number of threads, must be > 0, default 4, "
-            "max 16\n"
+            "max 1024\n"
             "    time        0->no timing(def), 1->time plus calculate "
             "throughput\n"
             "    verbose     same as 'deb=VERB': increase verbosity\n"
@@ -1177,7 +1179,6 @@ main(int argc, char * argv[])
     int res, k, err, keylen;
     int64_t in_num_sect = 0;
     int64_t out_num_sect = 0;
-    pthread_t threads[MAX_NUM_THREADS];
     int in_sect_sz, out_sect_sz, status, n, flags;
     void * vp;
     Rq_coll * clp = &rcoll;