5 files changed, 69 insertions, 5 deletions
diff --git a/sys/i386/isa/bs/dvcfg.h b/sys/compat/netbsd/dvcfg.h
index f092117e21690..f092117e21690 100644
--- a/sys/i386/isa/bs/dvcfg.h
+++ b/sys/compat/netbsd/dvcfg.h
diff --git a/sys/i386/include/dvcfg.h b/sys/i386/include/dvcfg.h
new file mode 100644
index 0000000000000..f092117e21690
--- /dev/null
+++ b/sys/i386/include/dvcfg.h
@@ -0,0 +1,64 @@
+/*	$NetBSD$	*/
+/*
+ * [NetBSD for NEC PC98 series]
+ *  Copyright (c) 1996 NetBSD/pc98 porting staff.
+ *  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. 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 AUTHOR 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.
+ */
+/*
+ * Copyright (c) 1996 Naofumi HONDA.  All rights reserved.
+ */
+
+#ifndef _I386_DVCFG_H_
+#define _I386_DVCFG_H_
+
+typedef void *dvcfg_hw_t;
+
+struct dvcfg_hwsel {
+	int cfg_max;
+
+	dvcfg_hw_t *cfg_sel;
+};
+
+#define	DVCFG_MAJOR(dvcfg)	(((u_int)(dvcfg)) >> 16)
+#define	DVCFG_MINOR(dvcfg)	(((u_int)(dvcfg)) & 0xffff)
+
+#define	DVCFG_MKCFG(major, minor) ((((u_int)(major)) << 16) | ((minor) & 0xffff))
+
+#define	DVCFG_HWSEL_SZ(array)	(sizeof(array) / sizeof(dvcfg_hw_t))
+
+static inline dvcfg_hw_t dvcfg_hw __P((struct dvcfg_hwsel *, u_int));
+
+static inline dvcfg_hw_t
+dvcfg_hw(selp, num)
+	struct dvcfg_hwsel *selp;
+	u_int num;
+{
+
+	return ((num >= selp->cfg_max) ? NULL : selp->cfg_sel[num]);
+}
+
+#define	DVCFG_HW(SELP, NUM)	dvcfg_hw((SELP), (NUM))
+#endif	/* _I386_DVCFG_H_ */
diff --git a/sys/i386/isa/bs/bsif.h b/sys/i386/isa/bs/bsif.h
index 502bfe72b062b..39547f0b66397 100644
--- a/sys/i386/isa/bs/bsif.h
+++ b/sys/i386/isa/bs/bsif.h
@@ -100,13 +100,14 @@
 #include <sys/device.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
+#include <vm/pmap.h>
+
 #include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/md_var.h>
 #include <machine/vmparam.h>
 #include <machine/ipl.h>
-#include <vm/pmap.h>
-#include <sys/proc.h>
+#include <machine/dvcfg.h>
 
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
@@ -142,10 +143,9 @@
 #define	BUS_IOW(offs, val) (BUS_IO_DELAY, outb(bsc->sc_iobase + (offs), (val)))
 
 #include <i386/isa/ic/wd33c93.h>
-#include <i386/isa/bs/ccbque.h>
-#include <i386/isa/bs/dvcfg.h>
+#include <i386/isa/ccbque.h>
 
-#include <i386/isa/bs/scsi_dvcfg.h>
+#include <i386/isa/scsi_dvcfg.h>
 #include <i386/isa/bs/bsvar.h>
 #include <i386/isa/bs/bshw.h>
 #include <i386/isa/bs/bsfunc.h>
diff --git a/sys/i386/isa/bs/ccbque.h b/sys/i386/isa/ccbque.h
index df80faf8fdffa..df80faf8fdffa 100644
--- a/sys/i386/isa/bs/ccbque.h
+++ b/sys/i386/isa/ccbque.h
diff --git a/sys/i386/isa/bs/scsi_dvcfg.h b/sys/i386/isa/scsi_dvcfg.h
index 0d4d14298e305..0d4d14298e305 100644
--- a/sys/i386/isa/bs/scsi_dvcfg.h
+++ b/sys/i386/isa/scsi_dvcfg.h