diff options
| author | Noriaki Mitsunaga <non@FreeBSD.org> | 2001-02-25 06:17:33 +0000 |
|---|---|---|
| committer | Noriaki Mitsunaga <non@FreeBSD.org> | 2001-02-25 06:17:33 +0000 |
| commit | 901ffb51b4350b39abfe642739990e4d0ab20def (patch) | |
| tree | defff841249a95bbc6ec9acea4ad070265fe737e | |
| parent | c97c36bfcee07ddb5f4ebda1aa2359d90a46cfc8 (diff) | |
Notes
| -rw-r--r-- | sys/cam/scsi/scsi_low_pisa.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sys/cam/scsi/scsi_low_pisa.c b/sys/cam/scsi/scsi_low_pisa.c index b095a80c3918..c9510bdca9ac 100644 --- a/sys/cam/scsi/scsi_low_pisa.c +++ b/sys/cam/scsi/scsi_low_pisa.c @@ -36,20 +36,18 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#ifdef __NetBSD__ #include <sys/disklabel.h> +#endif #if defined(__FreeBSD__) && __FreeBSD_version >= 500001 #include <sys/bio.h> #endif #include <sys/buf.h> #include <sys/queue.h> -#include <sys/malloc.h> #include <sys/device_port.h> -#include <sys/errno.h> -#include <vm/vm.h> - -#include <machine/bus.h> #ifdef __NetBSD__ +#include <machine/bus.h> #include <machine/intr.h> #endif @@ -58,11 +56,9 @@ #include <dev/isa/isavar.h> #include <dev/isa/pisaif.h> -#endif #include <machine/dvcfg.h> -#ifdef __NetBSD__ #include <dev/scsipi/scsi_all.h> #include <dev/scsipi/scsipi_all.h> #include <dev/scsipi/scsiconf.h> @@ -74,9 +70,6 @@ #define SCSIBUS_RESCAN #else #ifdef __FreeBSD__ -#include <i386/isa/isa_device.h> -#include <i386/isa/icu.h> - #include <cam/scsi/scsi_low.h> #include <cam/scsi/scsi_low_pisa.h> #endif @@ -153,7 +146,7 @@ scsi_low_activate(dh) /* rescan the scsi bus */ #ifdef SCSIBUS_RESCAN if (PISA_RES_EVENT(dh) == PISA_EVENT_INSERT && - sc->sl_start.tqh_first == NULL) + TAILQ_FIRST(&sc->sl_start) == NULL) scsi_probe_busses((int) sc->sl_link.scsipi_scsi.scsibus, -1, -1); #endif return 0; @@ -170,7 +163,7 @@ scsi_low_notify(dh, ev) switch(ev) { case PISA_EVENT_QUERY_SUSPEND: - if (sc->sl_start.tqh_first != NULL) + if (TAILQ_FIRST(&sc->sl_start) != NULL) return SD_EVENT_STATUS_BUSY; break; |