diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2012-02-02 14:12:22 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2012-02-02 14:12:22 +0000 |
| commit | ce07b841b2ed5ac46a0472c0d9966d51176123dd (patch) | |
| tree | ad7f661a9f13c13c4551ab639ae2aefd93e08b4a /lib | |
| parent | e54ba5513e434e19e29749319ee170b31050358d (diff) | |
| download | sg3_utils-ce07b841b2ed5ac46a0472c0d9966d51176123dd.tar.gz | |
expand Linux pass-through DID_* codes
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@437 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sg_pt_common.c | 4 | ||||
| -rw-r--r-- | lib/sg_pt_linux.c | 16 |
2 files changed, 12 insertions, 8 deletions
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]); |