aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--doc/sg3_utils.82
-rw-r--r--lib/sg_pt_common.c4
-rw-r--r--lib/sg_pt_linux.c16
4 files changed, 15 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index e9251132..680b9320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,8 @@ 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. There is also a sg3_utils man page.
-Changelog for sg3_utils-1.34 [20120119] [svn: r436]
- - xxxxx
+Changelog for sg3_utils-1.34 [20120125] [svn: r437]
+ - sg_pt_linux: expand DID_ (host_byte) codes
Changelog for sg3_utils-1.33 [20120118] [svn: r435]
- sg_ses: major rework of indexes (again), now two level
diff --git a/doc/sg3_utils.8 b/doc/sg3_utils.8
index 53425b60..deb9a0fb 100644
--- a/doc/sg3_utils.8
+++ b/doc/sg3_utils.8
@@ -1,4 +1,4 @@
-.TH SG3_UTILS "8" "January 2012" "sg3_utils\-1.32" SG3_UTILS
+.TH SG3_UTILS "8" "January 2012" "sg3_utils\-1.34" SG3_UTILS
.SH NAME
sg3_utils \- a package of utilities for sending SCSI commands
.SH SYNOPSIS
diff --git a/lib/sg_pt_common.c b/lib/sg_pt_common.c
index ec7aa4b0..45b0710d 100644
--- a/lib/sg_pt_common.c
+++ b/lib/sg_pt_common.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2011 Douglas Gilbert.
+ * Copyright (c) 2009-2012 Douglas Gilbert.
* All rights reserved.
* Use of this source code is governed by a BSD-style
* license that can be found in the BSD_LICENSE file.
@@ -14,7 +14,7 @@
#endif
-static const char * scsi_pt_version_str = "2.08 20110207";
+static const char * scsi_pt_version_str = "2.09 20120125";
const char *
scsi_pt_version()
diff --git a/lib/sg_pt_linux.c b/lib/sg_pt_linux.c
index 0a5216e3..1635cac1 100644
--- a/lib/sg_pt_linux.c
+++ b/lib/sg_pt_linux.c
@@ -1,11 +1,12 @@
/*
- * Copyright (c) 2005-2011 Douglas Gilbert.
+ * Copyright (c) 2005-2012 Douglas Gilbert.
* All rights reserved.
* Use of this source code is governed by a BSD-style
* license that can be found in the BSD_LICENSE file.
*/
-/* sg_pt_linux version 1.15 20100827 */
+/* sg_pt_linux version 1.16 20120125 */
+
#include <stdio.h>
#include <stdlib.h>
@@ -33,7 +34,10 @@ static const char * linux_host_bytes[] = {
"DID_OK", "DID_NO_CONNECT", "DID_BUS_BUSY", "DID_TIME_OUT",
"DID_BAD_TARGET", "DID_ABORT", "DID_PARITY", "DID_ERROR",
"DID_RESET", "DID_BAD_INTR", "DID_PASSTHROUGH", "DID_SOFT_ERROR",
- "DID_IMM_RETRY", "DID_REQUEUE"
+ "DID_IMM_RETRY", "DID_REQUEUE" /* 0xd */,
+ "DID_TRANSPORT_DISRUPTED", "DID_TRANSPORT_FAILFAST",
+ "DID_TARGET_FAILURE" /* 0x10 */,
+ "DID_NEXUS_FAILURE (reservation conflict)",
};
#define LINUX_HOST_BYTES_SZ \
@@ -413,14 +417,14 @@ get_scsi_pt_transport_err_str(const struct sg_pt_base * vp, int max_b_len,
int n, m;
char * cp = b;
int driv, sugg;
- const char * driv_cp = "invalid";
- const char * sugg_cp = "invalid";
+ const char * driv_cp = "unknown";
+ const char * sugg_cp = "unknown";
m = max_b_len;
n = 0;
if (hs) {
if ((hs < 0) || (hs >= LINUX_HOST_BYTES_SZ))
- n = snprintf(cp, m, "Host_status=0x%02x is invalid\n", hs);
+ n = snprintf(cp, m, "Host_status=0x%02x is unknown\n", hs);
else
n = snprintf(cp, m, "Host_status=0x%02x [%s]\n", hs,
linux_host_bytes[hs]);