Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

the i386 port no longer attaches isa, eisa, and pci at root.

Browse Source
This commit is contained in:
cgd 1996-03-04 03:29:12 +00:00
parent fedca4f133
commit acabb62791
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/eisa/files.eisa
View File

@ -1,11 +1,10 @@
# $NetBSD: files.eisa,v 1.5 1996/02/27 22:39:28 cgd Exp $
# $NetBSD: files.eisa,v 1.6 1996/03/04 03:29:12 cgd Exp $
#
# Config.new file and device description for machine-independent EISA code.
# Included by ports that need it. Requires that the SCSI files be
# defined first.
# XXX should not attach to root
device eisa at eisabus, root {[slot = -1]}
device eisa at eisabus {[slot = -1]}
file dev/eisa/eisa.c eisa needs-flag
# Adaptec AHA-174x EISA SCSI Host Adapter family

9
sys/dev/isa/files.isa
View File

@ -1,4 +1,4 @@
# $NetBSD: files.isa,v 1.11 1996/02/28 01:43:45 cgd Exp $
# $NetBSD: files.isa,v 1.12 1996/03/04 03:29:16 cgd Exp $
#
# Config.new file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@ -8,10 +8,9 @@
# devices:
# mcd, scd, wd, wt
# XXX should not attach to root
device isa at isabus, root {[port = -1], [size = 0],
[iomem = -1], [iosiz = 0],
[irq = -1], [drq = -1]}
device isa at isabus {[port = -1], [size = 0],
[iomem = -1], [iosiz = 0],
[irq = -1], [drq = -1]}
file dev/isa/isa.c isa needs-flag
# ISA DMA controller

5
sys/dev/pci/files.pci
View File

@ -1,11 +1,10 @@
# $NetBSD: files.pci,v 1.11 1996/02/28 01:47:06 cgd Exp $
# $NetBSD: files.pci,v 1.12 1996/03/04 03:29:19 cgd Exp $
#
# Config.new file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
# defined first.
# XXX should not attach to root
device pci at pcibus, root {[dev = -1], [function = -1]}
device pci at pcibus {[dev = -1], [function = -1]}
file dev/pci/pci.c pci needs-flag
file dev/pci/pci_subr.c pci

12
sys/dev/pci/pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci.c,v 1.11 1996/03/02 02:03:55 cgd Exp $ */
/* $NetBSD: pci.c,v 1.12 1996/03/04 03:29:20 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou. All rights reserved.
@ -69,9 +69,6 @@ pcimatch(parent, match, aux)
return (0);
/* Check the locators */
#ifdef i386 /* XXX should not be attached at root, but is on i386 */
if (parent != NULL)
#endif /* i386 XXX */
if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != pba->pba_bus)
return (0);
@ -97,10 +94,9 @@ pciattach(parent, self, aux)
struct pcibus_attach_args *pba = aux;
int maxndevs, device, function, nfunctions;
#ifdef i386 /* XXX should not be attached at root, but is on i386 */
if (parent == NULL)
printf(": bus %d, configuration mode %d", pba->pba_bus,
pci_mode);
#ifdef i386 /* XXX */
if (pba->pba_bus == 0)
printf(": configuration mode %d", pci_mode);
#endif /* XXX */
printf("\n");