summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authormjacob <mjacob@FreeBSD.org>1999-02-09 01:11:35 +0000
committermjacob <mjacob@FreeBSD.org>1999-02-09 01:11:35 +0000
commitf5609b3fa50d6f6f30765c471d6c09010733eda3 (patch)
treee52c2d8dba06c088dc0da90a79b1d131ba71263d /sys
parent4cdff6d0311f78c02e7ecf4b872cd496afd116b1 (diff)
downloadFreeBSD-src-f5609b3fa50d6f6f30765c471d6c09010733eda3.zip
FreeBSD-src-f5609b3fa50d6f6f30765c471d6c09010733eda3.tar.gz
Roll internal release tag. Roll core version minor. Fix broken DPARM_DEFAULT
define. Add a new config flag param (ISP_CFG_NONVRAM) whose intent it is to cause NVRAM to be ignored. Add ISPASYNC_LOOP_DOWN and ISPASYNC_LOOP_UP isp_async enums. Amazingly enough, I did all my scsi_sa work recently without realizing that I had a broken isp card whose (unchangeable- it's an old old old isp1020) NVRAM has sync mode enabled, but disconnect/reconnect disabled- the ISP_CFG_NONVRAM is definitely warranted when you want to bloody well ignore the NVRAM and set something sensible.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/isp/ispvar.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 30278ee..79ecf93 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -1,5 +1,5 @@
-/* $Id: ispvar.h,v 1.8 1999/01/10 02:51:48 mjacob Exp $ */
-/* release_01_29_99 */
+/* $Id: ispvar.h,v 1.9 1999/01/30 07:29:00 mjacob Exp $ */
+/* release_02_05_99 */
/*
* Soft Definitions for for Qlogic ISP SCSI adapters.
*
@@ -48,7 +48,7 @@
#endif
#define ISP_CORE_VERSION_MAJOR 1
-#define ISP_CORE_VERSION_MINOR 5
+#define ISP_CORE_VERSION_MINOR 6
/*
* Vector for bus specific code to provide specific services.
@@ -139,7 +139,7 @@ typedef struct {
#define DPARM_RENEG 0x0100
#define DPARM_NARROW 0x0080 /* Possibly only available with >= 7.55 fw */
#define DPARM_ASYNC 0x0040 /* Possibly only available with >= 7.55 fw */
-#define DPARM_DEFAULT (0xFFFF & ~DPARM_QFRZ)
+#define DPARM_DEFAULT (0xFF00 & ~DPARM_QFRZ)
#define DPARM_SAFE_DFLT (DPARM_DEFAULT & ~(DPARM_WIDE|DPARM_SYNC|DPARM_TQING))
@@ -321,6 +321,7 @@ struct ispsoftc {
* ISP Configuration Options
*/
#define ISP_CFG_NORELOAD 0x80 /* don't download f/w */
+#define ISP_CFG_NONVRAM 0x40 /* ignore NVRAM */
#define ISP_FW_REV(maj, min) ((maj) << 10| (min))
@@ -437,7 +438,9 @@ int isp_control __P((struct ispsoftc *, ispctl_t, void *));
*/
typedef enum {
- ISPASYNC_NEW_TGT_PARAMS
+ ISPASYNC_NEW_TGT_PARAMS,
+ ISPASYNC_LOOP_DOWN, /* Obvious FC only */
+ ISPASYNC_LOOP_UP /* Obvious FC only */
} ispasync_t;
int isp_async __P((struct ispsoftc *, ispasync_t, void *));
OpenPOWER on IntegriCloud