projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revert chg-multi.sh.in and apply patch from svn for typos
[debian/amanda]
/
changer-src
/
scsi-irix.c
diff --git
a/changer-src/scsi-irix.c
b/changer-src/scsi-irix.c
index b747884d54f7d6d26d8842f9be00505e2a9b91d3..f018cebca0f494cc3f4ee6649266b8be69959bf8 100644
(file)
--- a/
changer-src/scsi-irix.c
+++ b/
changer-src/scsi-irix.c
@@
-24,7
+24,7
@@
* file named AUTHORS, in the root directory of this distribution.
*/
/*
* file named AUTHORS, in the root directory of this distribution.
*/
/*
- * $Id: scsi-irix.c,v 1.2
2 2005/10/15 13:20:47 martinea
Exp $
+ * $Id: scsi-irix.c,v 1.2
3 2006/05/25 01:47:08 johnfranks
Exp $
*
* Interface to execute SCSI commands on an SGI Workstation
*
*
* Interface to execute SCSI commands on an SGI Workstation
*
@@
-62,7
+62,7
@@
void SCSI_OS_Version()
{
#ifndef lint
void SCSI_OS_Version()
{
#ifndef lint
- static char rcsid[] = "$Id: scsi-irix.c,v 1.2
2 2005/10/15 13:20:47 martinea
Exp $";
+ static char rcsid[] = "$Id: scsi-irix.c,v 1.2
3 2006/05/25 01:47:08 johnfranks
Exp $";
DebugPrint(DEBUG_INFO, SECTION_INFO, "scsi-os-layer: %s\n",rcsid);
#endif
}
DebugPrint(DEBUG_INFO, SECTION_INFO, "scsi-os-layer: %s\n",rcsid);
#endif
}
@@
-116,23
+116,13
@@
int SCSI_OpenDevice(int ip)
pDev[ip].avail = 0;
return(0);
}
pDev[ip].avail = 0;
return(0);
}
- } else { /* inquiry failed */
- close(DeviceFD);
- free(pDev[ip].inquiry);
- pDev[ip].inquiry = NULL;
- pDev[ip].avail = 0;
- return(0);
}
}
-
- /*
- * Open ok, but no SCSI communication available
- */
-
- free(pDev[ip].inquiry);
- pDev[ip].inquiry = NULL;
- close(DeviceFD);
- pDev[ip].avail = 0;
- return(0);
+ /* inquiry failed or no SCSI communication available */
+ close(DeviceFD);
+ free(pDev[ip].inquiry);
+ pDev[ip].inquiry = NULL;
+ pDev[ip].avail = 0;
+ return(0);
}
} else {
if ((DeviceFD = open(pDev[ip].dev, O_RDWR | O_EXCL)) >= 0)
}
} else {
if ((DeviceFD = open(pDev[ip].dev, O_RDWR | O_EXCL)) >= 0)
@@
-165,11
+155,11
@@
int SCSI_CloseDevice(int DeviceFD)
int SCSI_ExecuteCommand(int DeviceFD,
Direction_T Direction,
CDB_T CDB,
int SCSI_ExecuteCommand(int DeviceFD,
Direction_T Direction,
CDB_T CDB,
-
in
t CDB_Length,
+
size_
t CDB_Length,
void *DataBuffer,
void *DataBuffer,
-
in
t DataBufferLength,
-
char
*pRequestSense,
-
in
t RequestSenseLength)
+
size_
t DataBufferLength,
+
RequestSense_T
*pRequestSense,
+
size_
t RequestSenseLength)
{
extern OpenFiles_T *pDev;
ExtendedRequestSense_T ExtendedRequestSense;
{
extern OpenFiles_T *pDev;
ExtendedRequestSense_T ExtendedRequestSense;
@@
-177,14
+167,21
@@
int SCSI_ExecuteCommand(int DeviceFD,
int Result;
int retries = 5;
int Result;
int retries = 5;
+ /* Basic sanity checks */
+ assert(CDB_Length <= UCHAR_MAX);
+ assert(RequestSenseLength <= UCHAR_MAX);
+
+ /* Clear buffer for cases where sense is not returned */
+ memset(pRequestSense, 0, RequestSenseLength);
+
if (pDev[DeviceFD].avail == 0)
{
return(SCSI_ERROR);
}
if (pDev[DeviceFD].avail == 0)
{
return(SCSI_ERROR);
}
- memset(&ds, 0,
sizeof
(struct dsreq));
+ memset(&ds, 0,
SIZEOF
(struct dsreq));
memset(pRequestSense, 0, RequestSenseLength);
memset(pRequestSense, 0, RequestSenseLength);
- memset(&ExtendedRequestSense, 0 ,
sizeof
(ExtendedRequestSense_T));
+ memset(&ExtendedRequestSense, 0 ,
SIZEOF
(ExtendedRequestSense_T));
ds.ds_flags = DSRQ_SENSE|DSRQ_TRACE|DSRQ_PRINT;
/* Timeout */
ds.ds_flags = DSRQ_SENSE|DSRQ_TRACE|DSRQ_PRINT;
/* Timeout */
@@
-236,35
+233,28
@@
int SCSI_ExecuteCommand(int DeviceFD,
{
case ST_BUSY: /* BUSY */
break;
{
case ST_BUSY: /* BUSY */
break;
+
case STA_RESERV: /* RESERV CONFLICT */
if (retries > 0)
sleep(2);
continue;
case STA_RESERV: /* RESERV CONFLICT */
if (retries > 0)
sleep(2);
continue;
+
case ST_GOOD: /* GOOD 0x00 */
switch (RET(&ds))
{
case DSRT_SENSE:
return(SCSI_SENSE);
case ST_GOOD: /* GOOD 0x00 */
switch (RET(&ds))
{
case DSRT_SENSE:
return(SCSI_SENSE);
- break;
- case DSRT_SHORT:
- return(SCSI_OK);
- break;
- case DSRT_OK:
- default:
- return(SCSI_OK);
}
}
+ return(SCSI_OK);
+
case ST_CHECK: /* CHECK CONDITION 0x02 */
switch (RET(&ds))
{
case DSRT_SENSE:
return(SCSI_SENSE);
case ST_CHECK: /* CHECK CONDITION 0x02 */
switch (RET(&ds))
{
case DSRT_SENSE:
return(SCSI_SENSE);
- break;
- default:
- return(SCSI_CHECK);
- break;
}
return(SCSI_CHECK);
}
return(SCSI_CHECK);
- break;
+
case ST_COND_MET: /* INTERM/GOOD 0x10 */
default:
continue;
case ST_COND_MET: /* INTERM/GOOD 0x10 */
default:
continue;
@@
-313,7
+303,7
@@
int Tape_Status( int DeviceFD)
if (ioctl(pDev[DeviceFD].fd , MTIOCGET, &mtget) != 0)
{
if (ioctl(pDev[DeviceFD].fd , MTIOCGET, &mtget) != 0)
{
- dbprintf(("Tape_Status error ioctl %
d\n",errno
));
+ dbprintf(("Tape_Status error ioctl %
s\n",strerror(errno)
));
SCSI_CloseDevice(DeviceFD);
return(-1);
}
SCSI_CloseDevice(DeviceFD);
return(-1);
}