embedaddon/smartmontools/scsiprint.cpp - diff

Return to scsiprint.cpp CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / smartmontools

version 1.1.1.2, 2013/07/22 01:17:35	version 1.1.1.3, 2013/10/14 07:54:04
Line 1500 scsiGetDriveInfo(scsi_device * device, UINT8 * periphe	Line 1500 scsiGetDriveInfo(scsi_device * device, UINT8 * periphe
protect = gBuf[5] & 0x1; /* from and including SPC-3 */	protect = gBuf[5] & 0x1; /* from and including SPC-3 */

if (! is_tape) { /* only do this for disks */	if (! is_tape) { /* only do this for disks */
unsigned int lb_size;	unsigned int lb_size = 0;
unsigned char lb_prov_resp[8];	unsigned char lb_prov_resp[8];
char cap_str[64];	char cap_str[64];
char si_str[64];	char si_str[64];
char lb_str[16];	char lb_str[16];
int lb_per_pb_exp;	int lb_per_pb_exp = 0;
uint64_t capacity = scsiGetSize(device, &lb_size, &lb_per_pb_exp);	uint64_t capacity = scsiGetSize(device, &lb_size, &lb_per_pb_exp);

if (capacity) {	if (capacity) {
Line 1518 scsiGetDriveInfo(scsi_device * device, UINT8 * periphe	Line 1518 scsiGetDriveInfo(scsi_device * device, UINT8 * periphe
int lbpme = -1;	int lbpme = -1;
int lbprz = -1;	int lbprz = -1;
if (protect \|\| lb_per_pb_exp) {	if (protect \|\| lb_per_pb_exp) {
unsigned char rc16_12[20];	unsigned char rc16_12[20] = {0, };

if (0 == scsiGetProtPBInfo(device, rc16_12)) {	if (0 == scsiGetProtPBInfo(device, rc16_12)) {
lb_per_pb_exp = rc16_12[1] & 0xf; /* just in case */	lb_per_pb_exp = rc16_12[1] & 0xf; /* just in case */