pcibios kernel device is now doing this job

4 files changed, 6 insertions, 81 deletions

diff --git a/sys/arch/i386/stand/libsa/Makefile b/sys/arch/i386/stand/libsa/Makefile
index e35d35faaea..678f616137d 100644
--- a/sys/arch/i386/stand/libsa/Makefile
+++ b/sys/arch/i386/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.36 1999/08/25 00:54:19 mickey Exp $
+#	$OpenBSD: Makefile,v 1.37 2000/10/09 20:37:18 mickey Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -16,12 +16,12 @@ SRCS+=	machdep.c dev_i386.c exec_i386.c cmd_i386.c
 SRCS+=	unixdev.c unixsys.S nullfs.c memprobe.c
 CLEANFILES+=	gidt.o debug_i386.o alloca.o \
 	biosdev.o bioscons.o gateA20.o apmprobe.o \
-	memprobe.o diskprobe.o pciprobe.o smpprobe.o \
+	memprobe.o diskprobe.o smpprobe.o \
 	time.o
 .else
 SRCS+=	gidt.S debug_i386.S alloca.S \
 	biosdev.c bioscons.c gateA20.c apmprobe.c \
-	memprobe.c diskprobe.c pciprobe.c smpprobe.c \
+	memprobe.c diskprobe.c smpprobe.c \
 	time.c
 CLEANFILES+=	unixdev.o unixsys.o nullfs.o
 .endif
diff --git a/sys/arch/i386/stand/libsa/libsa.h b/sys/arch/i386/stand/libsa/libsa.h
index 6fb8ce1d135..0fced2f30a8 100644
--- a/sys/arch/i386/stand/libsa/libsa.h
+++ b/sys/arch/i386/stand/libsa/libsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libsa.h,v 1.30 2000/03/05 18:40:59 niklas Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.31 2000/10/09 20:37:19 mickey Exp $	*/
 
 /*
  * Copyright (c) 1996-1999 Michael Shalayeff
@@ -45,7 +45,6 @@ void memprobe __P((void));
 void diskprobe __P((void));
 void apmprobe __P((void));
 void apmcheck __P((void));
-void pciprobe __P((void));
 void dump_biosmem __P((bios_memmap_t *));
 int mem_add __P((long, long));
 int mem_delete __P((long, long));
diff --git a/sys/arch/i386/stand/libsa/machdep.c b/sys/arch/i386/stand/libsa/machdep.c
index 76e61e5c572..45b5c090f20 100644
--- a/sys/arch/i386/stand/libsa/machdep.c
+++ b/sys/arch/i386/stand/libsa/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.28 1999/08/25 00:54:19 mickey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.29 2000/10/09 20:37:19 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
@@ -59,7 +59,7 @@ machdep()
 	cninit();     CKPT('3');
 #ifndef _TEST
 	apmprobe();   CKPT('4');
-	pciprobe();   CKPT('5');
+/*	pciprobe();   CKPT('5'); */
 /*	smpprobe();   CKPT('6'); */
 	memprobe();   CKPT('7');
 	printf("\n");
diff --git a/sys/arch/i386/stand/libsa/pciprobe.c b/sys/arch/i386/stand/libsa/pciprobe.c
deleted file mode 100644
index 3a586f88399..00000000000
--- a/sys/arch/i386/stand/libsa/pciprobe.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$OpenBSD: pciprobe.c,v 1.3 1999/08/25 00:54:19 mickey Exp $	*/
-
-/*
- * Copyright (c) 1997 Tobias Weingartner
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#include <sys/param.h>
-#include <stand/boot/bootarg.h>
-#include <machine/biosvar.h>
-#include "libsa.h"
-
-#define PCI_SIG 0x20494350		/* PCI Signature */
-
-void
-pciprobe()
-{
-	bios_pciinfo_t bpi;
-	u_int32_t hw_chars, rev, rc, sig;
-	u_int32_t entry32;
-
-	/* PCI BIOS v2.0c+ - Installation Check */
-	__asm __volatile(DOINT(0x1A) ";shll $8,%2; setc %b2"
-		: "=a" (hw_chars), "=b" (rev), "=c" (rc),
-		  "=d" (sig), "=D" (entry32)
-		: "0" (0xB101), "4" (0x0)
-		: "cc");
-
-	if (rc & 0xff00 || hw_chars & 0xff00)
-		return;
-	if (sig != PCI_SIG)
-		return;
-
-	printf(" pci");
-#ifdef DEBUG
-	printf("[V%d.%d, %x 0x%x %d]", (rev>>8)&0xFF, (rev&0xFF),
-		hw_chars, entry32, (rc>>8)&0xFF);
-#endif
-
-	bpi.pci_chars = hw_chars & 0xFFFF;
-	bpi.pci_rev = rev & 0xFFFF;
-	bpi.pci_entry32 = entry32;
-	bpi.pci_lastbus = (rc>>8) & 0xFF;
-
-	addbootarg(BOOTARG_PCIINFO, sizeof(bios_pciinfo_t), &bpi);
-}
-