pcibios tells us everything, no bios_pciinfo

3 files changed, 4 insertions, 43 deletions

diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c
index 0a2c1ce8499..73150916d7b 100644
--- a/sys/arch/i386/i386/bios.c
+++ b/sys/arch/i386/i386/bios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bios.c,v 1.30 2000/08/17 20:15:39 mickey Exp $	*/
+/*	$OpenBSD: bios.c,v 1.31 2000/08/17 22:08:09 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997-2000 Michael Shalayeff
@@ -85,9 +85,6 @@ extern dev_t bootdev;
 #if NAPM > 0 || defined(DEBUG)
 bios_apminfo_t *apm;
 #endif
-#if NPCI > 0
-bios_pciinfo_t *bios_pciinfo;
-#endif
 bios_diskinfo_t *bios_diskinfo;
 bios_memmap_t	*bios_memmap;
 u_int32_t	bios_cksumlen;
@@ -261,12 +258,6 @@ bios_getopt()
 			printf(" cksumlen %d", bios_cksumlen);
 #endif
 			break;
-#if NPCI > 0
-		case BOOTARG_PCIINFO:
-			bios_pciinfo = (bios_pciinfo_t *)q->ba_arg;
-			printf(" pciinfo %p", bios_pciinfo);
-			break;
-#endif
 		case BOOTARG_CONSDEV:
 			if (q->ba_size >= sizeof(bios_consdev_t))
 			{
diff --git a/sys/arch/i386/include/biosvar.h b/sys/arch/i386/include/biosvar.h
index f2d2b5231e0..0447d196af4 100644
--- a/sys/arch/i386/include/biosvar.h
+++ b/sys/arch/i386/include/biosvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosvar.h,v 1.36 2000/08/17 20:15:39 mickey Exp $	*/
+/*	$OpenBSD: biosvar.h,v 1.37 2000/08/17 22:08:11 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
@@ -236,7 +236,6 @@ int  bios32_service __P((u_int32_t, bios32_entry_t, bios32_entry_info_t));
 
 extern u_int bootapiver;
 extern bios_memmap_t *bios_memmap;
-extern bios_pciinfo_t *bios_pciinfo;
 
 #endif /* _KERNEL */
 #endif /* _LOCORE */
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);