[src/trunk]: src/sys/dev/ic Roll core version. Get rid of dogactive (no longe...

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

details:   https://anonhg.NetBSD.org/src/rev/64eb461972bb
branches:  trunk
changeset: 494357:64eb461972bb
user:      mjacob <mjacob%NetBSD.org@localhost>
date:      Wed Jul 05 22:28:08 2000 +0000

description:
Roll core version. Get rid of dogactive (no longer used). Add in some
volatile flags (isp_mboxbsy- keeps a bitmask of expected output mailbox
registers) and storage for them (isp_mboxtmp). Get rid of macroized
LUN widths. This is determined at run time.

diffstat:

 sys/dev/ic/ispvar.h |  25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)

diffs (80 lines):

diff -r 253913bf1495 -r 64eb461972bb sys/dev/ic/ispvar.h
--- a/sys/dev/ic/ispvar.h       Wed Jul 05 22:26:53 2000 +0000
+++ b/sys/dev/ic/ispvar.h       Wed Jul 05 22:28:08 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ispvar.h,v 1.30 2000/05/13 16:53:04 he Exp $ */
+/* $NetBSD: ispvar.h,v 1.31 2000/07/05 22:28:08 mjacob Exp $ */
 /*
  * Copyright (C) 1999 National Aeronautics & Space Administration
  * All rights reserved.
@@ -56,7 +56,7 @@
 #endif
 
 #define        ISP_CORE_VERSION_MAJOR  1
-#define        ISP_CORE_VERSION_MINOR  14
+#define        ISP_CORE_VERSION_MINOR  16
 
 /*
  * Vector for bus specific code to provide specific services.
@@ -73,7 +73,7 @@
        void            (*dv_reset0) __P((struct ispsoftc *));
        void            (*dv_reset1) __P((struct ispsoftc *));
        void            (*dv_dregs) __P((struct ispsoftc *));
-       const u_int16_t *dv_ispfw;      /* ptr to f/w */
+       const u_int16_t *dv_ispfw;      /* ptr to f/w */
        u_int16_t       dv_fwlen;       /* length of f/w */
        u_int16_t       dv_codeorg;     /* code ORG for f/w */
        u_int32_t       dv_fwrev;       /* f/w revision */
@@ -92,15 +92,7 @@
 #endif
 
 #define        ISP_MAX_TARGETS(isp)    (IS_FC(isp)? MAX_FC_TARG : MAX_TARGETS)
-#ifdef ISP2100_SCCLUN
-#define        _ISP_FC_LUN(isp)        65536
-#else
-#define        _ISP_FC_LUN(isp)        16
-#endif
-#define        _ISP_SCSI_LUN(isp)      \
-       ((ISP_FW_REVX(isp->isp_fwrev) >= ISP_FW_REV(7, 55, 0))? 32 : 8)
-#define        ISP_MAX_LUNS(isp)       \
-       (IS_FC(isp)? _ISP_FC_LUN(isp) : _ISP_SCSI_LUN(isp))
+#define        ISP_MAX_LUNS(isp)       (isp)->isp_maxluns
 
 
 /*
@@ -320,12 +312,13 @@
        u_int16_t               isp_maxcmds;    /* max possible I/O cmds */
        u_int8_t                isp_type;       /* HBA Chip Type */
        u_int8_t                isp_revision;   /* HBA Chip H/W Revision */
+       u_int32_t               isp_maxluns;    /* maximum luns supported */
 
        u_int32_t                               : 4,
                                isp_touched     : 1,    /* board ever seen? */
                                isp_fast_mttr   : 1,    /* fast sram */
                                isp_bustype     : 1,    /* SBus or PCI */
-                               isp_dogactive   : 1,    /* watchdog running */
+                                               : 1,
                                isp_dblev       : 8,    /* debug level */
                                isp_clock       : 8,    /* input clock */
                                isp_confopts    : 8;    /* config options */
@@ -334,16 +327,18 @@
         * Volatile state
         */
 
-       volatile u_int32_t      :       9,
+       volatile u_int32_t
+               isp_mboxbsy     :       8,      /* mailbox command active */
+                               :       1,
                isp_state       :       3,
                isp_sendmarker  :       2,      /* send a marker entry */
                isp_update      :       2,      /* update parameters */
                isp_nactive     :       16;     /* how many commands active */
-
        volatile u_int16_t      isp_reqodx;     /* index of last ISP pickup */
        volatile u_int16_t      isp_reqidx;     /* index of next request */
        volatile u_int16_t      isp_residx;     /* index of next result */
        volatile u_int16_t      isp_lasthdls;   /* last handle seed */
+       volatile u_int16_t      isp_mboxtmp[MAX_MAILBOX];
 
        /*
         * Active commands are stored here, indexed by handle functions.