1c1
< /* $FreeBSD: head/sys/dev/isp/ispvar.h 64087 2000-08-01 06:10:21Z mjacob $ */
---
> /* $FreeBSD: head/sys/dev/isp/ispvar.h 65140 2000-08-27 23:38:44Z mjacob $ */
156c156
< #define ISP_QAVAIL(in, out, qlen) \
---
> #define ISP_QFREE(in, out, qlen) \
158a159,160
> #define ISP_QAVAIL(isp) \
> ISP_QFREE(isp->isp_reqidx, isp->isp_reqodx, RQUEST_QUEUE_LEN(isp))
179c181
< : 1,
---
> isp_fast_mttr : 1, /* fast sram */
214,215c216,218
< #define DPARM_NARROW 0x0080 /* Possibly only available with >= 7.55 fw */
< #define DPARM_ASYNC 0x0040 /* Possibly only available with >= 7.55 fw */
---
> #define DPARM_NARROW 0x0080
> #define DPARM_ASYNC 0x0040
> #define DPARM_PPR 0x0020
221,222c224,227
< #define ISP_40M_SYNCPARMS 0x080a
< #define ISP_20M_SYNCPARMS 0x080c
---
> #define ISP_80M_SYNCPARMS 0x0c09
> #define ISP_40M_SYNCPARMS 0x0c0a
> #define ISP_20M_SYNCPARMS 0x0c0c
> #define ISP_20M_SYNCPARMS_1040 0x080c
307c312
< struct ispsoftc {
---
> typedef struct ispsoftc {
333,334d337
< isp_fast_mttr : 1, /* fast sram */
< isp_bustype : 1, /* SBus or PCI */
335a339,340
> isp_bustype : 1, /* SBus or PCI */
> isp_loaded_fw : 1, /* loaded firmware */
369c374
< };
---
> } ispsoftc_t;