Load sg3_utils-1.21 into trunk/.

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

6 files changed, 15 insertions, 15 deletions

diff --git a/archive/sg_dd2048.c b/archive/sg_dd2048.c
index 9e88683e..ea9bf415 100644
--- a/archive/sg_dd2048.c
+++ b/archive/sg_dd2048.c
@@ -90,7 +90,7 @@ int read_capacity(int sg_fd, int * num_sect, int * sect_sz)
         return -1;
     }
     res = sg_err_category3(&io_hdr);
-    if (SG_LIB_CAT_MEDIA_CHANGED == res)
+    if (SG_LIB_CAT_UNIT_ATTENTION == res)
         return 2; /* probably have another go ... */
     else if (SG_LIB_CAT_CLEAN != res) {
         sg_chk_n_print3("read capacity", &io_hdr);
@@ -156,7 +156,7 @@ int sg_read(int sg_fd, unsigned char * buff, int blocks, int from_block)
         printf("Recovered error while reading block=%d, num=%d\n",
                from_block, blocks);
         break;
-    case SG_LIB_CAT_MEDIA_CHANGED:
+    case SG_LIB_CAT_UNIT_ATTENTION:
         return 2;
     default:
         sg_chk_n_print3("reading", &io_hdr);
@@ -217,7 +217,7 @@ int sg_write(int sg_fd, unsigned char * buff, int blocks, int to_block)
         printf("Recovered error while writing block=%d, num=%d\n",
                to_block, blocks);
         break;
-    case SG_LIB_CAT_MEDIA_CHANGED:
+    case SG_LIB_CAT_UNIT_ATTENTION:
         return 2;
     default:
         sg_chk_n_print3("writing", &io_hdr);
diff --git a/archive/sg_dd512.c b/archive/sg_dd512.c
index ebb92bc6..6291ef43 100644
--- a/archive/sg_dd512.c
+++ b/archive/sg_dd512.c
@@ -90,7 +90,7 @@ int read_capacity(int sg_fd, int * num_sect, int * sect_sz)
         return -1;
     }
     res = sg_err_category3(&io_hdr);
-    if (SG_LIB_CAT_MEDIA_CHANGED == res)
+    if (SG_LIB_CAT_UNIT_ATTENTION == res)
         return 2; /* probably have another go ... */
     else if (SG_LIB_CAT_CLEAN != res) {
         sg_chk_n_print3("read capacity", &io_hdr);
@@ -156,7 +156,7 @@ int sg_read(int sg_fd, unsigned char * buff, int blocks, int from_block)
         printf("Recovered error while reading block=%d, num=%d\n",
                from_block, blocks);
         break;
-    case SG_LIB_CAT_MEDIA_CHANGED:
+    case SG_LIB_CAT_UNIT_ATTENTION:
         return 2;
     default:
         sg_chk_n_print3("reading", &io_hdr);
@@ -217,7 +217,7 @@ int sg_write(int sg_fd, unsigned char * buff, int blocks, int to_block)
         printf("Recovered error while writing block=%d, num=%d\n",
                to_block, blocks);
         break;
-    case SG_LIB_CAT_MEDIA_CHANGED:
+    case SG_LIB_CAT_UNIT_ATTENTION:
         return 2;
     default:
         sg_chk_n_print3("writing", &io_hdr);
diff --git a/archive/sg_dd_old.c b/archive/sg_dd_old.c
index fbdb19b7..83dc6451 100644
--- a/archive/sg_dd_old.c
+++ b/archive/sg_dd_old.c
@@ -86,7 +86,7 @@ int read_capacity(int sg_fd, int * num_sect, int * sect_sz)
         return -1;
     }
     res = sg_err_category3(&io_hdr);
