mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-23 21:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Synchronize with Feral CVS repository:

Browse Source 
- Do some whitespace changes. Solaris related compilation fix. Remove
  XS_SET_STATE_STAT macro.
- Remove XS_SET_STATE_STATE macro.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@313 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Stanislaw Gruszka
2008-03-28 12:47:37 +00:00
parent c8998a3608
commit d558c6d867
3 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
qla_isp/common/isp.c
View File

@@ -1,4 +1,4 @@
/* $Id: isp.c,v 1.200 2008/03/10 18:03:07 mjacob Exp $ */
/* $Id: isp.c,v 1.201 2008/03/12 22:58:39 mjacob Exp $ */
/*-
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
@@ -5296,7 +5296,8 @@ again:
* may have updated the response queue pointers for
* us, so we reload our goal index.
*/
int r, tsto = oop;
int r;
uint32_t tsto = oop;
r = isp_handle_other_response(isp, etype, hp, &tsto);
if (r < 0) {
goto read_again;
@@ -5445,7 +5446,6 @@ again:
switch (etype) {
case RQSTYPE_RESPONSE:
XS_SET_STATE_STAT(isp, xs, sp);
if (resp && rlen >= 4 &&
resp[FCP_RSPNS_CODE_OFFSET] != 0) {
isp_prt(isp, ISP_LOGWARN,
@@ -5556,8 +5556,9 @@ again:
*XS_STSP(xs), skey, XS_ERR(xs));
}
if (isp->isp_nactive > 0)
if (isp->isp_nactive > 0) {
isp->isp_nactive--;
}
complist[ndone++] = xs; /* defer completion call until later */
MEMZERO(hp, QENTRY_LEN); /* PERF */
if (ndone == MAX_REQUESTQ_COMPLETIONS) {
@@ -6826,14 +6827,14 @@ isp_fastpost_complete(ispsoftc_t *isp, uint16_t fph)
* we must believe that SCSI status is zero and
* that all data transferred.
*/
XS_SET_STATE_STAT(isp, xs, NULL);
XS_RESID(xs) = 0;
*XS_STSP(xs) = SCSI_GOOD;
if (XS_XFRLEN(xs)) {
ISP_DMAFREE(isp, xs, fph);
}
if (isp->isp_nactive)
if (isp->isp_nactive) {
isp->isp_nactive--;
}
isp->isp_fphccmplt++;
isp_done(xs);
}
@@ -7468,7 +7469,7 @@ isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mbp)
for (box = 0; box < MAX_MAILBOX(isp); box++) {
if (ibits & (1 << box)) {
isp_prt(isp, ISP_LOGDEBUG1, "IN mbox %d = 0x%04x", box,
isp_prt(isp, ISP_LOGDEBUG3, "IN mbox %d = 0x%04x", box,
mbp->param[box]);
ISP_WRITE(isp, MBOX_OFF(box), mbp->param[box]);
}
@@ -7511,7 +7512,7 @@ isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mbp)
for (box = 0; box < MAX_MAILBOX(isp); box++) {
if (obits & (1 << box)) {
mbp->param[box] = isp->isp_mboxtmp[box];
isp_prt(isp, ISP_LOGDEBUG1, "OUT mbox %d = 0x%04x", box,
isp_prt(isp, ISP_LOGDEBUG3, "OUT mbox %d = 0x%04x", box,
mbp->param[box]);
}
}

11
qla_isp/common/ispmbox.h
View File

@@ -1,4 +1,4 @@
/* $Id: ispmbox.h,v 1.71 2008/02/11 23:59:06 mjacob Exp $ */
/* $Id: ispmbox.h,v 1.72 2008/03/12 22:57:37 mjacob Exp $ */
/*-
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
@@ -314,15 +314,6 @@ typedef struct {
} ispdslist_t;
/*
* These elements get swizzled around for SBus instances.
*/
#define ISP_SWAP8(a, b) { \
uint8_t tmp; \
tmp = a; \
a = b; \
b = tmp; \
}
typedef struct {
uint8_t rqs_entry_type;
uint8_t rqs_entry_count;

6
qla_isp/common/ispvar.h
View File

@@ -1,4 +1,4 @@
/* $Id: ispvar.h,v 1.93 2008/03/06 01:40:11 mjacob Exp $ */
/* $Id: ispvar.h,v 1.94 2008/03/12 22:57:24 mjacob Exp $ */
/*-
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
@@ -1006,10 +1006,6 @@ void isp_async(ispsoftc_t *, ispasync_t, ...);
*
* XS_SAVE_SENSE(xs, sp, len) save sense data
*
* XS_SET_STATE_STAT(isp, sp, xs) platform dependent interpreter of
* response queue entry status bits
*
*
* DEFAULT_FRAMESIZE(ispsoftc_t *) Default Frame Size
* DEFAULT_EXEC_THROTTLE(ispsoftc_t *) Default Execution Throttle
*