From a7926156e17b493f9d7b9ac07f4d7fe8d7a003ef Mon Sep 17 00:00:00 2001
From: Artur Grabowski <art@cvs.openbsd.org>
Date: Tue, 26 Jun 2001 20:24:11 +0000
Subject: USER_PCICONF

---
 sys/arch/alpha/alpha/conf.c | 11 ++++++++++-
 sys/arch/alpha/conf/GENERIC |  4 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'sys/arch/alpha')

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 59eea187626..85c2ceff63d 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.25 2001/06/25 03:19:39 kjell Exp $	*/
+/*	$OpenBSD: conf.c,v 1.26 2001/06/26 20:24:10 art Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -140,6 +140,10 @@ cdev_decl(ucom);
 cdev_decl(ugen);
 #include "pf.h"
 cdev_decl(pf);
+#ifdef USER_PCICONF
+#include "pci.h"
+cdev_decl(pci);
+#endif
 
 struct cdevsw	cdevsw[] =
 {
@@ -199,6 +203,11 @@ struct cdevsw	cdevsw[] =
 #else
 	cdev_notdef(),			/* 51 */
 #endif
+#ifdef USER_PCICONF
+	cdev_pci_init(NPCI,pci),	/* 52: PCI user */
+#else
+	cdev_notdef(),
+#endif
 };
 int	nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
 
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 52e55eeb27a..b5bdadd86bb 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.81 2001/06/26 19:02:13 nate Exp $
+#	$OpenBSD: GENERIC,v 1.82 2001/06/26 20:23:18 art Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
@@ -37,6 +37,8 @@ option		PCIVERBOSE		# recognize "unknown" PCI devices
 option		TCVERBOSE		# recognize "unknown" TC devices
 option		USBVERBOSE
 
+option		USER_PCICONF		# user-space PCI configuration
+
 config		bsd	swap generic
 
 mainbus0 at	root
-- 
cgit v1.2.3