aboutsummaryrefslogtreecommitdiff
path: root/lib/sg_cmds_extra.c
diff options
context:
space:
mode:
authorDouglas Gilbert <dgilbert@interlog.com>2019-01-14 02:42:05 +0000
committerDouglas Gilbert <dgilbert@interlog.com>2019-01-14 02:42:05 +0000
commit0b07dc9a41e495604add3b006c040b36e4ea50c7 (patch)
tree0cb11adaa2f3f93c3be95cf28de486d7dbe716d9 /lib/sg_cmds_extra.c
parent2433a22138f1b508c2765aa8499456cd6138a200 (diff)
downloadsg3_utils-0b07dc9a41e495604add3b006c040b36e4ea50c7.tar.gz
sg_lib: tweak sg_pt interface to better handle bidi; sg_cmds_process_resp(): two arguments removed
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@805 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'lib/sg_cmds_extra.c')
-rw-r--r--lib/sg_cmds_extra.c822
1 files changed, 396 insertions, 426 deletions
diff --git a/lib/sg_cmds_extra.c b/lib/sg_cmds_extra.c
index 1b86d23d..96558883 100644
--- a/lib/sg_cmds_extra.c
+++ b/lib/sg_cmds_extra.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2018 Douglas Gilbert.
+ * Copyright (c) 1999-2019 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.
@@ -120,10 +120,10 @@ create_pt_obj(const char * cname)
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_get_lba_status16(int sg_fd, uint64_t start_llba, uint8_t rt,
- void * resp, int alloc_len, bool noisy, int verbose)
+ void * resp, int alloc_len, bool noisy, int vb)
{
- static const char * const cdb_name_s = "Get LBA status(16)";
- int k, res, sense_cat, ret;
+ static const char * const cdb_s = "Get LBA status(16)";
+ int k, res, s_cat, ret;
uint8_t getLbaStatCmd[SERVICE_ACTION_IN_16_CMDLEN];
uint8_t sense_b[SENSE_BUFF_LEN];
struct sg_pt_base * ptvp;
@@ -135,37 +135,36 @@ sg_ll_get_lba_status16(int sg_fd, uint64_t start_llba, uint8_t rt,
sg_put_unaligned_be64(start_llba, getLbaStatCmd + 2);
sg_put_unaligned_be32((uint32_t)alloc_len, getLbaStatCmd + 10);
getLbaStatCmd[14] = rt;
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < SERVICE_ACTION_IN_16_CMDLEN; ++k)
pr2ws("%02x ", getLbaStatCmd[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, getLbaStatCmd, sizeof(getLbaStatCmd));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, alloc_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, alloc_len, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else {
- if ((verbose > 2) && (ret > 0)) {
- pr2ws(" %s: response\n", cdb_name_s);
- if (3 == verbose) {
+ if ((vb > 2) && (ret > 0)) {
+ pr2ws(" %s: response\n", cdb_s);
+ if (3 == vb) {
pr2ws("%s:\n", (ret > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)resp, (ret > 256 ? 256 : ret),
-1);
@@ -182,10 +181,10 @@ sg_ll_get_lba_status16(int sg_fd, uint64_t start_llba, uint8_t rt,
int
sg_ll_get_lba_status(int sg_fd, uint64_t start_llba, void * resp,
- int alloc_len, bool noisy, int verbose)
+ int alloc_len, bool noisy, int vb)
{
return sg_ll_get_lba_status16(sg_fd, start_llba, /* rt = */ 0x0, resp,
- alloc_len, noisy, verbose);
+ alloc_len, noisy, vb);
}
#define GLS32_CMD_LEN 32
@@ -194,10 +193,10 @@ int
sg_ll_get_lba_status32(int sg_fd, uint64_t start_llba, uint32_t scan_len,
uint32_t element_id, uint8_t rt,
void * resp, int alloc_len, bool noisy,
- int verbose)
+ int vb)
{
- static const char * const cdb_name_s = "Get LBA status(32)";
- int k, res, sense_cat, ret;
+ static const char * const cdb_s = "Get LBA status(32)";
+ int k, res, s_cat, ret;
uint8_t gls32_cmd[GLS32_CMD_LEN];
uint8_t sense_b[SENSE_BUFF_LEN];
struct sg_pt_base * ptvp;
@@ -211,37 +210,36 @@ sg_ll_get_lba_status32(int sg_fd, uint64_t start_llba, uint32_t scan_len,
sg_put_unaligned_be32(scan_len, gls32_cmd + 20);
sg_put_unaligned_be32(element_id, gls32_cmd + 24);
sg_put_unaligned_be32((uint32_t)alloc_len, gls32_cmd + 28);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < GLS32_CMD_LEN; ++k)
pr2ws("%02x ", gls32_cmd[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, gls32_cmd, sizeof(gls32_cmd));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, alloc_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, alloc_len, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else {
- if ((verbose > 2) && (ret > 0)) {
- pr2ws(" %s: response\n", cdb_name_s);
- if (3 == verbose) {
+ if ((vb > 2) && (ret > 0)) {
+ pr2ws(" %s: response\n", cdb_s);
+ if (3 == vb) {
pr2ws("%s:\n", (ret > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)resp, (ret > 256 ? 256 : ret),
-1);
@@ -258,20 +256,20 @@ sg_ll_get_lba_status32(int sg_fd, uint64_t start_llba, uint32_t scan_len,
int
sg_ll_report_tgt_prt_grp(int sg_fd, void * resp, int mx_resp_len,
- bool noisy, int verbose)
+ bool noisy, int vb)
{
return sg_ll_report_tgt_prt_grp2(sg_fd, resp, mx_resp_len, false, noisy,
- verbose);
+ vb);
}
/* Invokes a SCSI REPORT TARGET PORT GROUPS command. Return of 0 -> success,
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_report_tgt_prt_grp2(int sg_fd, void * resp, int mx_resp_len,
- bool extended, bool noisy, int verbose)
+ bool extended, bool noisy, int vb)
{
- static const char * const cdb_name_s = "Report target port groups";
- int k, res, ret, sense_cat;
+ static const char * const cdb_s = "Report target port groups";
+ int k, res, ret, s_cat;
uint8_t rtpg_cdb[MAINTENANCE_IN_CMDLEN] =
{MAINTENANCE_IN_CMD, REPORT_TGT_PRT_GRP_SA,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -281,37 +279,36 @@ sg_ll_report_tgt_prt_grp2(int sg_fd, void * resp, int mx_resp_len,
if (extended)
rtpg_cdb[1] |= 0x20;
sg_put_unaligned_be32((uint32_t)mx_resp_len, rtpg_cdb + 6);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < MAINTENANCE_IN_CMDLEN; ++k)
pr2ws("%02x ", rtpg_cdb[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, rtpg_cdb, sizeof(rtpg_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, mx_resp_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, mx_resp_len, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else {
- if ((verbose > 2) && (ret > 0)) {
- pr2ws(" %s: response", cdb_name_s);
- if (3 == verbose) {
+ if ((vb > 2) && (ret > 0)) {
+ pr2ws(" %s: response", cdb_s);
+ if (3 == vb) {
pr2ws("%s:\n", (ret > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)resp, (ret > 256 ? 256 : ret),
-1);
@@ -330,10 +327,10 @@ sg_ll_report_tgt_prt_grp2(int sg_fd, void * resp, int mx_resp_len,
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_set_tgt_prt_grp(int sg_fd, void * paramp, int param_len, bool noisy,
- int verbose)
+ int vb)
{
- static const char * const cdb_name_s = "Set target port groups";
- int k, res, ret, sense_cat;
+ static const char * const cdb_s = "Set target port groups";
+ int k, res, ret, s_cat;
uint8_t stpg_cdb[MAINTENANCE_OUT_CMDLEN] =
{MAINTENANCE_OUT_CMD, SET_TGT_PRT_GRP_SA,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -341,35 +338,34 @@ sg_ll_set_tgt_prt_grp(int sg_fd, void * paramp, int param_len, bool noisy,
struct sg_pt_base * ptvp;
sg_put_unaligned_be32((uint32_t)param_len, stpg_cdb + 6);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < MAINTENANCE_OUT_CMDLEN; ++k)
pr2ws("%02x ", stpg_cdb[k]);
pr2ws("\n");
- if ((verbose > 1) && paramp && param_len) {
- pr2ws(" %s parameter list:\n", cdb_name_s);
+ if ((vb > 1) && paramp && param_len) {
+ pr2ws(" %s parameter list:\n", cdb_s);
hex2stderr((const uint8_t *)paramp, param_len, -1);
}
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, stpg_cdb, sizeof(stpg_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_out(ptvp, (uint8_t *)paramp, param_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -383,10 +379,10 @@ sg_ll_set_tgt_prt_grp(int sg_fd, void * paramp, int param_len, bool noisy,
int
sg_ll_report_referrals(int sg_fd, uint64_t start_llba, bool one_seg,
void * resp, int mx_resp_len, bool noisy,
- int verbose)
+ int vb)
{
- static const char * const cdb_name_s = "Report referrals";
- int k, res, ret, sense_cat;
+ static const char * const cdb_s = "Report referrals";
+ int k, res, ret, s_cat;
uint8_t repRef_cdb[SERVICE_ACTION_IN_16_CMDLEN] =
{SERVICE_ACTION_IN_16_CMD, REPORT_REFERRALS_SA,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -397,37 +393,36 @@ sg_ll_report_referrals(int sg_fd, uint64_t start_llba, bool one_seg,
sg_put_unaligned_be32((uint32_t)mx_resp_len, repRef_cdb + 10);
if (one_seg)
repRef_cdb[14] = 0x1;
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < SERVICE_ACTION_IN_16_CMDLEN; ++k)
pr2ws("%02x ", repRef_cdb[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, repRef_cdb, sizeof(repRef_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, mx_resp_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, mx_resp_len, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else {
- if ((verbose > 2) && (ret > 0)) {
- pr2ws(" %s: response", cdb_name_s);
- if (3 == verbose) {
+ if ((vb > 2) && (ret > 0)) {
+ pr2ws(" %s: response", cdb_s);
+ if (3 == vb) {
pr2ws("%s:\n", (ret > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)resp, (ret > 256 ? 256 : ret),
-1);
@@ -451,10 +446,10 @@ int
sg_ll_send_diag_pt(struct sg_pt_base * ptvp, int st_code, bool pf_bit,
bool st_bit, bool devofl_bit, bool unitofl_bit,
int long_duration, void * paramp, int param_len,
- bool noisy, int verbose)
+ bool noisy, int vb)
{
- static const char * const cdb_name_s = "Send diagnostic";
- int k, res, ret, sense_cat, tmout;
+ static const char * const cdb_s = "Send diagnostic";
+ int k, res, ret, s_cat, tmout;
uint8_t senddiag_cdb[SEND_DIAGNOSTIC_CMDLEN] =
{SEND_DIAGNOSTIC_CMD, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -474,36 +469,35 @@ sg_ll_send_diag_pt(struct sg_pt_base * ptvp, int st_code, bool pf_bit,
else
tmout = long_duration ? LONG_PT_TIMEOUT : DEF_PT_TIMEOUT;
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < SEND_DIAGNOSTIC_CMDLEN; ++k)
pr2ws("%02x ", senddiag_cdb[k]);
pr2ws("\n");
- if (verbose > 1) {
+ if (vb > 1) {
if (paramp && param_len) {
- pr2ws(" %s parameter list:\n", cdb_name_s);
+ pr2ws(" %s parameter list:\n", cdb_s);
hex2stderr((const uint8_t *)paramp, param_len, -1);
}
- pr2ws(" %s timeout: %d seconds\n", cdb_name_s, tmout);
+ pr2ws(" %s timeout: %d seconds\n", cdb_s, tmout);
}
}
set_scsi_pt_cdb(ptvp, senddiag_cdb, sizeof(senddiag_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_out(ptvp, (uint8_t *)paramp, param_len);
- res = do_scsi_pt(ptvp, -1, tmout, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, -1, tmout, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -515,17 +509,17 @@ sg_ll_send_diag_pt(struct sg_pt_base * ptvp, int st_code, bool pf_bit,
int
sg_ll_send_diag(int sg_fd, int st_code, bool pf_bit, bool st_bit,
bool devofl_bit, bool unitofl_bit, int long_duration,
- void * paramp, int param_len, bool noisy, int verbose)
+ void * paramp, int param_len, bool noisy, int vb)
{
int ret;
struct sg_pt_base * ptvp;
- ptvp = construct_scsi_pt_obj_with_fd(sg_fd, verbose);
+ ptvp = construct_scsi_pt_obj_with_fd(sg_fd, vb);
if (NULL == ptvp)
return sg_convert_errno(ENOMEM);
ret = sg_ll_send_diag_pt(ptvp, st_code, pf_bit, st_bit, devofl_bit,
unitofl_bit, long_duration, paramp, param_len,
- noisy, verbose);
+ noisy, vb);
destruct_scsi_pt_obj(ptvp);
return ret;
}
@@ -535,11 +529,11 @@ sg_ll_send_diag(int sg_fd, int st_code, bool pf_bit, bool st_bit,
int
sg_ll_receive_diag_pt(struct sg_pt_base * ptvp, bool pcv, int pg_code,
void * resp, int mx_resp_len, int timeout_secs,
- int * residp, bool noisy, int verbose)
+ int * residp, bool noisy, int vb)
{
int resid = 0;
- int k, res, ret, sense_cat;
- static const char * const cdb_name_s = "Receive diagnostic results";
+ int k, res, ret, s_cat;
+ static const char * const cdb_s = "Receive diagnostic results";
uint8_t rcvdiag_cdb[RECEIVE_DIAGNOSTICS_CMDLEN] =
{RECEIVE_DIAGNOSTICS_CMD, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -549,8 +543,8 @@ sg_ll_receive_diag_pt(struct sg_pt_base * ptvp, bool pcv, int pg_code,
rcvdiag_cdb[2] = (uint8_t)(pg_code);
sg_put_unaligned_be16((uint16_t)mx_resp_len, rcvdiag_cdb + 3);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < RECEIVE_DIAGNOSTICS_CMDLEN; ++k)
pr2ws("%02x ", rcvdiag_cdb[k]);
pr2ws("\n");
@@ -561,28 +555,27 @@ sg_ll_receive_diag_pt(struct sg_pt_base * ptvp, bool pcv, int pg_code,
set_scsi_pt_cdb(ptvp, rcvdiag_cdb, sizeof(rcvdiag_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, mx_resp_len);
- res = do_scsi_pt(ptvp, -1, timeout_secs, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, mx_resp_len, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, -1, timeout_secs, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
resid = get_scsi_pt_resid(ptvp);
if (residp)
*residp = resid;
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else {
- if ((verbose > 2) && (ret > 0)) {
- pr2ws(" %s: response", cdb_name_s);
- if (3 == verbose) {
+ if ((vb > 2) && (ret > 0)) {
+ pr2ws(" %s: response", cdb_s);
+ if (3 == vb) {
pr2ws("%s:\n", (ret > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)resp, (ret > 256 ? 256 : ret),
-1);
@@ -601,16 +594,16 @@ sg_ll_receive_diag_pt(struct sg_pt_base * ptvp, bool pcv, int pg_code,
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_receive_diag(int sg_fd, bool pcv, int pg_code, void * resp,
- int mx_resp_len, bool noisy, int verbose)
+ int mx_resp_len, bool noisy, int vb)
{
int ret;
struct sg_pt_base * ptvp;
- ptvp = construct_scsi_pt_obj_with_fd(sg_fd, verbose);
+ ptvp = construct_scsi_pt_obj_with_fd(sg_fd, vb);
if (NULL == ptvp)
return sg_convert_errno(ENOMEM);
ret = sg_ll_receive_diag_pt(ptvp, pcv, pg_code, resp, mx_resp_len, 0,
- NULL, noisy, verbose);
+ NULL, noisy, vb);
destruct_scsi_pt_obj(ptvp);
return ret;
}
@@ -618,16 +611,16 @@ sg_ll_receive_diag(int sg_fd, bool pcv, int pg_code, void * resp,
int
sg_ll_receive_diag_v2(int sg_fd, bool pcv, int pg_code, void * resp,
int mx_resp_len, int timeout_secs, int * residp,
- bool noisy, int verbose)
+ bool noisy, int vb)
{
int ret;
struct sg_pt_base * ptvp;
- ptvp = construct_scsi_pt_obj_with_fd(sg_fd, verbose);
+ ptvp = construct_scsi_pt_obj_with_fd(sg_fd, vb);
if (NULL == ptvp)
return sg_convert_errno(ENOMEM);
ret = sg_ll_receive_diag_pt(ptvp, pcv, pg_code, resp, mx_resp_len,
- timeout_secs, residp, noisy, verbose);
+ timeout_secs, residp, noisy, vb);
destruct_scsi_pt_obj(ptvp);
return ret;
}
@@ -636,10 +629,10 @@ sg_ll_receive_diag_v2(int sg_fd, bool pcv, int pg_code, void * resp,
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_read_defect10(int sg_fd, bool req_plist, bool req_glist, int dl_format,
- void * resp, int mx_resp_len, bool noisy, int verbose)
+ void * resp, int mx_resp_len, bool noisy, int vb)
{
- static const char * const cdb_name_s = "Read defect(10)";
- int res, k, ret, sense_cat;
+ static const char * const cdb_s = "Read defect(10)";
+ int res, k, ret, s_cat;
uint8_t rdef_cdb[READ_DEFECT10_CMDLEN] =
{READ_DEFECT10_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -655,37 +648,36 @@ sg_ll_read_defect10(int sg_fd, bool req_plist, bool req_glist, int dl_format,
pr2ws("mx_resp_len too big\n");
return -1;
}
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < READ_DEFECT10_CMDLEN; ++k)
pr2ws("%02x ", rdef_cdb[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, rdef_cdb, sizeof(rdef_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, mx_resp_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, mx_resp_len, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else {
- if ((verbose > 2) && (ret > 0)) {
- pr2ws(" %s: response\n", cdb_name_s);
- if (3 == verbose) {
+ if ((vb > 2) && (ret > 0)) {
+ pr2ws(" %s: response\n", cdb_s);
+ if (3 == vb) {
pr2ws("%s:\n", (ret > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)resp, (ret > 256 ? 256 : ret),
-1);
@@ -704,10 +696,10 @@ sg_ll_read_defect10(int sg_fd, bool req_plist, bool req_glist, int dl_format,
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_read_media_serial_num(int sg_fd, void * resp, int mx_resp_len,
- bool noisy, int verbose)
+ bool noisy, int vb)
{
- static const char * const cdb_name_s = "Read media serial number";
- int k, res, ret, sense_cat;
+ static const char * const cdb_s = "Read media serial number";
+ int k, res, ret, s_cat;
uint8_t rmsn_cdb[SERVICE_ACTION_IN_12_CMDLEN] =
{SERVICE_ACTION_IN_12_CMD, READ_MEDIA_SERIAL_NUM_SA,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -715,37 +707,36 @@ sg_ll_read_media_serial_num(int sg_fd, void * resp, int mx_resp_len,
struct sg_pt_base * ptvp;
sg_put_unaligned_be32((uint32_t)mx_resp_len, rmsn_cdb + 6);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < SERVICE_ACTION_IN_12_CMDLEN; ++k)
pr2ws("%02x ", rmsn_cdb[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, rmsn_cdb, sizeof(rmsn_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, mx_resp_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, mx_resp_len, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else {
- if ((verbose > 2) && (ret > 0)) {
- pr2ws(" %s: response", cdb_name_s);
- if (3 == verbose) {
+ if ((vb > 2) && (ret > 0)) {
+ pr2ws(" %s: response", cdb_s);
+ if (3 == vb) {
pr2ws("%s:\n", (ret > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)resp, (ret > 256 ? 256 : ret),
-1);
@@ -765,10 +756,10 @@ sg_ll_read_media_serial_num(int sg_fd, void * resp, int mx_resp_len,
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_report_id_info(int sg_fd, int itype, void * resp, int max_resp_len,
- bool noisy, int verbose)
+ bool noisy, int vb)
{
- static const char * const cdb_name_s = "Report identifying information";
- int k, res, ret, sense_cat;
+ static const char * const cdb_s = "Report identifying information";
+ int k, res, ret, s_cat;
uint8_t rii_cdb[MAINTENANCE_IN_CMDLEN] = {MAINTENANCE_IN_CMD,
REPORT_IDENTIFYING_INFORMATION_SA,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -778,37 +769,36 @@ sg_ll_report_id_info(int sg_fd, int itype, void * resp, int max_resp_len,
sg_put_unaligned_be32((uint32_t)max_resp_len, rii_cdb + 6);
rii_cdb[10] |= (itype << 1) & 0xfe;
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < MAINTENANCE_IN_CMDLEN; ++k)
pr2ws("%02x ", rii_cdb[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, rii_cdb, sizeof(rii_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, max_resp_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, max_resp_len, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else {
- if ((verbose > 2) && (ret > 0)) {
- pr2ws(" %s: response", cdb_name_s);
- if (3 == verbose) {
+ if ((vb > 2) && (ret > 0)) {
+ pr2ws(" %s: response", cdb_s);
+ if (3 == vb) {
pr2ws("%s:\n", (ret > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)resp, (ret > 256 ? 256 : ret),
-1);
@@ -828,10 +818,10 @@ sg_ll_report_id_info(int sg_fd, int itype, void * resp, int max_resp_len,
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_set_id_info(int sg_fd, int itype, void * paramp, int param_len,
- bool noisy, int verbose)
+ bool noisy, int vb)
{
- static const char * const cdb_name_s = "Set identifying information";
- int k, res, ret, sense_cat;
+ static const char * const cdb_s = "Set identifying information";
+ int k, res, ret, s_cat;
uint8_t sii_cdb[MAINTENANCE_OUT_CMDLEN] = {MAINTENANCE_OUT_CMD,
SET_IDENTIFYING_INFORMATION_SA,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -840,35 +830,34 @@ sg_ll_set_id_info(int sg_fd, int itype, void * paramp, int param_len,
sg_put_unaligned_be32((uint32_t)param_len, sii_cdb + 6);
sii_cdb[10] |= (itype << 1) & 0xfe;
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < MAINTENANCE_OUT_CMDLEN; ++k)
pr2ws("%02x ", sii_cdb[k]);
pr2ws("\n");
- if ((verbose > 1) && paramp && param_len) {
- pr2ws(" %s parameter list:\n", cdb_name_s);
+ if ((vb > 1) && paramp && param_len) {
+ pr2ws(" %s parameter list:\n", cdb_s);
hex2stderr((const uint8_t *)paramp, param_len, -1);
}
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, sii_cdb, sizeof(sii_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_out(ptvp, (uint8_t *)paramp, param_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -883,11 +872,11 @@ sg_ll_set_id_info(int sg_fd, int itype, void * paramp, int param_len,
int
sg_ll_format_unit(int sg_fd, int fmtpinfo, bool longlist, bool fmtdata,
bool cmplst, int dlist_format, int timeout_secs,
- void * paramp, int param_len, bool noisy, int verbose)
+ void * paramp, int param_len, bool noisy, int vb)
{
return sg_ll_format_unit_v2(sg_fd, fmtpinfo, longlist, fmtdata, cmplst,
dlist_format, 0, timeout_secs, paramp,
- param_len, noisy, verbose);
+ param_len, noisy, vb);
}
/* Invokes a FORMAT UNIT (SBC-3) command. Return of 0 -> success,
@@ -895,11 +884,11 @@ sg_ll_format_unit(int sg_fd, int fmtpinfo, bool longlist, bool fmtdata,
int
sg_ll_format_unit2(int sg_fd, int fmtpinfo, bool longlist, bool fmtdata,
bool cmplst, int dlist_format, int ffmt, int timeout_secs,
- void * paramp, int param_len, bool noisy, int verbose)
+ void * paramp, int param_len, bool noisy, int vb)
{
return sg_ll_format_unit_v2(sg_fd, fmtpinfo, longlist, fmtdata, cmplst,
dlist_format, ffmt, timeout_secs, paramp,
- param_len, noisy, verbose);
+ param_len, noisy, vb);
}
/* Invokes a FORMAT UNIT (SBC-4) command. Return of 0 -> success,
@@ -909,10 +898,10 @@ int
sg_ll_format_unit_v2(int sg_fd, int fmtpinfo, bool longlist, bool fmtdata,
bool cmplst, int dlist_format, int ffmt,
int timeout_secs, void * paramp, int param_len,
- bool noisy, int verbose)
+ bool noisy, int vb)
{
- static const char * const cdb_name_s = "Format unit";
- int k, res, ret, sense_cat, tmout;
+ static const char * const cdb_s = "Format unit";
+ int k, res, ret, s_cat, tmout;
uint8_t fu_cdb[FORMAT_UNIT_CMDLEN] =
{FORMAT_UNIT_CMD, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -931,38 +920,37 @@ sg_ll_format_unit_v2(int sg_fd, int fmtpinfo, bool longlist, bool fmtdata,
if (ffmt)
fu_cdb[4] |= (ffmt & 0x3);
tmout = (timeout_secs > 0) ? timeout_secs : DEF_PT_TIMEOUT;
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < 6; ++k)
pr2ws("%02x ", fu_cdb[k]);
pr2ws("\n");
- if (verbose > 1) {
+ if (vb > 1) {
if (param_len > 0) {
- pr2ws(" %s parameter list:\n", cdb_name_s);
+ pr2ws(" %s parameter list:\n", cdb_s);
hex2stderr((const uint8_t *)paramp, param_len, -1);
}
- pr2ws(" %s timeout: %d seconds\n", cdb_name_s, tmout);
+ pr2ws(" %s timeout: %d seconds\n", cdb_s, tmout);
}
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, fu_cdb, sizeof(fu_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_out(ptvp, (uint8_t *)paramp, param_len);
- res = do_scsi_pt(ptvp, sg_fd, tmout, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, tmout, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -976,10 +964,10 @@ sg_ll_format_unit_v2(int sg_fd, int fmtpinfo, bool longlist, bool fmtdata,
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_reassign_blocks(int sg_fd, bool longlba, bool longlist, void * paramp,
- int param_len, bool noisy, int verbose)
+ int param_len, bool noisy, int vb)
{
- static const char * const cdb_name_s = "Reassign blocks";
- int res, k, ret, sense_cat;
+ static const char * const cdb_s = "Reassign blocks";
+ int res, k, ret, s_cat;
uint8_t reass_cdb[REASSIGN_BLKS_CMDLEN] =
{REASSIGN_BLKS_CMD, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -989,35 +977,34 @@ sg_ll_reassign_blocks(int sg_fd, bool longlba, bool longlist, void * paramp,
reass_cdb[1] = 0x2;
if (longlist)
reass_cdb[1] |= 0x1;
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < REASSIGN_BLKS_CMDLEN; ++k)
pr2ws("%02x ", reass_cdb[k]);
pr2ws("\n");
}
- if (verbose > 1) {
- pr2ws(" %s parameter list\n", cdb_name_s);
+ if (vb > 1) {
+ pr2ws(" %s parameter list\n", cdb_s);
hex2stderr((const uint8_t *)paramp, param_len, -1);
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, reass_cdb, sizeof(reass_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_out(ptvp, (uint8_t *)paramp, param_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -1032,10 +1019,10 @@ sg_ll_reassign_blocks(int sg_fd, bool longlba, bool longlist, void * paramp,
* -1 -> other errors */
int
sg_ll_persistent_reserve_in(int sg_fd, int rq_servact, void * resp,
- int mx_resp_len, bool noisy, int verbose)
+ int mx_resp_len, bool noisy, int vb)
{
- static const char * const cdb_name_s = "Persistent reservation in";
- int res, k, ret, sense_cat;
+ static const char * const cdb_s = "Persistent reservation in";
+ int res, k, ret, s_cat;
uint8_t prin_cdb[PERSISTENT_RESERVE_IN_CMDLEN] =
{PERSISTENT_RESERVE_IN_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -1045,37 +1032,36 @@ sg_ll_persistent_reserve_in(int sg_fd, int rq_servact, void * resp,
prin_cdb[1] = (uint8_t)(rq_servact & 0x1f);
sg_put_unaligned_be16((uint16_t)mx_resp_len, prin_cdb + 7);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < PERSISTENT_RESERVE_IN_CMDLEN; ++k)
pr2ws("%02x ", prin_cdb[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, prin_cdb, sizeof(prin_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, mx_resp_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, mx_resp_len, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else {
- if ((verbose > 2) && (ret > 0)) {
- pr2ws(" %s: response", cdb_name_s);
- if (3 == verbose) {
+ if ((vb > 2) && (ret > 0)) {
+ pr2ws(" %s: response", cdb_s);
+ if (3 == vb) {
pr2ws("%s:\n", (ret > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)resp, (ret > 256 ? 256 : ret),
-1);
@@ -1096,10 +1082,10 @@ sg_ll_persistent_reserve_in(int sg_fd, int rq_servact, void * resp,
int
sg_ll_persistent_reserve_out(int sg_fd, int rq_servact, int rq_scope,
unsigned int rq_type, void * paramp,
- int param_len, bool noisy, int verbose)
+ int param_len, bool noisy, int vb)
{
- static const char * const cdb_name_s = "Persistent reservation out";
- int res, k, ret, sense_cat;
+ static const char * const cdb_s = "Persistent reservation out";
+ int res, k, ret, s_cat;
uint8_t prout_cdb[PERSISTENT_RESERVE_OUT_CMDLEN] =
{PERSISTENT_RESERVE_OUT_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -1110,35 +1096,34 @@ sg_ll_persistent_reserve_out(int sg_fd, int rq_servact, int rq_scope,
prout_cdb[2] = (((rq_scope & 0xf) << 4) | (rq_type & 0xf));
sg_put_unaligned_be16((uint16_t)param_len, prout_cdb + 7);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < PERSISTENT_RESERVE_OUT_CMDLEN; ++k)
pr2ws("%02x ", prout_cdb[k]);
pr2ws("\n");
- if (verbose > 1) {
- pr2ws(" %s parameters:\n", cdb_name_s);
+ if (vb > 1) {
+ pr2ws(" %s parameters:\n", cdb_s);
hex2stderr((const uint8_t *)paramp, param_len, 0);
}
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, prout_cdb, sizeof(prout_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_out(ptvp, (uint8_t *)paramp, param_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -1172,10 +1157,10 @@ has_blk_ili(uint8_t * sensep, int sb_len)
int
sg_ll_read_long10(int sg_fd, bool pblock, bool correct, unsigned int lba,
void * resp, int xfer_len, int * offsetp, bool noisy,
- int verbose)
+ int vb)
{
- static const char * const cdb_name_s = "read long(10)";
- int k, res, sense_cat, ret;
+ static const char * const cdb_s = "read long(10)";
+ int k, res, s_cat, ret;
uint8_t readLong_cdb[READ_LONG10_CMDLEN];
uint8_t sense_b[SENSE_BUFF_LEN];
struct sg_pt_base * ptvp;
@@ -1189,25 +1174,24 @@ sg_ll_read_long10(int sg_fd, bool pblock, bool correct, unsigned int lba,
sg_put_unaligned_be32((uint32_t)lba, readLong_cdb + 2);
sg_put_unaligned_be16((uint16_t)xfer_len, readLong_cdb + 7);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < READ_LONG10_CMDLEN; ++k)
pr2ws("%02x ", readLong_cdb[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, readLong_cdb, sizeof(readLong_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, xfer_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, xfer_len, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
@@ -1226,7 +1210,7 @@ sg_ll_read_long10(int sg_fd, bool pblock, bool correct, unsigned int lba,
*offsetp = (int)(int64_t)ull;
ret = SG_LIB_CAT_ILLEGAL_REQ_WITH_INFO;
} else {
- if (verbose > 1)
+ if (vb > 1)
pr2ws(" info field: 0x%" PRIx64 ", valid: %d, "
"ili: %d\n", ull, valid, ili);
ret = SG_LIB_CAT_ILLEGAL_REQ;
@@ -1234,13 +1218,13 @@ sg_ll_read_long10(int sg_fd, bool pblock, bool correct, unsigned int lba,
}
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else {
- if ((verbose > 2) && (ret > 0)) {
- pr2ws(" %s: response", cdb_name_s);
- if (3 == verbose) {
+ if ((vb > 2) && (ret > 0)) {
+ pr2ws(" %s: response", cdb_s);
+ if (3 == vb) {
pr2ws("%s:\n", (ret > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)resp, (ret > 256 ? 256 : ret),
-1);
@@ -1261,10 +1245,10 @@ sg_ll_read_long10(int sg_fd, bool pblock, bool correct, unsigned int lba,
int
sg_ll_read_long16(int sg_fd, bool pblock, bool correct, uint64_t llba,
void * resp, int xfer_len, int * offsetp, bool noisy,
- int verbose)
+ int vb)
{
- static const char * const cdb_name_s = "read long(16)";
- int k, res, sense_cat, ret;
+ static const char * const cdb_s = "read long(16)";
+ int k, res, s_cat, ret;
uint8_t readLong_cdb[SERVICE_ACTION_IN_16_CMDLEN];
uint8_t sense_b[SENSE_BUFF_LEN];
struct sg_pt_base * ptvp;
@@ -1279,25 +1263,24 @@ sg_ll_read_long16(int sg_fd, bool pblock, bool correct, uint64_t llba,
sg_put_unaligned_be64(llba, readLong_cdb + 2);
sg_put_unaligned_be16((uint16_t)xfer_len, readLong_cdb + 12);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < SERVICE_ACTION_IN_16_CMDLEN; ++k)
pr2ws("%02x ", readLong_cdb[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, readLong_cdb, sizeof(readLong_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, xfer_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, xfer_len, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
@@ -1316,7 +1299,7 @@ sg_ll_read_long16(int sg_fd, bool pblock, bool correct, uint64_t llba,
*offsetp = (int)(int64_t)ull;
ret = SG_LIB_CAT_ILLEGAL_REQ_WITH_INFO;
} else {
- if (verbose > 1)
+ if (vb > 1)
pr2ws(" info field: 0x%" PRIx64 ", valid: %d, "
"ili: %d\n", ull, (int)valid, (int)ili);
ret = SG_LIB_CAT_ILLEGAL_REQ;
@@ -1324,13 +1307,13 @@ sg_ll_read_long16(int sg_fd, bool pblock, bool correct, uint64_t llba,
}
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else {
- if ((verbose > 2) && (ret > 0)) {
- pr2ws(" %s: response", cdb_name_s);
- if (3 == verbose) {
+ if ((vb > 2) && (ret > 0)) {
+ pr2ws(" %s: response", cdb_s);
+ if (3 == vb) {
pr2ws("%s:\n", (ret > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)resp, (ret > 256 ? 256 : ret),
-1);
@@ -1351,10 +1334,10 @@ sg_ll_read_long16(int sg_fd, bool pblock, bool correct, uint64_t llba,
int
sg_ll_write_long10(int sg_fd, bool cor_dis, bool wr_uncor, bool pblock,
unsigned int lba, void * data_out, int xfer_len,
- int * offsetp, bool noisy, int verbose)
+ int * offsetp, bool noisy, int vb)
{
- static const char * const cdb_name_s = "write long(10)";
- int k, res, sense_cat, ret;
+ static const char * const cdb_s = "write long(10)";
+ int k, res, s_cat, ret;
uint8_t writeLong_cdb[WRITE_LONG10_CMDLEN];
uint8_t sense_b[SENSE_BUFF_LEN];
struct sg_pt_base * ptvp;
@@ -1370,25 +1353,24 @@ sg_ll_write_long10(int sg_fd, bool cor_dis, bool wr_uncor, bool pblock,
sg_put_unaligned_be32((uint32_t)lba, writeLong_cdb + 2);
sg_put_unaligned_be16((uint16_t)xfer_len, writeLong_cdb + 7);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < (int)sizeof(writeLong_cdb); ++k)
pr2ws("%02x ", writeLong_cdb[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, writeLong_cdb, sizeof(writeLong_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_out(ptvp, (uint8_t *)data_out, xfer_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
@@ -1406,7 +1388,7 @@ sg_ll_write_long10(int sg_fd, bool cor_dis, bool wr_uncor, bool pblock,
*offsetp = (int)(int64_t)ull;
ret = SG_LIB_CAT_ILLEGAL_REQ_WITH_INFO;
} else {
- if (verbose > 1)
+ if (vb > 1)
pr2ws(" info field: 0x%" PRIx64 ", valid: %d, "
"ili: %d\n", ull, (int)valid, (int)ili);
ret = SG_LIB_CAT_ILLEGAL_REQ;
@@ -1414,7 +1396,7 @@ sg_ll_write_long10(int sg_fd, bool cor_dis, bool wr_uncor, bool pblock,
}
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -1430,10 +1412,10 @@ sg_ll_write_long10(int sg_fd, bool cor_dis, bool wr_uncor, bool pblock,
int
sg_ll_write_long16(int sg_fd, bool cor_dis, bool wr_uncor, bool pblock,
uint64_t llba, void * data_out, int xfer_len,
- int * offsetp, bool noisy, int verbose)
+ int * offsetp, bool noisy, int vb)
{
- static const char * const cdb_name_s = "write long(16)";
- int k, res, sense_cat, ret;
+ static const char * const cdb_s = "write long(16)";
+ int k, res, s_cat, ret;
uint8_t writeLong_cdb[SERVICE_ACTION_OUT_16_CMDLEN];
uint8_t sense_b[SENSE_BUFF_LEN];
struct sg_pt_base * ptvp;
@@ -1450,25 +1432,24 @@ sg_ll_write_long16(int sg_fd, bool cor_dis, bool wr_uncor, bool pblock,
sg_put_unaligned_be64(llba, writeLong_cdb + 2);
sg_put_unaligned_be16((uint16_t)xfer_len, writeLong_cdb + 12);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < SERVICE_ACTION_OUT_16_CMDLEN; ++k)
pr2ws("%02x ", writeLong_cdb[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, writeLong_cdb, sizeof(writeLong_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_out(ptvp, (uint8_t *)data_out, xfer_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
@@ -1487,7 +1468,7 @@ sg_ll_write_long16(int sg_fd, bool cor_dis, bool wr_uncor, bool pblock,
*offsetp = (int)(int64_t)ull;
ret = SG_LIB_CAT_ILLEGAL_REQ_WITH_INFO;
} else {
- if (verbose > 1)
+ if (vb > 1)
pr2ws(" info field: 0x%" PRIx64 ", valid: %d, "
"ili: %d\n", ull, (int)valid, (int)ili);
ret = SG_LIB_CAT_ILLEGAL_REQ;
@@ -1495,7 +1476,7 @@ sg_ll_write_long16(int sg_fd, bool cor_dis, bool wr_uncor, bool pblock,
}
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -1513,10 +1494,10 @@ int
sg_ll_verify10(int sg_fd, int vrprotect, bool dpo, int bytchk,
unsigned int lba, int veri_len, void * data_out,
int data_out_len, unsigned int * infop, bool noisy,
- int verbose)
+ int vb)
{
- static const char * const cdb_name_s = "verify(10)";
- int k, res, ret, sense_cat, slen;
+ static const char * const cdb_s = "verify(10)";
+ int k, res, ret, s_cat, slen;
uint8_t v_cdb[VERIFY10_CMDLEN] =
{VERIFY10_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -1528,31 +1509,30 @@ sg_ll_verify10(int sg_fd, int vrprotect, bool dpo, int bytchk,
v_cdb[1] |= 0x10;
sg_put_unaligned_be32((uint32_t)lba, v_cdb + 2);
sg_put_unaligned_be16((uint16_t)veri_len, v_cdb + 7);
- if (verbose > 1) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb > 1) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < VERIFY10_CMDLEN; ++k)
pr2ws("%02x ", v_cdb[k]);
pr2ws("\n");
- if ((verbose > 3) && bytchk && data_out && (data_out_len > 0)) {
+ if ((vb > 3) && bytchk && data_out && (data_out_len > 0)) {
k = data_out_len > 4104 ? 4104 : data_out_len;
pr2ws(" data_out buffer%s\n",
(data_out_len > 4104 ? ", first 4104 bytes" : ""));
- hex2stderr((const uint8_t *)data_out, k, verbose < 5);
+ hex2stderr((const uint8_t *)data_out, k, vb < 5);
}
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, v_cdb, sizeof(v_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
if (data_out_len > 0)
set_scsi_pt_data_out(ptvp, (uint8_t *)data_out, data_out_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
@@ -1573,7 +1553,7 @@ sg_ll_verify10(int sg_fd, int vrprotect, bool dpo, int bytchk,
}
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -1590,10 +1570,10 @@ sg_ll_verify10(int sg_fd, int vrprotect, bool dpo, int bytchk,
int
sg_ll_verify16(int sg_fd, int vrprotect, bool dpo, int bytchk, uint64_t llba,
int veri_len, int group_num, void * data_out,
- int data_out_len, uint64_t * infop, bool noisy, int verbose)
+ int data_out_len, uint64_t * infop, bool noisy, int vb)
{
- static const char * const cdb_name_s = "verify(16)";
- int k, res, ret, sense_cat, slen;
+ static const char * const cdb_s = "verify(16)";
+ int k, res, ret, s_cat, slen;
uint8_t v_cdb[VERIFY16_CMDLEN] =
{VERIFY16_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -1606,31 +1586,30 @@ sg_ll_verify16(int sg_fd, int vrprotect, bool dpo, int bytchk, uint64_t llba,
sg_put_unaligned_be64(llba, v_cdb + 2);
sg_put_unaligned_be32((uint32_t)veri_len, v_cdb + 10);
v_cdb[14] = group_num & 0x1f;
- if (verbose > 1) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb > 1) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < VERIFY16_CMDLEN; ++k)
pr2ws("%02x ", v_cdb[k]);
pr2ws("\n");
- if ((verbose > 3) && bytchk && data_out && (data_out_len > 0)) {
+ if ((vb > 3) && bytchk && data_out && (data_out_len > 0)) {
k = data_out_len > 4104 ? 4104 : data_out_len;
pr2ws(" data_out buffer%s\n",
(data_out_len > 4104 ? ", first 4104 bytes" : ""));
- hex2stderr((const uint8_t *)data_out, k, verbose < 5);
+ hex2stderr((const uint8_t *)data_out, k, vb < 5);
}
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return sg_convert_errno(ENOMEM);
set_scsi_pt_cdb(ptvp, v_cdb, sizeof(v_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
if (data_out_len > 0)
set_scsi_pt_data_out(ptvp, (uint8_t *)data_out, data_out_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
@@ -1651,7 +1630,7 @@ sg_ll_verify16(int sg_fd, int vrprotect, bool dpo, int bytchk, uint64_t llba,
}
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -1685,7 +1664,7 @@ sg_ll_ata_pt(int sg_fd, const uint8_t * cdbp, int cdb_len,
int timeout_secs, void * dinp, void * doutp, int dlen,
uint8_t * sensep, int max_sense_len,
uint8_t * ata_return_dp, int max_ata_return_len,
- int * residp, int verbose)
+ int * residp, int vb)
{
int k, res, slen, duration;
int ret = -1;
@@ -1725,7 +1704,7 @@ sg_ll_ata_pt(int sg_fd, const uint8_t * cdbp, int cdb_len,
return -1;
}
if (NULL == cdbp) {
- if (verbose)
+ if (vb)
pr2ws("%s NULL cdb pointer\n", cnamep);
return -1;
}
@@ -1736,7 +1715,7 @@ sg_ll_ata_pt(int sg_fd, const uint8_t * cdbp, int cdb_len,
sp = sense_b;
slen = sizeof(sense_b);
}
- if (verbose) {
+ if (vb) {
pr2ws(" %s cdb: ", cnamep);
if (cdb_len < 32) {
for (k = 0; k < cdb_len; ++k)
@@ -1759,21 +1738,21 @@ sg_ll_ata_pt(int sg_fd, const uint8_t * cdbp, int cdb_len,
}
res = do_scsi_pt(ptvp, sg_fd,
((timeout_secs > 0) ? timeout_secs : DEF_PT_TIMEOUT),
- verbose);
+ vb);
if (SCSI_PT_DO_BAD_PARAMS == res) {
- if (verbose)
+ if (vb)
pr2ws("%s: bad parameters\n", cnamep);
goto out;
} else if (SCSI_PT_DO_TIMEOUT == res) {
- if (verbose)
+ if (vb)
pr2ws("%s: timeout\n", cnamep);
goto out;
} else if (res > 2) {
- if (verbose)
+ if (vb)
pr2ws("%s: do_scsi_pt: errno=%d\n", cnamep, -res);
}
- if ((verbose > 2) && ((duration = get_scsi_pt_duration_ms(ptvp)) >= 0))
+ if ((vb > 2) && ((duration = get_scsi_pt_duration_ms(ptvp)) >= 0))
pr2ws(" duration=%d ms\n", duration);
switch (get_scsi_pt_result_category(ptvp)) {
@@ -1814,17 +1793,17 @@ sg_ll_ata_pt(int sg_fd, const uint8_t * cdbp, int cdb_len,
ret = get_scsi_pt_status_response(ptvp);
break;
case SCSI_PT_RESULT_TRANSPORT_ERR:
- if (verbose)
+ if (vb)
pr2ws("%s: transport error: %s\n", cnamep,
get_scsi_pt_transport_err_str(ptvp, sizeof(b), b));
break;
case SCSI_PT_RESULT_OS_ERR:
- if (verbose)
+ if (vb)
pr2ws("%s: os error: %s\n", cnamep,
get_scsi_pt_os_err_str(ptvp, sizeof(b) , b));
break;
default:
- if (verbose)
+ if (vb)
pr2ws("%s: unknown pt_result_category=%d\n", cnamep,
get_scsi_pt_result_category(ptvp));
break;
@@ -1839,10 +1818,10 @@ out:
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_read_buffer(int sg_fd, int mode, int buffer_id, int buffer_offset,
- void * resp, int mx_resp_len, bool noisy, int verbose)
+ void * resp, int mx_resp_len, bool noisy, int vb)
{
- static const char * const cdb_name_s = "read buffer(10)";
- int res, k, ret, sense_cat;
+ static const char * const cdb_s = "read buffer(10)";
+ int res, k, ret, s_cat;
uint8_t rbuf_cdb[READ_BUFFER_CMDLEN] =
{READ_BUFFER_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -1852,37 +1831,36 @@ sg_ll_read_buffer(int sg_fd, int mode, int buffer_id, int buffer_offset,
rbuf_cdb[2] = (uint8_t)(buffer_id & 0xff);
sg_put_unaligned_be24((uint32_t)buffer_offset, rbuf_cdb + 3);
sg_put_unaligned_be24((uint32_t)mx_resp_len, rbuf_cdb + 6);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < READ_BUFFER_CMDLEN; ++k)
pr2ws("%02x ", rbuf_cdb[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return -1;
set_scsi_pt_cdb(ptvp, rbuf_cdb, sizeof(rbuf_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, mx_resp_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, mx_resp_len, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else {
- if ((verbose > 2) && (ret > 0)) {
- pr2ws(" %s: response", cdb_name_s);
- if (3 == verbose) {
+ if ((vb > 2) && (ret > 0)) {
+ pr2ws(" %s: response", cdb_s);
+ if (3 == vb) {
pr2ws("%s:\n", (ret > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)resp, (ret > 256 ? 256 : ret),
-1);
@@ -1901,10 +1879,10 @@ sg_ll_read_buffer(int sg_fd, int mode, int buffer_id, int buffer_offset,
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_write_buffer(int sg_fd, int mode, int buffer_id, int buffer_offset,
- void * paramp, int param_len, bool noisy, int verbose)
+ void * paramp, int param_len, bool noisy, int vb)
{
- static const char * const cdb_name_s = "write buffer";
- int k, res, ret, sense_cat;
+ static const char * const cdb_s = "write buffer";
+ int k, res, ret, s_cat;
uint8_t wbuf_cdb[WRITE_BUFFER_CMDLEN] =
{WRITE_BUFFER_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -1914,14 +1892,14 @@ sg_ll_write_buffer(int sg_fd, int mode, int buffer_id, int buffer_offset,
wbuf_cdb[2] = (uint8_t)(buffer_id & 0xff);
sg_put_unaligned_be24((uint32_t)buffer_offset, wbuf_cdb + 3);
sg_put_unaligned_be24((uint32_t)param_len, wbuf_cdb + 6);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < WRITE_BUFFER_CMDLEN; ++k)
pr2ws("%02x ", wbuf_cdb[k]);
pr2ws("\n");
- if ((verbose > 1) && paramp && param_len) {
- pr2ws(" %s parameter list", cdb_name_s);
- if (2 == verbose) {
+ if ((vb > 1) && paramp && param_len) {
+ pr2ws(" %s parameter list", cdb_s);
+ if (2 == vb) {
pr2ws("%s:\n", (param_len > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)paramp,
(param_len > 256 ? 256 : param_len), -1);
@@ -1932,24 +1910,23 @@ sg_ll_write_buffer(int sg_fd, int mode, int buffer_id, int buffer_offset,
}
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return -1;
set_scsi_pt_cdb(ptvp, wbuf_cdb, sizeof(wbuf_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_out(ptvp, (uint8_t *)paramp, param_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -1970,9 +1947,9 @@ int
sg_ll_write_buffer_v2(int sg_fd, int mode, int m_specific, int buffer_id,
uint32_t buffer_offset, void * paramp,
uint32_t param_len, int timeout_secs, bool noisy,
- int verbose)
+ int vb)
{
- int k, res, ret, sense_cat;
+ int k, res, ret, s_cat;
uint8_t wbuf_cdb[WRITE_BUFFER_CMDLEN] =
{WRITE_BUFFER_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -1991,12 +1968,12 @@ sg_ll_write_buffer_v2(int sg_fd, int mode, int m_specific, int buffer_id,
wbuf_cdb[2] = (uint8_t)(buffer_id & 0xff);
sg_put_unaligned_be24(buffer_offset, wbuf_cdb + 3);
sg_put_unaligned_be24(param_len, wbuf_cdb + 6);
- if (verbose) {
+ if (vb) {
pr2ws(" Write buffer cdb: ");
for (k = 0; k < WRITE_BUFFER_CMDLEN; ++k)
pr2ws("%02x ", wbuf_cdb[k]);
pr2ws("\n");
- if ((verbose > 1) && paramp && param_len) {
+ if ((vb > 1) && paramp && param_len) {
pr2ws(" Write buffer parameter list%s:\n",
((param_len > 256) ? " (first 256 bytes)" : ""));
hex2stderr((const uint8_t *)paramp,
@@ -2014,19 +1991,18 @@ sg_ll_write_buffer_v2(int sg_fd, int mode, int m_specific, int buffer_id,
set_scsi_pt_cdb(ptvp, wbuf_cdb, sizeof(wbuf_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_out(ptvp, (uint8_t *)paramp, param_len);
- res = do_scsi_pt(ptvp, sg_fd, timeout_secs, verbose);
- ret = sg_cmds_process_resp(ptvp, "Write buffer", res, SG_NO_DATA_IN,
- sense_b, noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, timeout_secs, vb);
+ ret = sg_cmds_process_resp(ptvp, "Write buffer", res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -2040,20 +2016,20 @@ sg_ll_write_buffer_v2(int sg_fd, int mode, int m_specific, int buffer_id,
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_unmap(int sg_fd, int group_num, int timeout_secs, void * paramp,
- int param_len, bool noisy, int verbose)
+ int param_len, bool noisy, int vb)
{
return sg_ll_unmap_v2(sg_fd, false, group_num, timeout_secs, paramp,
- param_len, noisy, verbose);
+ param_len, noisy, vb);
}
/* Invokes a SCSI UNMAP (SBC-3) command. Version 2 adds anchor field
* (sbc3r22). Otherwise same as sg_ll_unmap() . */
int
sg_ll_unmap_v2(int sg_fd, bool anchor, int group_num, int timeout_secs,
- void * paramp, int param_len, bool noisy, int verbose)
+ void * paramp, int param_len, bool noisy, int vb)
{
- static const char * const cdb_name_s = "unmap";
- int k, res, ret, sense_cat, tmout;
+ static const char * const cdb_s = "unmap";
+ int k, res, ret, s_cat, tmout;
uint8_t u_cdb[UNMAP_CMDLEN] =
{UNMAP_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -2064,35 +2040,34 @@ sg_ll_unmap_v2(int sg_fd, bool anchor, int group_num, int timeout_secs,
tmout = (timeout_secs > 0) ? timeout_secs : DEF_PT_TIMEOUT;
u_cdb[6] = group_num & 0x1f;
sg_put_unaligned_be16((uint16_t)param_len, u_cdb + 7);
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < UNMAP_CMDLEN; ++k)
pr2ws("%02x ", u_cdb[k]);
pr2ws("\n");
- if ((verbose > 1) && paramp && param_len) {
- pr2ws(" %s parameter list:\n", cdb_name_s);
+ if ((vb > 1) && paramp && param_len) {
+ pr2ws(" %s parameter list:\n", cdb_s);
hex2stderr((const uint8_t *)paramp, param_len, -1);
}
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return -1;
set_scsi_pt_cdb(ptvp, u_cdb, sizeof(u_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_out(ptvp, (uint8_t *)paramp, param_len);
- res = do_scsi_pt(ptvp, sg_fd, tmout, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, tmout, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -2105,46 +2080,45 @@ sg_ll_unmap_v2(int sg_fd, bool anchor, int group_num, int timeout_secs,
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_read_block_limits(int sg_fd, void * resp, int mx_resp_len,
- bool noisy, int verbose)
+ bool noisy, int vb)
{
- static const char * const cdb_name_s = "read block limits";
- int k, ret, res, sense_cat;
+ static const char * const cdb_s = "read block limits";
+ int k, ret, res, s_cat;
uint8_t rl_cdb[READ_BLOCK_LIMITS_CMDLEN] =
{READ_BLOCK_LIMITS_CMD, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
struct sg_pt_base * ptvp;
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < READ_BLOCK_LIMITS_CMDLEN; ++k)
pr2ws("%02x ", rl_cdb[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return -1;
set_scsi_pt_cdb(ptvp, rl_cdb, sizeof(rl_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, mx_resp_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, mx_resp_len, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else {
- if ((verbose > 2) && (ret > 0)) {
- pr2ws(" %s: response", cdb_name_s);
- if (3 == verbose) {
+ if ((vb > 2) && (ret > 0)) {
+ pr2ws(" %s: response", cdb_s);
+ if (3 == vb) {
pr2ws("%s:\n", (ret > 256 ? ", first 256 bytes" : ""));
hex2stderr((const uint8_t *)resp, (ret > 256 ? 256 : ret),
-1);
@@ -2164,9 +2138,9 @@ sg_ll_read_block_limits(int sg_fd, void * resp, int mx_resp_len,
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_receive_copy_results(int sg_fd, int sa, int list_id, void * resp,
- int mx_resp_len, bool noisy, int verbose)
+ int mx_resp_len, bool noisy, int vb)
{
- int k, res, ret, sense_cat;
+ int k, res, ret, s_cat;
uint8_t rcvcopyres_cdb[THIRD_PARTY_COPY_IN_CMDLEN] =
{THIRD_PARTY_COPY_IN_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -2181,7 +2155,7 @@ sg_ll_receive_copy_results(int sg_fd, int sa, int list_id, void * resp,
sg_put_unaligned_be32((uint32_t)list_id, rcvcopyres_cdb + 2);
sg_put_unaligned_be32((uint32_t)mx_resp_len, rcvcopyres_cdb + 10);
- if (verbose) {
+ if (vb) {
pr2ws(" %s cdb: ", b);
for (k = 0; k < THIRD_PARTY_COPY_IN_CMDLEN; ++k)
pr2ws("%02x ", rcvcopyres_cdb[k]);
@@ -2193,19 +2167,18 @@ sg_ll_receive_copy_results(int sg_fd, int sa, int list_id, void * resp,
set_scsi_pt_cdb(ptvp, rcvcopyres_cdb, sizeof(rcvcopyres_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_in(ptvp, (uint8_t *)resp, mx_resp_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, b, res, mx_resp_len, sense_b, noisy,
- verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, b, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -2224,47 +2197,46 @@ sg_ll_receive_copy_results(int sg_fd, int sa, int list_id, void * resp,
* various SG_LIB_CAT_* positive values or -1 -> other errors */
int
sg_ll_extended_copy(int sg_fd, void * paramp, int param_len, bool noisy,
- int verbose)
+ int vb)
{
- int k, res, ret, sense_cat;
+ int k, res, ret, s_cat;
uint8_t xcopy_cdb[THIRD_PARTY_COPY_OUT_CMDLEN] =
{THIRD_PARTY_COPY_OUT_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
struct sg_pt_base * ptvp;
- const char * opcode_name = "Extended copy (LID1)";
+ const char * cdb_s = "Extended copy (LID1)";
xcopy_cdb[1] = (uint8_t)(EXTENDED_COPY_LID1_SA & 0x1f);
sg_put_unaligned_be32((uint32_t)param_len, xcopy_cdb + 10);
- if (verbose) {
- pr2ws(" %s cdb: ", opcode_name);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < THIRD_PARTY_COPY_OUT_CMDLEN; ++k)
pr2ws("%02x ", xcopy_cdb[k]);
pr2ws("\n");
- if ((verbose > 1) && paramp && param_len) {
- pr2ws(" %s parameter list:\n", opcode_name);
+ if ((vb > 1) && paramp && param_len) {
+ pr2ws(" %s parameter list:\n", cdb_s);
hex2stderr((const uint8_t *)paramp, param_len, -1);
}
}
- if (NULL == ((ptvp = create_pt_obj(opcode_name))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return -1;
set_scsi_pt_cdb(ptvp, xcopy_cdb, sizeof(xcopy_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_out(ptvp, (uint8_t *)paramp, param_len);
- res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, verbose);
- ret = sg_cmds_process_resp(ptvp, opcode_name, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, DEF_PT_TIMEOUT, vb);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -2281,9 +2253,9 @@ sg_ll_extended_copy(int sg_fd, void * paramp, int param_len, bool noisy,
int
sg_ll_3party_copy_out(int sg_fd, int sa, unsigned int list_id, int group_num,
int timeout_secs, void * paramp, int param_len,
- bool noisy, int verbose)
+ bool noisy, int vb)
{
- int k, res, ret, sense_cat, tmout;
+ int k, res, ret, s_cat, tmout;
uint8_t xcopy_cdb[THIRD_PARTY_COPY_OUT_CMDLEN] =
{THIRD_PARTY_COPY_OUT_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
uint8_t sense_b[SENSE_BUFF_LEN];
@@ -2313,12 +2285,12 @@ sg_ll_3party_copy_out(int sg_fd, int sa, unsigned int list_id, int group_num,
}
tmout = (timeout_secs > 0) ? timeout_secs : DEF_PT_TIMEOUT;
- if (verbose) {
+ if (vb) {
pr2ws(" %s cdb: ", cname);
for (k = 0; k < THIRD_PARTY_COPY_OUT_CMDLEN; ++k)
pr2ws("%02x ", xcopy_cdb[k]);
pr2ws("\n");
- if ((verbose > 1) && paramp && param_len) {
+ if ((vb > 1) && paramp && param_len) {
pr2ws(" %s parameter list:\n", cname);
hex2stderr((const uint8_t *)paramp, param_len, -1);
}
@@ -2329,19 +2301,18 @@ sg_ll_3party_copy_out(int sg_fd, int sa, unsigned int list_id, int group_num,
set_scsi_pt_cdb(ptvp, xcopy_cdb, sizeof(xcopy_cdb));
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
set_scsi_pt_data_out(ptvp, (uint8_t *)paramp, param_len);
- res = do_scsi_pt(ptvp, sg_fd, tmout, verbose);
- ret = sg_cmds_process_resp(ptvp, cname, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ res = do_scsi_pt(ptvp, sg_fd, tmout, vb);
+ ret = sg_cmds_process_resp(ptvp, cname, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
@@ -2362,13 +2333,13 @@ sg_ll_3party_copy_out(int sg_fd, int sa, unsigned int list_id, int group_num,
int
sg_ll_pre_fetch_x(int sg_fd, bool do_seek10, bool cdb16, bool immed,
uint64_t lba, uint32_t num_blocks, int group_num,
- int timeout_secs, bool noisy, int verbose)
+ int timeout_secs, bool noisy, int vb)
{
static const char * const cdb10_name_s = "Pre-fetch(10)";
static const char * const cdb16_name_s = "Pre-fetch(16)";
static const char * const cdb_seek_name_s = "Seek(10)";
- int k, res, sense_cat, ret, cdb_len, tmout;
- const char *cdb_name_s;
+ int k, res, s_cat, ret, cdb_len, tmout;
+ const char *cdb_s;
uint8_t preFetchCdb[PRE_FETCH16_CMDLEN]; /* all use longest cdb */
uint8_t sense_b[SENSE_BUFF_LEN];
struct sg_pt_base * ptvp;
@@ -2376,27 +2347,27 @@ sg_ll_pre_fetch_x(int sg_fd, bool do_seek10, bool cdb16, bool immed,
memset(preFetchCdb, 0, sizeof(preFetchCdb));
if (do_seek10) {
if (lba > UINT32_MAX) {
- if (verbose)
+ if (vb)
pr2ws("%s: LBA exceeds 2**32 in %s\n", __func__,
cdb_seek_name_s);
return -1;
}
preFetchCdb[0] = SEEK10_CMD;
cdb_len = SEEK10_CMDLEN;
- cdb_name_s = cdb_seek_name_s;
+ cdb_s = cdb_seek_name_s;
sg_put_unaligned_be32((uint32_t)lba, preFetchCdb + 2);
} else {
if ((! cdb16) &&
((lba > UINT32_MAX) || (num_blocks > UINT16_MAX))) {
cdb16 = true;
- if (noisy || verbose)
+ if (noisy || vb)
pr2ws("%s: do %s due to %s size\n", __func__, cdb16_name_s,
(lba > UINT32_MAX) ? "LBA" : "NUM_BLOCKS");
}
if (cdb16) {
preFetchCdb[0] = PRE_FETCH16_CMD;
cdb_len = PRE_FETCH16_CMDLEN;
- cdb_name_s = cdb16_name_s;
+ cdb_s = cdb16_name_s;
if (immed)
preFetchCdb[1] = 0x2;
sg_put_unaligned_be64(lba, preFetchCdb + 2);
@@ -2405,7 +2376,7 @@ sg_ll_pre_fetch_x(int sg_fd, bool do_seek10, bool cdb16, bool immed,
} else {
preFetchCdb[0] = PRE_FETCH10_CMD;
cdb_len = PRE_FETCH10_CMDLEN;
- cdb_name_s = cdb10_name_s;
+ cdb_s = cdb10_name_s;
if (immed)
preFetchCdb[1] = 0x2;
sg_put_unaligned_be32((uint32_t)lba, preFetchCdb + 2);
@@ -2414,39 +2385,38 @@ sg_ll_pre_fetch_x(int sg_fd, bool do_seek10, bool cdb16, bool immed,
}
}
tmout = (timeout_secs > 0) ? timeout_secs : DEF_PT_TIMEOUT;
- if (verbose) {
- pr2ws(" %s cdb: ", cdb_name_s);
+ if (vb) {
+ pr2ws(" %s cdb: ", cdb_s);
for (k = 0; k < cdb_len; ++k)
pr2ws("%02x ", preFetchCdb[k]);
pr2ws("\n");
}
- if (NULL == ((ptvp = create_pt_obj(cdb_name_s))))
+ if (NULL == ((ptvp = create_pt_obj(cdb_s))))
return -1;
set_scsi_pt_cdb(ptvp, preFetchCdb, cdb_len);
set_scsi_pt_sense(ptvp, sense_b, sizeof(sense_b));
- res = do_scsi_pt(ptvp, sg_fd, tmout, verbose);
+ res = do_scsi_pt(ptvp, sg_fd, tmout, vb);
if (0 == res) {
int sstat = get_scsi_pt_status_response(ptvp);
if (SG_LIB_CAT_CONDITION_MET == sstat) {
ret = SG_LIB_CAT_CONDITION_MET;
- if (verbose > 2)
+ if (vb > 2)
pr2ws("%s: returns SG_LIB_CAT_CONDITION_MET\n", __func__);
goto fini;
}
}
- ret = sg_cmds_process_resp(ptvp, cdb_name_s, res, SG_NO_DATA_IN, sense_b,
- noisy, verbose, &sense_cat);
+ ret = sg_cmds_process_resp(ptvp, cdb_s, res, noisy, vb, &s_cat);
if (-1 == ret)
ret = sg_convert_errno(get_scsi_pt_os_err(ptvp));
else if (-2 == ret) {
- switch (sense_cat) {
+ switch (s_cat) {
case SG_LIB_CAT_RECOVERED:
case SG_LIB_CAT_NO_SENSE:
ret = 0;
break;
default:
- ret = sense_cat;
+ ret = s_cat;
break;
}
} else
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 07:30:54 +0000