[src/netbsd-1-5]: src/sys/dev/ic Pull up revisions 1.36-1.38 (requested by mj...

[jhawk <jhawk%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/205bc61cb65f
branches:  netbsd-1-5
changeset: 490517:205bc61cb65f
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Thu Jan 25 18:25:43 2001 +0000

description:
Pull up revisions 1.36-1.38 (requested by mjacob):
  Add in correct SBus bursting; upgrade to 2.01.26 firmware; pull to latest
  initiator mode level; make changes to WWN default handling; quiet
  chatty boot messages; fix endian code so MacPPC works; fix bug in
  lock recursion counter; fix bug which excluded all but NL-ports from
  being logged into on a fabric.

diffstat:

 sys/dev/ic/ispvar.h |  34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diffs (68 lines):

diff -r dc2aa5fb364e -r 205bc61cb65f sys/dev/ic/ispvar.h
--- a/sys/dev/ic/ispvar.h       Thu Jan 25 18:25:39 2001 +0000
+++ b/sys/dev/ic/ispvar.h       Thu Jan 25 18:25:43 2001 +0000
@@ -1,18 +1,17 @@
-/* $NetBSD: ispvar.h,v 1.30.4.1 2000/08/28 17:45:11 mjacob Exp $ */
+/* $NetBSD: ispvar.h,v 1.30.4.2 2001/01/25 18:25:43 jhawk Exp $ */
 /*
  * This driver, which is contained in NetBSD in the files:
  *
  *     sys/dev/ic/isp.c
- *     sys/dev/ic/ic/isp.c
- *     sys/dev/ic/ic/isp_inline.h
- *     sys/dev/ic/ic/isp_netbsd.c
- *     sys/dev/ic/ic/isp_netbsd.h
- *     sys/dev/ic/ic/isp_target.c
- *     sys/dev/ic/ic/isp_target.h
- *     sys/dev/ic/ic/isp_tpublic.h
- *     sys/dev/ic/ic/ispmbox.h
- *     sys/dev/ic/ic/ispreg.h
- *     sys/dev/ic/ic/ispvar.h
+ *     sys/dev/ic/isp_inline.h
+ *     sys/dev/ic/isp_netbsd.c
+ *     sys/dev/ic/isp_netbsd.h
+ *     sys/dev/ic/isp_target.c
+ *     sys/dev/ic/isp_target.h
+ *     sys/dev/ic/isp_tpublic.h
+ *     sys/dev/ic/ispmbox.h
+ *     sys/dev/ic/ispreg.h
+ *     sys/dev/ic/ispvar.h
  *     sys/microcode/isp/asm_sbus.h
  *     sys/microcode/isp/asm_1040.h
  *     sys/microcode/isp/asm_1080.h
@@ -368,6 +367,11 @@
                                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
@@ -416,9 +420,14 @@
  */
 #define        ISP_CFG_NORELOAD        0x80    /* don't download f/w */
 #define        ISP_CFG_NONVRAM         0x40    /* ignore NVRAM */
+#define        ISP_CFG_NOINIT          0x20    /* just set defaults- don't init */
 #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
@@ -587,6 +596,7 @@
  *     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
  *