-    if (SG_LIB_CAT_MEDIA_CHANGED == res)
+    if (SG_LIB_CAT_UNIT_ATTENTION == res)
         return 2; /* probably have another go ... */
     else if (SG_LIB_CAT_CLEAN != res) {
         sg_chk_n_print3("read capacity", &io_hdr);
@@ -157,7 +157,7 @@ int sg_read(int sg_fd, unsigned char * buff, int blocks, int from_block,
         printf("Recovered error while reading block=%d, num=%d\n",
                from_block, blocks);
         break;
-    case SG_LIB_CAT_MEDIA_CHANGED:
+    case SG_LIB_CAT_UNIT_ATTENTION:
         return 2;
     default:
         sg_chk_n_print3("reading", &io_hdr);
@@ -228,7 +228,7 @@ int sg_write(int sg_fd, unsigned char * buff, int blocks, int to_block,
         printf("Recovered error while writing block=%d, num=%d\n",
                to_block, blocks);
         break;
-    case SG_LIB_CAT_MEDIA_CHANGED:
+    case SG_LIB_CAT_UNIT_ATTENTION:
         return 2;
     default:
         sg_chk_n_print3("writing", &io_hdr);
diff --git a/archive/sgq_dd.c b/archive/sgq_dd.c
index 8bc4aeef..52de5184 100644
--- a/archive/sgq_dd.c
+++ b/archive/sgq_dd.c
@@ -301,7 +301,7 @@ int read_capacity(int sg_fd, int * num_sect, int * sect_sz)
         return -1;
     }
     res = sg_err_category3(&io_hdr);
-    if (SG_LIB_CAT_MEDIA_CHANGED == res)
+    if (SG_LIB_CAT_UNIT_ATTENTION == res)
         return 2; /* probably have another go ... */
     else if (SG_LIB_CAT_CLEAN != res) {
         sg_chk_n_print3("read capacity", &io_hdr, 1);
@@ -528,7 +528,7 @@ int sg_finish_io(int wr, Rq_elem * rep)
             fprintf(stderr, "Recovered error on block=%d, num=%d\n",
                     rep->blk, rep->num_blks);
             break;
-        case SG_LIB_CAT_MEDIA_CHANGED:
+        case SG_LIB_CAT_UNIT_ATTENTION:
             return 1;
         default:
             {
diff --git a/archive/sgq_old_dd.c b/archive/sgq_old_dd.c
index 854e44fe..66c149b3 100644
--- a/archive/sgq_old_dd.c
+++ b/archive/sgq_old_dd.c
@@ -143,7 +143,7 @@ int read_capacity(int sg_fd, int * num_sect, int * sect_sz)
         return -1;
     }
     res = sg_err_category3(&io_hdr);
-    if (SG_LIB_CAT_MEDIA_CHANGED == res)
+    if (SG_LIB_CAT_UNIT_ATTENTION == res)
         return 2; /* probably have another go ... */
     else if (SG_LIB_CAT_CLEAN != res) {
         sg_chk_n_print3("read capacity", &io_hdr);
@@ -259,7 +259,7 @@ int sg_finish_io(Rq_coll * clp, int wr, Rq_elem ** repp)
             printf("Recovered error on block=%d, num=%d\n",
                    rep->blk, rep->num_blks);
             break;
-        case SG_LIB_CAT_MEDIA_CHANGED:
+        case SG_LIB_CAT_UNIT_ATTENTION:
             return 1;
         default:
             sg_chk_n_print3(rep->wr ? "writing": "reading", hp);
diff --git a/archive/sgs_dd.c b/archive/sgs_dd.c
index 4c68d90c..fa34d7b1 100644
--- a/archive/sgs_dd.c
+++ b/archive/sgs_dd.c
@@ -166,7 +166,7 @@ int read_capacity(int sg_fd, int * num_sect, int * sect_sz)
         return -1;
     }
     res = sg_err_category3(&io_hdr);
-    if (SG_LIB_CAT_MEDIA_CHANGED == res)
+    if (SG_LIB_CAT_UNIT_ATTENTION == res)
         return 2; /* probably have another go ... */
     else if (SG_LIB_CAT_CLEAN != res) {
         sg_chk_n_print3("read capacity", &io_hdr);
@@ -272,7 +272,7 @@ int sg_finish_io(Rq_coll * clp, int wr, Rq_elem ** repp)
             printf("Recovered error on block=%d, num=%d\n",
                    rep->blk, rep->num_blks);
             break;
-        case SG_LIB_CAT_MEDIA_CHANGED:
+        case SG_LIB_CAT_UNIT_ATTENTION:
             return 1;
         default:
             sg_chk_n_print3(rep->wr ? "writing": "reading", hp);