summaryrefslogtreecommitdiffstats
path: root/sys/dev/dpt
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2007-01-18 13:33:36 +0000
committermarius <marius@FreeBSD.org>2007-01-18 13:33:36 +0000
commit85c3e6d089a47ffbf7d2b8bd714fe07527f3667b (patch)
treef51813769e6b63a059e68e2a35792dfb33294012 /sys/dev/dpt
parentfb522f68ac7e8347a80b7ac3c40762fdce82d0bf (diff)
downloadFreeBSD-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).
Diffstat (limited to 'sys/dev/dpt')
-rw-r--r--sys/dev/dpt/dpt.h2
-rw-r--r--sys/dev/dpt/dpt_eisa.c2
-rw-r--r--sys/dev/dpt/dpt_scsi.c8
3 files changed, 12 insertions, 0 deletions
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.
OpenPOWER on IntegriCloud