diff options
| author | gibbs <gibbs@FreeBSD.org> | 1995-11-05 04:43:22 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1995-11-05 04:43:22 +0000 |
| commit | 25f2593382539daad2e03aad6bea2ad1317affc6 (patch) | |
| tree | 27ebad2b13536550e62971ee8931cb52f98119a1 | |
| parent | da1c8c00f7a22cf7bfcdbbc3284526654f740067 (diff) | |
| download | FreeBSD-src-25f2593382539daad2e03aad6bea2ad1317affc6.zip FreeBSD-src-25f2593382539daad2e03aad6bea2ad1317affc6.tar.gz | |
Modifications for the new eisaconf.
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 14 | ||||
| -rw-r--r-- | sys/i386/i386/autoconf.c | 14 | ||||
| -rw-r--r-- | sys/i386/include/devconf.h | 4 |
3 files changed, 21 insertions, 11 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index d9f4d98..9c7f1e5 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.39 1995/09/10 18:57:24 bde Exp $ + * $Id: autoconf.c,v 1.40 1995/10/21 00:55:13 phk Exp $ */ /* @@ -102,6 +102,10 @@ u_char end_mfs_root[] = "MFS Filesystem had better STOP here"; #include <i386/isa/isa_device.h> #endif +#if NEISA > 0 +void eisa_configure(); +#endif + #include "pci.h" #if NPCI > 0 #include <pci/pcivar.h> @@ -174,10 +178,6 @@ configure(dummy) configure_start(); -#if NEISA > 0 - eisa_configure(); -#endif - #if NCRD > 0 /* Before isa_configure to avoid ISA drivers finding our cards */ pccard_configure(); @@ -187,6 +187,10 @@ configure(dummy) isa_configure(); #endif +#if NEISA > 0 + eisa_configure(); +#endif + #if NPCI > 0 pci_configure(); #endif diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index d9f4d98..9c7f1e5 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.39 1995/09/10 18:57:24 bde Exp $ + * $Id: autoconf.c,v 1.40 1995/10/21 00:55:13 phk Exp $ */ /* @@ -102,6 +102,10 @@ u_char end_mfs_root[] = "MFS Filesystem had better STOP here"; #include <i386/isa/isa_device.h> #endif +#if NEISA > 0 +void eisa_configure(); +#endif + #include "pci.h" #if NPCI > 0 #include <pci/pcivar.h> @@ -174,10 +178,6 @@ configure(dummy) configure_start(); -#if NEISA > 0 - eisa_configure(); -#endif - #if NCRD > 0 /* Before isa_configure to avoid ISA drivers finding our cards */ pccard_configure(); @@ -187,6 +187,10 @@ configure(dummy) isa_configure(); #endif +#if NEISA > 0 + eisa_configure(); +#endif + #if NPCI > 0 pci_configure(); #endif diff --git a/sys/i386/include/devconf.h b/sys/i386/include/devconf.h index f4fbe34..b6c4a32 100644 --- a/sys/i386/include/devconf.h +++ b/sys/i386/include/devconf.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: devconf.h,v 1.8 1995/02/04 12:47:19 se Exp $ + * $Id: devconf.h,v 1.9 1995/05/30 08:00:37 rgrimes Exp $ */ /* * devconf.h - machine-dependent device configuration table @@ -64,9 +64,11 @@ struct machdep_devconf { #define dc_devtype dc_md.mddc_devtype #define dc_flags dc_md.mddc_flags #define kdc_isa kdc_parentdata +#define kdc_eisa kdc_parentdata #define kdc_scsi kdc_parentdata #include <i386/isa/isa_device.h> +#include <i386/eisa/eisaconf.h> #include <pci/pcireg.h> #include <pci/pcivar.h> #include <scsi/scsi_all.h> |
