sb_len = io->sb_len_wr;
if (sb_len < 1) {
- info("%s: sense buffer empty", dev_scsi->kernel);
+ info("%s: sense buffer empty\n", dev_scsi->kernel);
return -1;
}
*/
s = sense_buffer[7] + 8;
if (sb_len < s) {
- info("%s: sense buffer too small %d bytes, %d bytes too short",
+ info("%s: sense buffer too small %d bytes, %d bytes too short\n",
dev_scsi->kernel, sb_len, s - sb_len);
return -1;
}
/*
* Possible?
*/
- info("%s: sense result too" " small %d bytes",
+ info("%s: sense result too" " small %d bytes\n",
dev_scsi->kernel, s);
return -1;
}
asc = sense_buffer[2];
ascq = sense_buffer[3];
} else {
- info("%s: invalid sense code 0x%x",
+ info("%s: invalid sense code 0x%x\n",
dev_scsi->kernel, code);
return -1;
}
- info("%s: sense key 0x%x ASC 0x%x ASCQ 0x%x",
+ info("%s: sense key 0x%x ASC 0x%x ASCQ 0x%x\n",
dev_scsi->kernel, sense_key, asc, ascq);
} else {
if (sb_len < 4) {
- info("%s: sense buffer too small %d bytes, %d bytes too short",
+ info("%s: sense buffer too small %d bytes, %d bytes too short\n",
dev_scsi->kernel, sb_len, 4 - sb_len);
return -1;
}
if (sense_buffer[0] < 15)
- info("%s: old sense key: 0x%x", dev_scsi->kernel, sense_buffer[0] & 0x0f);
+ info("%s: old sense key: 0x%x\n", dev_scsi->kernel, sense_buffer[0] & 0x0f);
else
- info("%s: sense = %2x %2x",
+ info("%s: sense = %2x %2x\n",
dev_scsi->kernel, sense_buffer[0], sense_buffer[2]);
- info("%s: non-extended sense class %d code 0x%0x",
+ info("%s: non-extended sense class %d code 0x%0x\n",
dev_scsi->kernel, sense_class, code);
}
out_buffer[j++] = ' ';
}
out_buffer[j] = '\0';
- info("%s: sense dump:", dev_scsi->kernel);
- info("%s: %s", dev_scsi->kernel, out_buffer);
+ info("%s: sense dump:\n", dev_scsi->kernel);
+ info("%s: %s\n", dev_scsi->kernel, out_buffer);
#endif
return -1;
/*
* Impossible, should not be called.
*/
- info("%s: called with no error", __FUNCTION__);
+ info("%s: called with no error\n", __FUNCTION__);
return -1;
}
- info("%s: sg_io failed status 0x%x 0x%x 0x%x 0x%x",
+ info("%s: sg_io failed status 0x%x 0x%x 0x%x 0x%x\n",
dev_scsi->kernel, io->driver_status, io->host_status, io->msg_status, io->status);
if (io->status == SCSI_CHECK_CONDITION)
return scsi_dump_sense(dev_scsi, io);
int retry = 3; /* rather random */
if (buflen > SCSI_INQ_BUFF_LEN) {
- info("buflen %d too long", buflen);
+ info("buflen %d too long\n", buflen);
return -1;
}
io_hdr.timeout = DEF_TIMEOUT;
if (ioctl(fd, SG_IO, &io_hdr) < 0) {
- info("%s: ioctl failed: %s", dev_scsi->kernel, strerror(errno));
+ info("%s: ioctl failed: %s\n", dev_scsi->kernel, strerror(errno));
retval = -1;
goto error;
}
error:
if (retval < 0)
- info("%s: Unable to get INQUIRY vpd %d page 0x%x.",
+ info("%s: Unable to get INQUIRY vpd %d page 0x%x.\n",
dev_scsi->kernel, evpd, page);
return retval;
return 1;
if (buffer[1] != 0) {
- info("%s: page 0 not available.", dev_scsi->kernel);
+ info("%s: page 0 not available.\n", dev_scsi->kernel);
return 1;
}
if (buffer[3] > len) {
- info("%s: page 0 buffer too long %d", dev_scsi->kernel, buffer[3]);
+ info("%s: page 0 buffer too long %d\n", dev_scsi->kernel, buffer[3]);
return 1;
}
*/
vendor = sysfs_attr_get_value(dev_scsi->devpath, "vendor");
if (!vendor) {
- info("%s: cannot get model attribute", dev_scsi->kernel);
+ info("%s: cannot get model attribute\n", dev_scsi->kernel);
return 1;
}
if (!strncmp((char *)&buffer[VENDOR_LENGTH], vendor, VENDOR_LENGTH)) {
- info("%s: invalid page0 data", dev_scsi->kernel);
+ info("%s: invalid page0 data\n", dev_scsi->kernel);
return 1;
}
}
attr = sysfs_attr_get_value(dev_scsi->devpath, "vendor");
if (!attr) {
- info("%s: cannot get vendor attribute", dev_scsi->kernel);
+ info("%s: cannot get vendor attribute\n", dev_scsi->kernel);
return 1;
}
strncpy(serial, attr, VENDOR_LENGTH);
attr = sysfs_attr_get_value(dev_scsi->devpath, "model");
if (!attr) {
- info("%s: cannot get model attribute", dev_scsi->kernel);
+ info("%s: cannot get model attribute\n", dev_scsi->kernel);
return 1;
}
strncat(serial, attr, MODEL_LENGTH);
* above, ind will never be too large.
*/
if (ind != (VENDOR_LENGTH + MODEL_LENGTH)) {
- info("%s: expected length %d, got length %d",
+ info("%s: expected length %d, got length %d\n",
dev_scsi->kernel, (VENDOR_LENGTH + MODEL_LENGTH), ind);
return 1;
}
static int check_fill_0x83_id(struct sysfs_device *dev_scsi,
unsigned char *page_83,
const struct scsi_id_search_values
- *id_search, char *serial, int max_len)
+ *id_search, char *serial, char *serial_short, int max_len)
{
- int i, j, len;
+ int i, j, s, len;
/*
* ASSOCIATION must be with the device (value 0)
*/
len *= 2;
- /*
+ /*
* Add one byte for the NUL termination, and one for the id_type.
*/
len += 2;
len += VENDOR_LENGTH + MODEL_LENGTH;
if (max_len < len) {
- info("%s: length %d too short - need %d",
+ info("%s: length %d too short - need %d\n",
dev_scsi->kernel, max_len, len);
return 1;
}
}
i = 4; /* offset to the start of the identifier */
- j = strlen(serial);
+ s = j = strlen(serial);
if ((page_83[0] & 0x0f) == SCSI_ID_ASCII) {
/*
* ASCII descriptor.
i++;
}
}
+
+ strcpy(serial_short, &serial[s]);
return 0;
}
static int check_fill_0x83_prespc3(struct sysfs_device *dev_scsi,
unsigned char *page_83,
const struct scsi_id_search_values
- *id_search, char *serial, int max_len)
+ *id_search, char *serial, char *serial_short, int max_len)
{
int i, j;
-
+
+ dbg("using pre-spc3-83 for %s\n", dev_scsi->kernel);
serial[0] = hex_str[id_search->id_type];
/* serial has been memset to zero before */
j = strlen(serial); /* j = 1; */
serial[j++] = hex_str[(page_83[4+i] & 0xf0) >> 4];
serial[j++] = hex_str[ page_83[4+i] & 0x0f];
}
- dbg("using pre-spc3-83 for %s.\n", dev_scsi->kernel);
+ strcpy(serial_short, serial);
return 0;
}
/* Get device identification VPD page */
static int do_scsi_page83_inquiry(struct sysfs_device *dev_scsi, int fd,
- char *serial, int len)
+ char *serial, char *serial_short, int len)
{
int retval;
unsigned int id_ind, j;
return 1;
if (page_83[1] != PAGE_83) {
- info("%s: Invalid page 0x83", dev_scsi->kernel);
+ info("%s: Invalid page 0x83\n", dev_scsi->kernel);
return 1;
}
*/
if (page_83[6] != 0)
- return check_fill_0x83_prespc3(dev_scsi, page_83,
- id_search_list, serial, len);
+ return check_fill_0x83_prespc3(dev_scsi, page_83, id_search_list,
+ serial, serial_short, len);
/*
* Search for a match in the prioritized id_search_list.
for (j = 4; j <= (unsigned int)page_83[3] + 3; j += page_83[j + 3] + 4) {
retval = check_fill_0x83_id(dev_scsi, &page_83[j],
&id_search_list[id_ind],
- serial, len);
+ serial, serial_short, len);
dbg("%s id desc %d/%d/%d\n", dev_scsi->kernel,
id_search_list[id_ind].id_type,
id_search_list[id_ind].naa_type,
id_search_list[id_ind].code_set);
if (!retval) {
- dbg(" used\n");
+ dbg(" used\n");
return retval;
} else if (retval < 0) {
- dbg(" failed\n");
+ dbg(" failed\n");
return retval;
} else {
- dbg(" not used\n");
+ dbg(" not used\n");
}
}
}
* conformant to the SCSI-2 format.
*/
static int do_scsi_page83_prespc3_inquiry(struct sysfs_device *dev_scsi, int fd,
- char *serial, int len)
+ char *serial, char *serial_short, int len)
{
int retval;
int i, j;
return 1;
if (page_83[1] != PAGE_83) {
- info("%s: Invalid page 0x83", dev_scsi->kernel);
+ info("%s: Invalid page 0x83\n", dev_scsi->kernel);
return 1;
}
/*
serial[j++] = hex_str[page_83[i] & 0x0f];
i++;
}
- dbg("using pre-spc3-83 for %s.\n", dev_scsi->kernel);
+ dbg("using pre-spc3-83 for %s\n", dev_scsi->kernel);
return 0;
}
/* Get unit serial number VPD page */
static int do_scsi_page80_inquiry(struct sysfs_device *dev_scsi, int fd,
- char *serial, int max_len)
+ char *serial, char *serial_short, int max_len)
{
int retval;
int ser_ind;
return retval;
if (buf[1] != PAGE_80) {
- info("%s: Invalid page 0x80", dev_scsi->kernel);
+ info("%s: Invalid page 0x80\n", dev_scsi->kernel);
return 1;
}
len = 1 + VENDOR_LENGTH + MODEL_LENGTH + buf[3];
if (max_len < len) {
- info("%s: length %d too short - need %d",
+ info("%s: length %d too short - need %d\n",
dev_scsi->kernel, max_len, len);
return 1;
}
len = buf[3];
for (i = 4; i < len + 4; i++, ser_ind++)
serial[ser_ind] = buf[i];
+ memcpy(serial_short, &buf[4], len);
+ serial_short[len] = '\0';
+ return 0;
+}
+
+int scsi_std_inquiry(struct sysfs_device *dev_scsi, const char *devname,
+ char *vendor, char *model, char *rev, char *type)
+{
+ int retval;
+ int fd;
+ unsigned char buf[SCSI_INQ_BUFF_LEN];
+
+ dbg("opening %s\n", devname);
+ fd = open(devname, O_RDONLY | O_NONBLOCK);
+ if (fd < 0) {
+ info("%s: cannot open %s: %s\n",
+ dev_scsi->kernel, devname, strerror(errno));
+ return 1;
+ }
+
+ memset(buf, 0, SCSI_INQ_BUFF_LEN);
+ retval = scsi_inquiry(dev_scsi, fd, 0, 0, buf, SCSI_INQ_BUFF_LEN);
+ if (retval < 0)
+ return retval;
+
+ memcpy(vendor, buf + 8, 8);
+ memcpy(model, buf + 16, 16);
+ memcpy(rev, buf + 32, 4);
+ sprintf(type,"%x", buf[0] & 0x1f);
+
+ if (close(fd) < 0)
+ info("%s: close failed: %s\n", dev_scsi->kernel, strerror(errno));
+
return 0;
}
int scsi_get_serial (struct sysfs_device *dev_scsi, const char *devname,
- int page_code, char *serial, int len)
+ int page_code, char *serial, char *serial_short, int len)
{
unsigned char page0[SCSI_INQ_BUFF_LEN];
int fd;
dbg("opening %s\n", devname);
fd = open(devname, O_RDONLY | O_NONBLOCK);
if (fd < 0) {
- info("%s: cannot open %s: %s",
+ info("%s: cannot open %s: %s\n",
dev_scsi->kernel, devname, strerror(errno));
return 1;
}
if (page_code == PAGE_80) {
- if (do_scsi_page80_inquiry(dev_scsi, fd, serial, len)) {
+ if (do_scsi_page80_inquiry(dev_scsi, fd, serial, serial_short, len)) {
retval = 1;
goto completed;
} else {
goto completed;
}
} else if (page_code == PAGE_83) {
- if (do_scsi_page83_inquiry(dev_scsi, fd, serial, len)) {
+ if (do_scsi_page83_inquiry(dev_scsi, fd, serial, serial_short, len)) {
retval = 1;
goto completed;
} else {
goto completed;
}
} else if (page_code == PAGE_83_PRE_SPC3) {
- retval = do_scsi_page83_prespc3_inquiry(dev_scsi, fd, serial, len);
+ retval = do_scsi_page83_prespc3_inquiry(dev_scsi, fd, serial, serial_short, len);
if (retval) {
/*
* Fallback to servicing a SPC-2/3 compliant page 83
* conform to pre-SPC3 expectations.
*/
if (retval == 2) {
- if (do_scsi_page83_inquiry(dev_scsi, fd, serial, len)) {
+ if (do_scsi_page83_inquiry(dev_scsi, fd, serial, serial_short, len)) {
retval = 1;
goto completed;
} else {
goto completed;
}
} else if (page_code != 0x00) {
- info("%s: unsupported page code 0x%d", dev_scsi->kernel, page_code);
+ info("%s: unsupported page code 0x%d\n", dev_scsi->kernel, page_code);
return 1;
}
for (ind = 4; ind <= page0[3] + 3; ind++)
if (page0[ind] == PAGE_83)
- if (!do_scsi_page83_inquiry(dev_scsi, fd, serial,
- len)) {
+ if (!do_scsi_page83_inquiry(dev_scsi, fd,
+ serial, serial_short, len)) {
/*
* Success
*/
for (ind = 4; ind <= page0[3] + 3; ind++)
if (page0[ind] == PAGE_80)
- if (!do_scsi_page80_inquiry(dev_scsi, fd, serial,
- len)) {
+ if (!do_scsi_page80_inquiry(dev_scsi, fd,
+ serial, serial_short, len)) {
/*
* Success
*/
retval = 1;
completed:
if (close(fd) < 0)
- info("%s: close failed: %s", dev_scsi->kernel, strerror(errno));
+ info("%s: close failed: %s\n", dev_scsi->kernel, strerror(errno));
return retval;
}
~ianmdlvl / elogind.git / blobdiff