admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

TYPO: Change periperal_device_type to just device_type

Browse Source 
but leave the old name as a define for backward compatibility
This commit is contained in:
Ronnie Sahlberg
2012-09-03 09:45:59 -07:00
parent 77fc2497f7
commit 116af01156
14 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/iscsiclient.c
View File

@@ -294,7 +294,7 @@ void inquiry_cb(struct iscsi_context *iscsi, int status, void *command_data, voi
exit(10); exit(10);
} }
printf("Device Type is %d. VendorId:%s ProductId:%s\n", inq->periperal_device_type, inq->vendor_identification, inq->product_identification); printf("Device Type is %d. VendorId:%s ProductId:%s\n", inq->device_type, inq->vendor_identification, inq->product_identification);
printf("Send MODESENSE6\n"); printf("Send MODESENSE6\n");
if (iscsi_modesense6_task(iscsi, clnt->lun, 0, SCSI_MODESENSE_PC_CURRENT, SCSI_MODESENSE_PAGECODE_RETURN_ALL_PAGES, 0, 4, modesense6_cb, private_data) == NULL) { if (iscsi_modesense6_task(iscsi, clnt->lun, 0, SCSI_MODESENSE_PC_CURRENT, SCSI_MODESENSE_PAGECODE_RETURN_ALL_PAGES, 0, 4, modesense6_cb, private_data) == NULL) {
printf("failed to send modesense6 command\n"); printf("failed to send modesense6 command\n");

32
include/scsi-lowlevel.h
View File

@@ -367,9 +367,13 @@ enum scsi_inquiry_tpgs {
SCSI_INQUIRY_TPGS_IMPLICIT_AND_EXPLICIT = 0x03 SCSI_INQUIRY_TPGS_IMPLICIT_AND_EXPLICIT = 0x03
}; };
/* fix typos, leave old names for backward compatibility */
#define periperal_qualifier qualifier
#define periperal_device_type device_type
struct scsi_inquiry_standard { struct scsi_inquiry_standard {
enum scsi_inquiry_peripheral_qualifier periperal_qualifier; enum scsi_inquiry_peripheral_qualifier qualifier;
enum scsi_inquiry_peripheral_device_type periperal_device_type; enum scsi_inquiry_peripheral_device_type device_type;
int rmb; int rmb;
int version; int version;
int normaca; int normaca;
@@ -410,8 +414,8 @@ enum scsi_inquiry_pagecode {
EXTERN const char *scsi_inquiry_pagecode_to_str(int pagecode); EXTERN const char *scsi_inquiry_pagecode_to_str(int pagecode);
struct scsi_inquiry_supported_pages { struct scsi_inquiry_supported_pages {
enum scsi_inquiry_peripheral_qualifier periperal_qualifier; enum scsi_inquiry_peripheral_qualifier qualifier;
enum scsi_inquiry_peripheral_device_type periperal_device_type; enum scsi_inquiry_peripheral_device_type device_type;
enum scsi_inquiry_pagecode pagecode; enum scsi_inquiry_pagecode pagecode;
int num_pages; int num_pages;
@@ -419,8 +423,8 @@ struct scsi_inquiry_supported_pages {
}; };
struct scsi_inquiry_block_limits { struct scsi_inquiry_block_limits {
enum scsi_inquiry_peripheral_qualifier periperal_qualifier; enum scsi_inquiry_peripheral_qualifier qualifier;
enum scsi_inquiry_peripheral_device_type periperal_device_type; enum scsi_inquiry_peripheral_device_type device_type;
enum scsi_inquiry_pagecode pagecode; enum scsi_inquiry_pagecode pagecode;
int wsnz; /* write same no zero */ int wsnz; /* write same no zero */
@@ -438,8 +442,8 @@ struct scsi_inquiry_block_limits {
}; };
struct scsi_inquiry_block_device_characteristics { struct scsi_inquiry_block_device_characteristics {
enum scsi_inquiry_peripheral_qualifier periperal_qualifier; enum scsi_inquiry_peripheral_qualifier qualifier;
enum scsi_inquiry_peripheral_device_type periperal_device_type; enum scsi_inquiry_peripheral_device_type device_type;
enum scsi_inquiry_pagecode pagecode; enum scsi_inquiry_pagecode pagecode;
int medium_rotation_rate; int medium_rotation_rate;
@@ -452,8 +456,8 @@ enum scsi_inquiry_provisioning_type {
}; };
struct scsi_inquiry_logical_block_provisioning { struct scsi_inquiry_logical_block_provisioning {
enum scsi_inquiry_peripheral_qualifier periperal_qualifier; enum scsi_inquiry_peripheral_qualifier qualifier;
enum scsi_inquiry_peripheral_device_type periperal_device_type; enum scsi_inquiry_peripheral_device_type device_type;
enum scsi_inquiry_pagecode pagecode; enum scsi_inquiry_pagecode pagecode;
int threshold_exponent; int threshold_exponent;
@@ -469,8 +473,8 @@ struct scsi_inquiry_logical_block_provisioning {
EXTERN struct scsi_task *scsi_cdb_inquiry(int evpd, int page_code, int alloc_len); EXTERN struct scsi_task *scsi_cdb_inquiry(int evpd, int page_code, int alloc_len);
struct scsi_inquiry_unit_serial_number { struct scsi_inquiry_unit_serial_number {
enum scsi_inquiry_peripheral_qualifier periperal_qualifier; enum scsi_inquiry_peripheral_qualifier qualifier;
enum scsi_inquiry_peripheral_device_type periperal_device_type; enum scsi_inquiry_peripheral_device_type device_type;
enum scsi_inquiry_pagecode pagecode; enum scsi_inquiry_pagecode pagecode;
char *usn; char *usn;
@@ -533,8 +537,8 @@ struct scsi_inquiry_device_designator {
}; };
struct scsi_inquiry_device_identification { struct scsi_inquiry_device_identification {
enum scsi_inquiry_peripheral_qualifier periperal_qualifier; enum scsi_inquiry_peripheral_qualifier qualifier;
enum scsi_inquiry_peripheral_device_type periperal_device_type; enum scsi_inquiry_peripheral_device_type device_type;
enum scsi_inquiry_pagecode pagecode; enum scsi_inquiry_pagecode pagecode;
struct scsi_inquiry_device_designator *designators; struct scsi_inquiry_device_designator *designators;

28
lib/scsi-lowlevel.c
View File

@@ -469,8 +469,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
return NULL; return NULL;
} }
inq->periperal_qualifier = (task->datain.data[0]>>5)&0x07; inq->qualifier = (task->datain.data[0]>>5)&0x07;
inq->periperal_device_type = task->datain.data[0]&0x1f; inq->device_type = task->datain.data[0]&0x1f;
inq->rmb = !!(task->datain.data[1]&0x80); inq->rmb = !!(task->datain.data[1]&0x80);
inq->version = task->datain.data[2]; inq->version = task->datain.data[2];
inq->normaca = !!(task->datain.data[3]&0x20); inq->normaca = !!(task->datain.data[3]&0x20);
@@ -513,8 +513,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
if (inq == NULL) { if (inq == NULL) {
return NULL; return NULL;
} }
inq->periperal_qualifier = (task->datain.data[0]>>5)&0x07; inq->qualifier = (task->datain.data[0]>>5)&0x07;
inq->periperal_device_type = task->datain.data[0]&0x1f; inq->device_type = task->datain.data[0]&0x1f;
inq->pagecode = task->datain.data[1]; inq->pagecode = task->datain.data[1];
inq->num_pages = task->datain.data[3]; inq->num_pages = task->datain.data[3];
@@ -533,8 +533,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
if (inq == NULL) { if (inq == NULL) {
return NULL; return NULL;
} }
inq->periperal_qualifier = (task->datain.data[0]>>5)&0x07; inq->qualifier = (task->datain.data[0]>>5)&0x07;
inq->periperal_device_type = task->datain.data[0]&0x1f; inq->device_type = task->datain.data[0]&0x1f;
inq->pagecode = task->datain.data[1]; inq->pagecode = task->datain.data[1];
inq->usn = scsi_malloc(task, task->datain.data[3]+1); inq->usn = scsi_malloc(task, task->datain.data[3]+1);
@@ -555,8 +555,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
if (inq == NULL) { if (inq == NULL) {
return NULL; return NULL;
} }
inq->periperal_qualifier = (task->datain.data[0]>>5)&0x07; inq->qualifier = (task->datain.data[0]>>5)&0x07;
inq->periperal_device_type = task->datain.data[0]&0x1f; inq->device_type = task->datain.data[0]&0x1f;
inq->pagecode = task->datain.data[1]; inq->pagecode = task->datain.data[1];
dptr = &task->datain.data[4]; dptr = &task->datain.data[4];
@@ -603,8 +603,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
if (inq == NULL) { if (inq == NULL) {
return NULL; return NULL;
} }
inq->periperal_qualifier = (task->datain.data[0]>>5)&0x07; inq->qualifier = (task->datain.data[0]>>5)&0x07;
inq->periperal_device_type = task->datain.data[0]&0x1f; inq->device_type = task->datain.data[0]&0x1f;
inq->pagecode = task->datain.data[1]; inq->pagecode = task->datain.data[1];
inq->wsnz = task->datain.data[4] & 0x01; inq->wsnz = task->datain.data[4] & 0x01;
@@ -631,8 +631,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
if (inq == NULL) { if (inq == NULL) {
return NULL; return NULL;
} }
inq->periperal_qualifier = (task->datain.data[0]>>5)&0x07; inq->qualifier = (task->datain.data[0]>>5)&0x07;
inq->periperal_device_type = task->datain.data[0]&0x1f; inq->device_type = task->datain.data[0]&0x1f;
inq->pagecode = task->datain.data[1]; inq->pagecode = task->datain.data[1];
inq->medium_rotation_rate = ntohs(*(uint16_t *)&task->datain.data[4]); inq->medium_rotation_rate = ntohs(*(uint16_t *)&task->datain.data[4]);
@@ -646,8 +646,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
if (inq == NULL) { if (inq == NULL) {
return NULL; return NULL;
} }
inq->periperal_qualifier = (task->datain.data[0]>>5)&0x07; inq->qualifier = (task->datain.data[0]>>5)&0x07;
inq->periperal_device_type = task->datain.data[0]&0x1f; inq->device_type = task->datain.data[0]&0x1f;
inq->pagecode = task->datain.data[1]; inq->pagecode = task->datain.data[1];
inq->threshold_exponent = task->datain.data[4]; inq->threshold_exponent = task->datain.data[4];

8
src/iscsi-inq.c
View File

@@ -66,9 +66,9 @@ void inquiry_device_identification(struct scsi_inquiry_device_identification *in
int i; int i;
printf("Peripheral Qualifier:%s\n", printf("Peripheral Qualifier:%s\n",
scsi_devqualifier_to_str(inq->periperal_qualifier)); scsi_devqualifier_to_str(inq->qualifier));
printf("Peripheral Device Type:%s\n", printf("Peripheral Device Type:%s\n",
scsi_devtype_to_str(inq->periperal_device_type)); scsi_devtype_to_str(inq->device_type));
printf("Page Code:(0x%02x) %s\n", printf("Page Code:(0x%02x) %s\n",
inq->pagecode, scsi_inquiry_pagecode_to_str(inq->pagecode)); inq->pagecode, scsi_inquiry_pagecode_to_str(inq->pagecode));
@@ -102,9 +102,9 @@ void inquiry_supported_pages(struct scsi_inquiry_supported_pages *inq)
void inquiry_standard(struct scsi_inquiry_standard *inq) void inquiry_standard(struct scsi_inquiry_standard *inq)
{ {
printf("Peripheral Qualifier:%s\n", printf("Peripheral Qualifier:%s\n",
scsi_devqualifier_to_str(inq->periperal_qualifier)); scsi_devqualifier_to_str(inq->qualifier));
printf("Peripheral Device Type:%s\n", printf("Peripheral Device Type:%s\n",
scsi_devtype_to_str(inq->periperal_device_type)); scsi_devtype_to_str(inq->device_type));
printf("Removable:%d\n", inq->rmb); printf("Removable:%d\n", inq->rmb);
printf("Version:%d %s\n", inq->version, scsi_version_to_str(inq->version)); printf("Version:%d %s\n", inq->version, scsi_version_to_str(inq->version));
printf("NormACA:%d\n", inq->normaca); printf("NormACA:%d\n", inq->normaca);

2
src/iscsi-ls.c
View File

@@ -103,7 +103,7 @@ tur_try_again:
fprintf(stderr, "failed to unmarshall inquiry datain blob\n"); fprintf(stderr, "failed to unmarshall inquiry datain blob\n");
exit(10); exit(10);
} }
type = inq->periperal_device_type; type = inq->device_type;
scsi_free_scsi_task(task); scsi_free_scsi_task(task);

2
test-tool/0103_read10_rdprotect.c
View File

@@ -71,7 +71,7 @@ int T0103_read10_rdprotect(const char *initiator, const char *url, int data_loss
return -1; return -1;
} }
if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) { if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
printf("LUN is not SBC device. Skipping test\n"); printf("LUN is not SBC device. Skipping test\n");
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -2; return -2;

2
test-tool/0104_read10_flags.c
View File

@@ -62,7 +62,7 @@ int T0104_read10_flags(const char *initiator, const char *url, int data_loss _U_
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -1; return -1;
} }
if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) { if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
printf("LUN is not SBC device. Skipping test\n"); printf("LUN is not SBC device. Skipping test\n");
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -2; return -2;

2
test-tool/0202_read16_flags.c
View File

@@ -59,7 +59,7 @@ int T0202_read16_flags(const char *initiator, const char *url, int data_loss _U_
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -1; return -1;
} }
if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) { if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
printf("LUN is not SBC device. Skipping test\n"); printf("LUN is not SBC device. Skipping test\n");
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -2; return -2;

2
test-tool/0212_read12_flags.c
View File

@@ -59,7 +59,7 @@ int T0212_read12_flags(const char *initiator, const char *url, int data_loss _U_
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -1; return -1;
} }
if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) { if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
printf("LUN is not SBC device. Skipping test\n"); printf("LUN is not SBC device. Skipping test\n");
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -2; return -2;

2
test-tool/0222_write16_flags.c
View File

@@ -60,7 +60,7 @@ int T0222_write16_flags(const char *initiator, const char *url, int data_loss, i
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -1; return -1;
} }
if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) { if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
printf("LUN is not SBC device. Skipping test\n"); printf("LUN is not SBC device. Skipping test\n");
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -2; return -2;

2
test-tool/0232_write12_flags.c
View File

@@ -60,7 +60,7 @@ int T0232_write12_flags(const char *initiator, const char *url, int data_loss, i
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -1; return -1;
} }
if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) { if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
printf("LUN is not SBC device. Skipping test\n"); printf("LUN is not SBC device. Skipping test\n");
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -2; return -2;

2
test-tool/0292_write10_flags.c
View File

@@ -60,7 +60,7 @@ int T0292_write10_flags(const char *initiator, const char *url, int data_loss, i
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -1; return -1;
} }
if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) { if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
printf("LUN is not SBC device. Skipping test\n"); printf("LUN is not SBC device. Skipping test\n");
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -2; return -2;

2
test-tool/0300_readonly.c
View File

@@ -103,7 +103,7 @@ int T0300_readonly(const char *initiator, const char *url, int data_loss, int sh
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -1; return -1;
} }
if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) { if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
printf("LUN is not SBC device. Skipping test\n"); printf("LUN is not SBC device. Skipping test\n");
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -1; return -1;

2
test-tool/0390_mandatory_opcodes_sbc.c
View File

@@ -114,7 +114,7 @@ int T0390_mandatory_opcodes_sbc(const char *initiator, const char *url, int data
} }
sccs = inq->sccs; sccs = inq->sccs;
encserv = inq->encserv; encserv = inq->encserv;
if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) { if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
printf("Not a SBC device. Skipping test\n"); printf("Not a SBC device. Skipping test\n");
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
ret = -2; ret = -2;