diff options
| author | mjacob <mjacob@FreeBSD.org> | 1999-04-04 01:34:06 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 1999-04-04 01:34:06 +0000 |
| commit | ba4a1207d0c1d1b9c2329f1c27724ec3fec9c503 (patch) | |
| tree | 84a1bc426d71d8d0d6fb50c21c1f790fbf987c8a /sys | |
| parent | e4882bb39a08e443f73b59bc126c1e99c46a8911 (diff) | |
| download | FreeBSD-src-ba4a1207d0c1d1b9c2329f1c27724ec3fec9c503.zip FreeBSD-src-ba4a1207d0c1d1b9c2329f1c27724ec3fec9c503.tar.gz | |
Fix for pre-CAM kernels (again). Turn back on fast posting.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/isp/isp_freebsd.h | 51 |
1 files changed, 16 insertions, 35 deletions
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index bd58a28..ed8a175 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -1,5 +1,5 @@ -/* $Id: isp_freebsd.h,v 1.12 1999/03/17 05:04:39 mjacob Exp $ */ -/* release_03_25_99 */ +/* $Id: isp_freebsd.h,v 1.13 1999/03/25 22:52:45 mjacob Exp $ */ +/* release_4_3_99 */ /* * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions (non CAM version) *--------------------------------------- @@ -36,7 +36,7 @@ #define _ISP_FREEBSD_H #define ISP_PLATFORM_VERSION_MAJOR 0 -#define ISP_PLATFORM_VERSION_MINOR 99 +#define ISP_PLATFORM_VERSION_MINOR 991 #include <sys/param.h> @@ -48,7 +48,10 @@ #define MAXISPREQUEST 256 #include <dev/isp/isp_freebsd_cam.h> #else -#define MAXISPREQUEST 64 +#define MAXISPREQUEST 64 +#ifndef SCSI_ISP_PREFER_MEM_MAP +#define SCSI_ISP_PREFER_MEM_MAP 0 +#endif #include <sys/systm.h> #include <sys/malloc.h> @@ -63,20 +66,19 @@ #include <sys/kernel.h> -#include <dev/isp/ispreg.h> -#include <dev/isp/ispvar.h> -#include <dev/isp/ispmbox.h> - #define ISP_SCSI_XFER_T struct scsi_xfer + struct isposinfo { char name[8]; int unit; struct scsi_link _link; -#if __FreeBSD_version >= 300001 - struct callout_handle watchid; -#endif + int8_t delay_throttle_count; }; +#include <dev/isp/ispreg.h> +#include <dev/isp/ispvar.h> +#include <dev/isp/ispmbox.h> + #define PVS "Qlogic ISP Driver, FreeBSD Non-Cam" #define DFLT_DBLEVEL 1 #define ISP_LOCKVAL_DECL int isp_spl_save @@ -140,23 +142,6 @@ struct isposinfo { #define isp_name isp_osinfo.name - -#define WATCH_INTERVAL 30 -#if __FreeBSD_version >= 300001 -#define START_WATCHDOG(f, s) \ - (s)->isp_osinfo.watchid = timeout(f, s, WATCH_INTERVAL * hz), \ - s->isp_dogactive = 1 -#define STOP_WATCHDOG(f, s) untimeout(f, s, (s)->isp_osinfo.watchid),\ - (s)->isp_dogactive = 0 -#else -#define START_WATCHDOG(f, s) \ - timeout(f, s, WATCH_INTERVAL * hz), s->isp_dogactive = 1 -#define STOP_WATCHDOG(f, s) untimeout(f, s), (s)->isp_dogactive = 0 -#endif - -#define RESTART_WATCHDOG(f, s) START_WATCHDOG(f, s) - - #endif /* __FreeBSD_version >= 300004 */ extern void isp_attach(struct ispsoftc *); @@ -171,6 +156,9 @@ extern void isp_uninit(struct ispsoftc *); #endif +#define DMA_MSW(x) (((x) >> 16) & 0xffff) +#define DMA_LSW(x) (((x) & 0xffff)) + #define IDPRINTF(lev, x) if (isp->isp_dblev >= lev) printf x #define PRINTF printf @@ -261,11 +249,4 @@ static __inline const char *isp2100_pdb_statename(int pdb_state) } } -/* - * Disable these for now - */ - -#define ISP_NO_FASTPOST_SCSI 1 -#define ISP_NO_FASTPOST_FC 1 - #endif /* _ISP_FREEBSD_H */ |
