diff options
author | marius <marius@FreeBSD.org> | 2007-01-18 13:33:36 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2007-01-18 13:33:36 +0000 |
commit | 85c3e6d089a47ffbf7d2b8bd714fe07527f3667b (patch) | |
tree | f51813769e6b63a059e68e2a35792dfb33294012 | |
parent | fb522f68ac7e8347a80b7ac3c40762fdce82d0bf (diff) | |
download | FreeBSD-src-85c3e6d089a47ffbf7d2b8bd714fe07527f3667b.zip FreeBSD-src-85c3e6d089a47ffbf7d2b8bd714fe07527f3667b.tar.gz |
Wrap the EISA-specific parts of the dpt(4) and si(4) back-ends in
the newly added DEV_EISA. This is done so that these back-ends can
be compiled on platforms not providing in{b,w,l}()/out{b,w,l}() and
friends (but may wish to use them together with bus front-ends other
than the EISA one).
-rw-r--r-- | sys/conf/options | 2 | ||||
-rw-r--r-- | sys/dev/dpt/dpt.h | 2 | ||||
-rw-r--r-- | sys/dev/dpt/dpt_eisa.c | 2 | ||||
-rw-r--r-- | sys/dev/dpt/dpt_scsi.c | 8 | ||||
-rw-r--r-- | sys/dev/si/si.c | 9 |
5 files changed, 23 insertions, 0 deletions
diff --git a/sys/conf/options b/sys/conf/options index d7a2c03..0687223 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -662,6 +662,8 @@ DEV_MCA opt_mca.h DEV_CARP opt_carp.h DEV_SPLASH opt_splash.h +# EISA support +DEV_EISA opt_eisa.h EISA_SLOTS opt_eisa.h # ed driver diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h index 3917195..bf87be1 100644 --- a/sys/dev/dpt/dpt.h +++ b/sys/dev/dpt/dpt.h @@ -1292,7 +1292,9 @@ int dpt_init(struct dpt_softc *dpt); int dpt_attach(dpt_softc_t * dpt); void dpt_intr(void *arg); +#ifdef DEV_EISA dpt_conf_t * dpt_pio_get_conf(u_int32_t); +#endif #if 0 extern void hex_dump(u_char * data, int length, diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c index ea84fb0..742f9fa 100644 --- a/sys/dev/dpt/dpt_eisa.c +++ b/sys/dev/dpt/dpt_eisa.c @@ -28,6 +28,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_eisa.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c index b533a7c..9238292 100644 --- a/sys/dev/dpt/dpt_scsi.c +++ b/sys/dev/dpt/dpt_scsi.c @@ -50,6 +50,8 @@ __FBSDID("$FreeBSD$"); #define _DPT_C_ #include "opt_dpt.h" +#include "opt_eisa.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/eventhandler.h> @@ -106,7 +108,9 @@ devclass_t dpt_devclass; /* ================= Private Inline Function declarations ===================*/ static __inline int dpt_just_reset(dpt_softc_t * dpt); static __inline int dpt_raid_busy(dpt_softc_t * dpt); +#ifdef DEV_EISA static __inline int dpt_pio_wait (u_int32_t, u_int, u_int, u_int); +#endif static __inline int dpt_wait(dpt_softc_t *dpt, u_int bits, u_int state); static __inline struct dpt_ccb* dptgetccb(struct dpt_softc *dpt); @@ -181,6 +185,7 @@ dpt_raid_busy(dpt_softc_t * dpt) return (0); } +#ifdef DEV_EISA static __inline int dpt_pio_wait (u_int32_t base, u_int reg, u_int bits, u_int state) { @@ -196,6 +201,7 @@ dpt_pio_wait (u_int32_t base, u_int reg, u_int bits, u_int state) } return (-1); } +#endif static __inline int dpt_wait(dpt_softc_t *dpt, u_int bits, u_int state) @@ -386,6 +392,7 @@ dptallocccbs(dpt_softc_t *dpt) return (i); } +#ifdef DEV_EISA dpt_conf_t * dpt_pio_get_conf (u_int32_t base) { @@ -478,6 +485,7 @@ dpt_pio_get_conf (u_int32_t base) } return (NULL); } +#endif /* * Read a configuration page into the supplied dpt_cont_t buffer. diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index 584e851..967a4fc 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -43,6 +43,7 @@ static const char si_copyright1[] = "@(#) Copyright (C) Specialix International #include "opt_compat.h" #include "opt_debug_si.h" +#include "opt_eisa.h" #include "opt_tty.h" #include <sys/param.h> @@ -277,8 +278,10 @@ siattach(device_t dev) /* Stop the CPU first so it won't stomp around while we load */ switch (sc->sc_type) { +#ifdef DEV_EISA case SIEISA: outb(sc->sc_iobase + 2, sc->sc_irq << 4); +#endif break; case SIPCI: *(maddr+SIPCIRESET) = 0; @@ -321,12 +324,14 @@ siattach(device_t dev) /* Now start the CPU */ switch (sc->sc_type) { +#ifdef DEV_EISA case SIEISA: /* modify the download code to tell it that it's on an EISA */ *(maddr + 0x42) = 1; outb(sc->sc_iobase + 2, (sc->sc_irq << 4) | 4); (void)inb(sc->sc_iobase + 3); /* reset interrupt */ break; +#endif case SIPCI: /* modify the download code to tell it that it's on a PCI */ *(maddr+0x42) = 1; @@ -1132,11 +1137,13 @@ si_intr(void *arg) ((volatile struct si_reg *)maddr)->int_pending = 0; *(maddr+SIJETINTCL) = 0x0; break; +#ifdef DEV_EISA case SIEISA: maddr = sc->sc_maddr; ((volatile struct si_reg *)maddr)->int_pending = 0; (void)inb(sc->sc_iobase + 3); break; +#endif case SIEMPTY: default: continue; @@ -1622,7 +1629,9 @@ si_modulename(int host_type, int uart_type) { switch (host_type) { /* Z280 based cards */ +#ifdef DEV_EISA case SIEISA: +#endif case SIHOST2: case SIHOST: case SIPCI: |