diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
new file mode 100644
index 000000000000..2e727306f8e8
--- /dev/null
+++ b/sys/dev/pci/pcidevs.h
@@ -0,0 +1,120 @@
+/*
+ * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+ *
+ * generated from:
+ *	NetBSD: pcidevs,v 1.1 1995/06/18 01:07:06 cgd Exp 
+ */
+
+/*
+ * Copyright (c) 1995 Christopher G. Demetriou
+ * 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 Christopher G. Demetriou
+ *	for the NetBSD Project.
+ * 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 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.
+ */
+
+/*
+ * List of known PCI vendors
+ */
+
+#define	PCI_VENDOR_OLDNCR	0x1000		/* NCR (Old ID. see "NCR" below.) */
+#define	PCI_VENDOR_ATI	0x1002		/* ATI */
+#define	PCI_VENDOR_DEC	0x1011		/* DEC */
+#define	PCI_VENDOR_CIRRUS	0x1013		/* Cirrus Logic */
+#define	PCI_VENDOR_IBM	0x1014		/* IBM */
+#define	PCI_VENDOR_NCR	0x101A		/* NCR */
+#define	PCI_VENDOR_AMD	0x1022		/* AMD */
+#define	PCI_VENDOR_COMPAQ	0x1032		/* Compaq */
+#define	PCI_VENDOR_NEC	0x1033		/* NEC */
+#define	PCI_VENDOR_HP	0x103C		/* Hewlett-Packard */
+#define	PCI_VENDOR_KPC	0x1040		/* Kubota Pacific Corp. */
+#define	PCI_VENDOR_TI	0x104C		/* Texas Instruments */
+#define	PCI_VENDOR_SONY	0x104D		/* Sony */
+#define	PCI_VENDOR_MOT	0x1057		/* Motorola */
+#define	PCI_VENDOR_MYLEX	0x1069		/* Mylex */
+#define	PCI_VENDOR_APPLE	0x106B		/* Apple */
+#define	PCI_VENDOR_QLOGIC	0x1077		/* QLogic (??? XXX) */
+#define	PCI_VENDOR_BIT3	0x108A		/* Bit3 Computer Corp. */
+#define	PCI_VENDOR_CABLETRON	0x10B1		/* Cabletron */
+#define	PCI_VENDOR_3COM	0x10B7		/* 3Com */
+#define	PCI_VENDOR_CERN	0x10DC		/* CERN (??? XXX) */
+#define	PCI_VENDOR_ECP	0x10DC		/* ECP (??? XXX) */
+#define	PCI_VENDOR_ECU	0x10DC		/* ECU (??? XXX) */
+#define	PCI_VENDOR_PROTEON	0x1108		/* Proteon */
+#define	PCI_VENDOR_S3	0x5333		/* S3 */
+#define	PCI_VENDOR_INTEL	0x8086		/* Intel */
+#define	PCI_VENDOR_ADP	0x9004		/* Adaptec */
+
+/*
+ * List of known products.  Grouped by vendor.
+ */
+
+/* Adaptec products */
+#define	PCI_PRODUCT_ADP_AIC7870	0x7078		/* AIC-7870 */
+
+/* ATI products */
+#define	PCI_PRODUCT_ATI_MACH32	0x4158		/* Mach32 */
+#define	PCI_PRODUCT_ATI_MACH64_CX	0x4358		/* Mach64-CX */
+#define	PCI_PRODUCT_ATI_MACH64_GX	0x4758		/* Mach64-GX */
+
+/* DEC products */
+#define	PCI_PRODUCT_DEC_21050	0x0001		/* DECchip 21050 (\"PPB\") */
+#define	PCI_PRODUCT_DEC_21040	0x0002		/* DECchip 21040 (\"Tulip\") */
+#define	PCI_PRODUCT_DEC_21030	0x0004		/* DECchip 21030 (\"TGA\") */
+#define	PCI_PRODUCT_DEC_NVRAM	0x0007		/* Zephyr NV-RAM */
+#define	PCI_PRODUCT_DEC_KZPSA	0x0008		/* KZPSA */
+#define	PCI_PRODUCT_DEC_21140	0x0009		/* DECchip 21140 (\"FasterNet\") */
+#define	PCI_PRODUCT_DEC_DEFPA	0x000f		/* DEFPA */
+/* product DEC ???	0x0010	UNSUPP	??? VME Interface */
+#define	PCI_PRODUCT_DEC_21041	0x0014		/* DECchip 21041 (\"Tulip Pass 3\") */
+
+/* Intel products */
+/* XXX name? */
+#define	PCI_PRODUCT_INTEL_PCEB	0x0482		/* 82375EB PCI-EISA Bridge */
+#define	PCI_PRODUCT_INTEL_PCIB	0x0486		/* 82426EX PCI-ISA Bridge */
+#define	PCI_PRODUCT_INTEL_PCMC	0x04a3		/* 82434LX PCI, Cache, and Memory controller */
+
+/* XXX the following two Intel products are UNVERIFIED. */
+#define	PCI_PRODUCT_INTEL_CDC	0x0483		/* 82424 Cache and DRAM controller */
+/* XXX Supported on the Alpha. XXX unverified. XXX includes PCI-ISA bridge */
+#define	PCI_PRODUCT_INTEL_SIO	0x0484		/* 82378 System I/O */
+
+/* Mylex products */
+#define	PCI_PRODUCT_MYLEX_960P	0x0001		/* RAID controller */
+
+/* NCR/Symbios Logic products */
+#define	PCI_PRODUCT_NCR_810	0x0001		/* 53c810 */
+#define	PCI_PRODUCT_OLDNCR_810	0x0001		/* 53c810 */
+#define	PCI_PRODUCT_NCR_825	0x0003		/* 53c825 */
+#define	PCI_PRODUCT_OLDNCR_825	0x0003		/* 53c825 */
+#define	PCI_PRODUCT_NCR_815	0x0004		/* 53c815 */
+#define	PCI_PRODUCT_OLDNCR_815	0x0004		/* 53c815 */
+
+/* QLogic products */
+#define	PCI_PRODUCT_QLOGIC_ISP1020	0x1020		/* ISP1020 */
+
+/* S3 Products */
+#define	PCI_PRODUCT_S3_VISION864	0x88c0		/* Vision 864 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
new file mode 100644
index 000000000000..9c2cdb88db0e
--- /dev/null
+++ b/sys/dev/pci/pcidevs_data.h
@@ -0,0 +1,359 @@
+/*
+ * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+ *
+ * generated from:
+ *	NetBSD: pcidevs,v 1.1 1995/06/18 01:07:06 cgd Exp 
+ */
+
+/*
+ * Copyright (c) 1995 Christopher G. Demetriou
+ * 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 Christopher G. Demetriou
+ *	for the NetBSD Project.
+ * 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 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.
+ */
+
+struct pci_knowndev pci_knowndevs[] = {
+	{
+	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_AIC7870,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "Adaptec",
+	    "AIC-7870",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH32,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "ATI",
+	    "Mach32",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_CX,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "ATI",
+	    "Mach64-CX",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GX,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "ATI",
+	    "Mach64-GX",
+	},
+	{
+	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21050,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "DEC",
+	    "DECchip 21050 (\"PPB\")",
+	},
+	{
+	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21040,
+	    0,
+	    "DEC",
+	    "DECchip 21040 (\"Tulip\")",
+	},
+	{
+	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21030,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "DEC",
+	    "DECchip 21030 (\"TGA\")",
+	},
+	{
+	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_NVRAM,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "DEC",
+	    "Zephyr NV-RAM",
+	},
+	{
+	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_KZPSA,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "DEC",
+	    "KZPSA",
+	},
+	{
+	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21140,
+	    0,
+	    "DEC",
+	    "DECchip 21140 (\"FasterNet\")",
+	},
+	{
+	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_DEFPA,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "DEC",
+	    "DEFPA",
+	},
+	{
+	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21041,
+	    0,
+	    "DEC",
+	    "DECchip 21041 (\"Tulip Pass 3\")",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCEB,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "Intel",
+	    "82375EB PCI-EISA Bridge",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCIB,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "Intel",
+	    "82426EX PCI-ISA Bridge",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCMC,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "Intel",
+	    "82434LX PCI, Cache, and Memory controller",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CDC,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "Intel",
+	    "82424 Cache and DRAM controller",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_SIO,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "Intel",
+	    "82378 System I/O",
+	},
+	{
+	    PCI_VENDOR_MYLEX, PCI_PRODUCT_MYLEX_960P,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "Mylex",
+	    "RAID controller",
+	},
+	{
+	    PCI_VENDOR_NCR, PCI_PRODUCT_NCR_810,
+	    0,
+	    "NCR",
+	    "53c810",
+	},
+	{
+	    PCI_VENDOR_OLDNCR, PCI_PRODUCT_OLDNCR_810,
+	    0,
+	    "NCR",
+	    "53c810",
+	},
+	{
+	    PCI_VENDOR_NCR, PCI_PRODUCT_NCR_825,
+	    0,
+	    "NCR",
+	    "53c825",
+	},
+	{
+	    PCI_VENDOR_OLDNCR, PCI_PRODUCT_OLDNCR_825,
+	    0,
+	    "NCR",
+	    "53c825",
+	},
+	{
+	    PCI_VENDOR_NCR, PCI_PRODUCT_NCR_815,
+	    0,
+	    "NCR",
+	    "53c815",
+	},
+	{
+	    PCI_VENDOR_OLDNCR, PCI_PRODUCT_OLDNCR_815,
+	    0,
+	    "NCR",
+	    "53c815",
+	},
+	{
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP1020,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "QLogic",
+	    "ISP1020",
+	},
+	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_VISION864,
+	    PCI_KNOWNDEV_UNSUPP,
+	    "S3",
+	    "Vision 864",
+	},
+	{
+	    PCI_VENDOR_OLDNCR, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "NCR",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_ATI, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "ATI",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_DEC, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "DEC",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_CIRRUS, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Cirrus Logic",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_IBM, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "IBM",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_NCR, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "NCR",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_AMD, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "AMD",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_COMPAQ, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Compaq",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_NEC, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "NEC",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_HP, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Hewlett-Packard",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_KPC, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Kubota Pacific Corp.",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_TI, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Texas Instruments",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_SONY, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Sony",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_MOT, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Motorola",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_MYLEX, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Mylex",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_APPLE, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Apple",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_QLOGIC, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "QLogic",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_BIT3, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Bit3 Computer Corp.",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_CABLETRON, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Cabletron",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_3COM, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "3Com",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_CERN, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "CERN",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_ECP, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "ECP",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_ECU, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "ECU",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_PROTEON, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Proteon",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_S3, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "S3",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_INTEL, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Intel",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_ADP, 0,
+	    PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,
+	    "Adaptec",
+	    NULL,
+	},
+	{ 0, 0, 0, NULL, NULL, }
+};