From cef8bdc45d8082bcfba88c9456762164b5b89467 Mon Sep 17 00:00:00 2001
From: Michael Shalayeff <mickey@cvs.openbsd.org>
Date: Tue, 9 Dec 2003 04:25:57 +0000
Subject: allow for user pci conf

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

diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 7c12a9c9be2..3a8c9fe3ea5 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.40 2003/10/05 16:36:22 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.41 2003/12/09 04:25:55 mickey Exp $
 
 # Machine architecture; required by config(8)
 machine		hppa
@@ -16,6 +16,7 @@ option		HP7200_CPU,HP7250_CPU		# PCXT'
 
 option		FPEMUL
 option		USELEDS		# blink 'em
+option		USER_PCICONF	# user-space PCI configuration
 
 # Need to set locally
 maxusers	32
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index 3512d799611..3a66e3b9daa 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.28 2003/09/23 16:51:11 millert Exp $	*/
+/*	$OpenBSD: conf.c,v 1.29 2003/12/09 04:25:56 mickey Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -111,6 +111,11 @@ cdev_decl(com);
 
 #include "systrace.h"
 
+#ifdef USER_PCICONF
+#include "pci.h"
+cdev_decl(pci);
+#endif
+
 struct cdevsw   cdevsw[] =
 {
 	cdev_cn_init(1,cn),		/*  0: virtual console */
@@ -145,8 +150,11 @@ struct cdevsw   cdevsw[] =
 	cdev_mouse_init(NWSKBD,wskbd),	/* 28: keyboards */
 	cdev_mouse_init(NWSMOUSE,wsmouse), /* 29: mice */
 	cdev_mouse_init(NWSMUX,wsmux),	/* 30: mux */
-	cdev_notdef(),			/* 31 */
-
+#ifdef USER_PCICONF
+	cdev_pci_init(NPCI,pci),	/* 31: PCI user */
+#else
+	cdev_notdef(),
+#endif
 #ifdef XFS
 	cdev_xfs_init(NXFS,xfs_dev),	/* 32: xfs communication device */
 #else
-- 
cgit v1.2.3