aboutsummaryrefslogtreecommitdiff
path: root/sg_cmds_basic.c
diff options
context:
space:
mode:
Diffstat (limited to 'sg_cmds_basic.c')
-rw-r--r--sg_cmds_basic.c46
1 files changed, 23 insertions, 23 deletions
diff --git a/sg_cmds_basic.c b/sg_cmds_basic.c
index d9613e14..5d1462eb 100644
--- a/sg_cmds_basic.c
+++ b/sg_cmds_basic.c
@@ -45,7 +45,7 @@
#include "sg_pt.h"
-static char * version_str = "1.38 20070124";
+static char * version_str = "1.40 20070331";
#define SENSE_BUFF_LEN 32 /* Arbitrary, could be larger */
@@ -120,7 +120,7 @@ int sg_cmds_close_device(int device_fd)
output via 'o_sense_cat' pointer (if not NULL). Outputs to
sg_warnings_strm (def: stderr) if problems; depending on 'noisy'
and 'verbose' */
-int sg_cmds_process_resp(void * ptvp, const char * leadin, int res,
+int sg_cmds_process_resp(struct sg_pt_base * ptvp, const char * leadin, int res,
int mx_resp_len, const unsigned char * sense_b,
int noisy, int verbose, int * o_sense_cat)
{
@@ -223,7 +223,7 @@ int sg_ll_inquiry(int sg_fd, int cmddt, int evpd, int pg_op,
unsigned char inqCmdBlk[INQUIRY_CMDLEN] = {INQUIRY_CMD, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
unsigned char * up;
- void * ptvp;
+ struct sg_pt_base * ptvp;
if (cmddt)
inqCmdBlk[1] |= 2;
@@ -298,7 +298,7 @@ int sg_simple_inquiry(int sg_fd, struct sg_simple_inquiry_resp * inq_data,
unsigned char inqCmdBlk[INQUIRY_CMDLEN] = {INQUIRY_CMD, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
unsigned char inq_resp[INQUIRY_RESP_INITIAL_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
if (inq_data) {
memset(inq_data, 0, sizeof(* inq_data));
@@ -382,7 +382,7 @@ int sg_ll_test_unit_ready_progress(int sg_fd, int pack_id, int * progress,
int res, ret, k, sense_cat;
unsigned char turCmdBlk[TUR_CMDLEN] = {TUR_CMD, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
if (NULL == sg_warnings_strm)
sg_warnings_strm = stderr;
@@ -460,7 +460,7 @@ int sg_ll_sync_cache_10(int sg_fd, int sync_nv, int immed, int group,
unsigned char scCmdBlk[SYNCHRONIZE_CACHE_CMDLEN] =
{SYNCHRONIZE_CACHE_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
if (sync_nv)
scCmdBlk[1] |= 4;
@@ -535,7 +535,7 @@ int sg_ll_readcap_16(int sg_fd, int pmi, unsigned long long llba,
{SERVICE_ACTION_IN_16_CMD, READ_CAPACITY_16_SA,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
if (pmi) { /* lbs only valid when pmi set */
rcCmdBlk[14] |= 1;
@@ -610,7 +610,7 @@ int sg_ll_readcap_10(int sg_fd, int pmi, unsigned int lba,
unsigned char rcCmdBlk[READ_CAPACITY_10_CMDLEN] =
{READ_CAPACITY_10_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
if (pmi) { /* lbs only valid when pmi set */
rcCmdBlk[8] |= 1;
@@ -676,7 +676,7 @@ int sg_ll_mode_sense6(int sg_fd, int dbd, int pc, int pg_code, int sub_pg_code,
unsigned char modesCmdBlk[MODE_SENSE6_CMDLEN] =
{MODE_SENSE6_CMD, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
modesCmdBlk[1] = (unsigned char)(dbd ? 0x8 : 0);
modesCmdBlk[2] = (unsigned char)(((pc << 6) & 0xc0) | (pg_code & 0x3f));
@@ -749,7 +749,7 @@ int sg_ll_mode_sense10(int sg_fd, int llbaa, int dbd, int pc, int pg_code,
unsigned char modesCmdBlk[MODE_SENSE10_CMDLEN] =
{MODE_SENSE10_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
modesCmdBlk[1] = (unsigned char)((dbd ? 0x8 : 0) | (llbaa ? 0x10 : 0));
modesCmdBlk[2] = (unsigned char)(((pc << 6) & 0xc0) | (pg_code & 0x3f));
@@ -822,7 +822,7 @@ int sg_ll_mode_select6(int sg_fd, int pf, int sp, void * paramp,
unsigned char modesCmdBlk[MODE_SELECT6_CMDLEN] =
{MODE_SELECT6_CMD, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
modesCmdBlk[1] = (unsigned char)(((pf << 4) & 0x10) | (sp & 0x1));
modesCmdBlk[4] = (unsigned char)(param_len & 0xff);
@@ -839,7 +839,7 @@ int sg_ll_mode_select6(int sg_fd, int pf, int sp, void * paramp,
fprintf(sg_warnings_strm, "\n");
}
if (verbose > 1) {
- fprintf(sg_warnings_strm, " mode select (6) parameter block\n");
+ fprintf(sg_warnings_strm, " mode select (6) parameter list\n");
dStrHex((const char *)paramp, param_len, -1);
}
@@ -892,7 +892,7 @@ int sg_ll_mode_select10(int sg_fd, int pf, int sp, void * paramp,
unsigned char modesCmdBlk[MODE_SELECT10_CMDLEN] =
{MODE_SELECT10_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
modesCmdBlk[1] = (unsigned char)(((pf << 4) & 0x10) | (sp & 0x1));
modesCmdBlk[7] = (unsigned char)((param_len >> 8) & 0xff);
@@ -910,7 +910,7 @@ int sg_ll_mode_select10(int sg_fd, int pf, int sp, void * paramp,
fprintf(sg_warnings_strm, "\n");
}
if (verbose > 1) {
- fprintf(sg_warnings_strm, " mode select (10) parameter block\n");
+ fprintf(sg_warnings_strm, " mode select (10) parameter list\n");
dStrHex((const char *)paramp, param_len, -1);
}
@@ -1077,8 +1077,8 @@ int sg_get_mode_page_controls(int sg_fd, int mode6, int pg_code,
ebuff, EBUFF_SZ);
if (offset < 0) {
if (('\0' != ebuff[0]) && (verbose > 0))
- fprintf(sg_warnings_strm, "sg_get_mode_page_types: "
- "current values: %s\n", ebuff);
+ fprintf(sg_warnings_strm, "sg_get_mode_page_controls: %s\n",
+ ebuff);
return SG_LIB_CAT_MALFORMED;
}
xfer_len = calc_len - offset;
@@ -1124,7 +1124,7 @@ int sg_ll_request_sense(int sg_fd, int desc, void * resp, int mx_resp_len,
unsigned char rsCmdBlk[REQUEST_SENSE_CMDLEN] =
{REQUEST_SENSE_CMD, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
if (desc)
rsCmdBlk[1] |= 0x1;
@@ -1197,7 +1197,7 @@ int sg_ll_report_luns(int sg_fd, int select_report, void * resp,
unsigned char rlCmdBlk[REPORT_LUNS_CMDLEN] =
{REPORT_LUNS_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
rlCmdBlk[2] = select_report & 0xff;
rlCmdBlk[6] = (mx_resp_len >> 24) & 0xff;
@@ -1261,7 +1261,7 @@ int sg_ll_log_sense(int sg_fd, int ppc, int sp, int pc, int pg_code,
unsigned char logsCmdBlk[LOG_SENSE_CMDLEN] =
{LOG_SENSE_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
if (NULL == sg_warnings_strm)
sg_warnings_strm = stderr;
@@ -1333,7 +1333,7 @@ int sg_ll_log_select(int sg_fd, int pcr, int sp, int pc,
unsigned char logsCmdBlk[LOG_SELECT_CMDLEN] =
{LOG_SELECT_CMD, 0, 0, 0, 0, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
if (NULL == sg_warnings_strm)
sg_warnings_strm = stderr;
@@ -1353,7 +1353,7 @@ int sg_ll_log_select(int sg_fd, int pcr, int sp, int pc,
fprintf(sg_warnings_strm, "\n");
}
if ((verbose > 1) && (param_len > 0)) {
- fprintf(sg_warnings_strm, " log select parameter block\n");
+ fprintf(sg_warnings_strm, " log select parameter list\n");
dStrHex((const char *)paramp, param_len, -1);
}
@@ -1406,7 +1406,7 @@ int sg_ll_start_stop_unit(int sg_fd, int immed, int fl_num, int power_cond,
unsigned char ssuBlk[START_STOP_CMDLEN] = {START_STOP_CMD, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
int k, res, ret, sense_cat;
- void * ptvp;
+ struct sg_pt_base * ptvp;
ssuBlk[1] = immed & 1;
ssuBlk[3] = fl_num & 3;
@@ -1469,7 +1469,7 @@ int sg_ll_prevent_allow(int sg_fd, int prevent, int noisy, int verbose)
unsigned char pCmdBlk[PREVENT_ALLOW_CMDLEN] =
{PREVENT_ALLOW_CMD, 0, 0, 0, 0, 0};
unsigned char sense_b[SENSE_BUFF_LEN];
- void * ptvp;
+ struct sg_pt_base * ptvp;
if (NULL == sg_warnings_strm)
sg_warnings_strm = stderr;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-21 23:38:25 +0000