diff options
| author | mjacob <mjacob@cvs.openbsd.org> | 2000-12-06 01:07:24 +0000 |
|---|---|---|
| committer | mjacob <mjacob@cvs.openbsd.org> | 2000-12-06 01:07:24 +0000 |
| commit | c70f3f9f0bbbc52b0552703642baf6b5d4ea3975 (patch) | |
| tree | 0a5ac0f3aee2621f25501c6b87ef8af732fca14a /sys/dev/ic/ispvar.h | |
| parent | a3c56baf1776d67e865aedba84545540a5da2da0 (diff) | |
Update isp codebase to current common head- USEC_SLEEP macro added,
instrumentation for interrupts, specific topology preferences for
the 2200. Fix the hole in the OpenBSD port becuause there'd been
no maxluns limit from the midlayer and have the command routine
bounce commands > the maxluns for a particular controller (in
particular, Qlogic FC cards where we can't tell when it hasn't been
us that have loaded the F/W whether or not SCCLUN is in effect
or not).
Diffstat (limited to 'sys/dev/ic/ispvar.h')
| -rw-r--r-- | sys/dev/ic/ispvar.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/dev/ic/ispvar.h b/sys/dev/ic/ispvar.h index c0daaa3ab6b..d7a96e7f3eb 100644 --- a/sys/dev/ic/ispvar.h +++ b/sys/dev/ic/ispvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ispvar.h,v 1.12 2000/10/16 01:02:01 mjacob Exp $ */ +/* $OpenBSD: ispvar.h,v 1.13 2000/12/06 01:07:23 mjacob Exp $ */ /* * Soft Definitions for for Qlogic ISP SCSI adapters. * @@ -337,6 +337,11 @@ typedef struct ispsoftc { isp_dblev : 12, /* debug log mask */ isp_clock : 8, /* input clock */ isp_confopts : 8; /* config options */ + /* + * Instrumentation + */ + u_int64_t isp_intcnt; /* total int count */ + u_int64_t isp_intbogus; /* spurious int count */ /* * Volatile state @@ -387,7 +392,11 @@ typedef struct ispsoftc { #define ISP_CFG_NONVRAM 0x40 /* ignore NVRAM */ #define ISP_CFG_FULL_DUPLEX 0x01 /* Full Duplex (Fibre Channel only) */ #define ISP_CFG_OWNWWN 0x02 /* override NVRAM wwn */ -#define ISP_CFG_NPORT 0x04 /* try to force N- instead of L-Port */ +#define ISP_CFG_PORT_PREF 0x0C /* Mask for Port Prefs (2200 only) */ +#define ISP_CFG_LPORT 0x00 /* prefer {N/F}L-Port connection */ +#define ISP_CFG_NPORT 0x04 /* prefer {N/F}-Port connection */ +#define ISP_CFG_NPORT_ONLY 0x08 /* insist on {N/F}-Port connection */ +#define ISP_CFG_LPORT_ONLY 0x0C /* insist on {N/F}L-Port connection */ /* * Firmware related defines @@ -556,6 +565,7 @@ void isp_prt __P((struct ispsoftc *, int level, const char *, ...)); * SNPRINTF(buf, bufsize, fmt, ...) snprintf * STRNCAT(dstbuf, size, srcbuf) strncat * USEC_DELAY(usecs) microsecond spindelay function + * USEC_SLEEP(isp, usecs) microsecond sleep function * * NANOTIME_T nanosecond time type * |