summaryrefslogtreecommitdiff
path: root/sys/arch/i386/pci
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2000-08-17 22:08:12 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2000-08-17 22:08:12 +0000
commitabce56b405bff7fc97f0adf44cd0a19c9eba67f3 (patch)
tree118acbc68caedfe8019dd90b8af02bbb2f6eb492 /sys/arch/i386/pci
parent25161d484bf5d560743bc5304ab7469a9530e415 (diff)
pcibios tells us everything, no bios_pciinfo
Diffstat (limited to 'sys/arch/i386/pci')
-rw-r--r--sys/arch/i386/pci/pci_machdep.c33
1 files changed, 2 insertions, 31 deletions
diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c
index d93806fe96f..63ad76260e0 100644
--- a/sys/arch/i386/pci/pci_machdep.c
+++ b/sys/arch/i386/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.15 2000/03/05 19:07:44 mickey Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.16 2000/08/17 22:08:10 mickey Exp $ */
/* $NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $ */
/*-
@@ -94,11 +94,6 @@
#include <machine/bus.h>
#include <machine/pio.h>
-#include "bios.h"
-#if NBIOS > 0
-#include <machine/biosvar.h>
-#endif
-
#include <i386/isa/icu.h>
#include <dev/isa/isavar.h>
#include <dev/pci/pcivar.h>
@@ -140,14 +135,8 @@ pci_attach_hook(parent, self, pba)
struct pcibus_attach_args *pba;
{
-#if NBIOS > 0
- if (pba->pba_bus == 0)
- printf(": configuration mode %d (%s)",
- pci_mode, (bios_pciinfo?"bios":"no bios"));
-#else
if (pba->pba_bus == 0)
printf(": configuration mode %d", pci_mode);
-#endif
}
int
@@ -351,31 +340,13 @@ pci_mode_detect()
if (pci_mode != -1)
return pci_mode;
-#if NBIOS > 0
- /*
- * If we have PCI info passed from the BIOS, use the mode given there
- * for all of this code. If not, pass on through to the previous tests
- * to try and devine the correct mode.
- */
- if (bios_pciinfo != NULL) {
- if (bios_pciinfo->pci_chars & 0x2)
- return (pci_mode = 2);
-
- if (bios_pciinfo->pci_chars & 0x1)
- return (pci_mode = 1);
-
- /* We should never get here, but if we do, fall through... */
- }
-#endif
-
/*
* We try to divine which configuration mode the host bridge wants. We
* try mode 2 first, because our probe for mode 1 is likely to succeed
* for mode 2 also.
*
* This should really be done using the PCI BIOS. If we get here, the
- * PCI BIOS does not exist, or the boot blocks did not provide the
- * information.
+ * PCI BIOS does not exist, or it was disabled in kernel config.
*/
outb(PCI_MODE2_ENABLE_REG, 0);
outb(PCI_MODE2_FORWARD_REG, 0);