Deleted Added
sdiff udiff text old ( 39431 ) new ( 39445 )
full compact
isp_freebsd.h (39431) isp_freebsd.h (39445)
1/* $FreeBSD: head/sys/dev/isp/isp_freebsd.h 39431 1998-09-17 21:02:18Z mjacob $ */
1/* $FreeBSD: head/sys/dev/isp/isp_freebsd.h 39445 1998-09-18 00:46:42Z mjacob $ */
2/*
3 * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions (non CAM version)
4 *---------------------------------------
5 * Copyright (c) 1997, 1998 by Matthew Jacob
6 * NASA/Ames Research Center
7 * All rights reserved.
8 *---------------------------------------
9 *

--- 20 unchanged lines hidden (view full) ---

30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 */
34#ifndef _ISP_FREEBSD_H
35#define _ISP_FREEBSD_H
36
37#define ISP_PLATFORM_VERSION_MAJOR 0
2/*
3 * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions (non CAM version)
4 *---------------------------------------
5 * Copyright (c) 1997, 1998 by Matthew Jacob
6 * NASA/Ames Research Center
7 * All rights reserved.
8 *---------------------------------------
9 *

--- 20 unchanged lines hidden (view full) ---

30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 */
34#ifndef _ISP_FREEBSD_H
35#define _ISP_FREEBSD_H
36
37#define ISP_PLATFORM_VERSION_MAJOR 0
38#define ISP_PLATFORM_VERSION_MINOR 96
38#define ISP_PLATFORM_VERSION_MINOR 97
39
39
40#include "opt_scsi.h"
41#ifdef SCSI_CAM
40#include <sys/param.h>
41
42#ifndef __FreeBSD_version
43#define __FreeBSD_version 226000
44#endif
45
46#if __FreeBSD_version >= 300004
42#include <dev/isp/isp_freebsd_cam.h>
43#else
44
47#include <dev/isp/isp_freebsd_cam.h>
48#else
49
45#include <sys/param.h>
46#include <sys/systm.h>
47#include <sys/malloc.h>
48#include <sys/buf.h>
49#include <sys/proc.h>
50
51#include <scsi/scsiconf.h>
52#include <machine/clock.h>
53#include <vm/vm.h>
54#include <vm/vm_param.h>
55#include <vm/pmap.h>
56#include <sys/kernel.h>
57
50#include <sys/systm.h>
51#include <sys/malloc.h>
52#include <sys/buf.h>
53#include <sys/proc.h>
54
55#include <scsi/scsiconf.h>
56#include <machine/clock.h>
57#include <vm/vm.h>
58#include <vm/vm_param.h>
59#include <vm/pmap.h>
60#include <sys/kernel.h>
61
58/*
59 * Now that __FreeBSD_version is in sys/param.h, we can
60 * automatically handle pre-3.0 cases.
61 */
62
63#ifndef __FreeBSD_version
64#define __FreeBSD_version 226000
65#endif
66
67#define ISP_SCSI_XFER_T struct scsi_xfer
68struct isposinfo {
69 char name[8];
70 int unit;
71 struct scsi_link _link;
72#if __FreeBSD_version >= 300001
73 struct callout_handle watchid;
74#endif

--- 87 unchanged lines hidden (view full) ---

162#define STOP_WATCHDOG(f, s) untimeout(f, s), (s)->isp_dogactive = 0
163#endif
164
165#define RESTART_WATCHDOG(f, s) START_WATCHDOG(f, s)
166extern void isp_attach __P((struct ispsoftc *));
167
168#define PVS "Qlogic ISP Driver, FreeBSD Non-Cam"
169
62#define ISP_SCSI_XFER_T struct scsi_xfer
63struct isposinfo {
64 char name[8];
65 int unit;
66 struct scsi_link _link;
67#if __FreeBSD_version >= 300001
68 struct callout_handle watchid;
69#endif

--- 87 unchanged lines hidden (view full) ---

157#define STOP_WATCHDOG(f, s) untimeout(f, s), (s)->isp_dogactive = 0
158#endif
159
160#define RESTART_WATCHDOG(f, s) START_WATCHDOG(f, s)
161extern void isp_attach __P((struct ispsoftc *));
162
163#define PVS "Qlogic ISP Driver, FreeBSD Non-Cam"
164
170#endif /* !SCSI_CAM */
165#endif /* __FreeBSD_version >= 300004 */
171#endif /* _ISP_FREEBSD_H */
166#endif /* _ISP_FREEBSD_H */