Update

2 files changed, 81 insertions, 11 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index f0f7c9c9f1a..6804590d6d9 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcidevs,v 1.223 2000/03/05 21:42:00 mickey Exp 
+ *		OpenBSD: pcidevs,v 1.224 2000/03/20 07:33:07 rahnds Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -670,6 +670,15 @@
 
 /* Apple products */
 #define	PCI_PRODUCT_APPLE_BANDIT	0x0001		/* PCI */
+#define	PCI_PRODUCT_APPLE_GC	0x0002		/* PCI */
+#define	PCI_PRODUCT_APPLE_OHARE	0x0007		/* PCI */
+#define	PCI_PRODUCT_APPLE_HEATHROW	0x0010		/* MACIO */
+#define	PCI_PRODUCT_APPLE_PADDINGTON	0x0017		/* MACIO */
+#define	PCI_PRODUCT_APPLE_UNINORTHETH	0x001e		/* PCI */
+#define	PCI_PRODUCT_APPLE_UNINORTH	0x001f		/* PCI */
+#define	PCI_PRODUCT_APPLE_UNINORTHAGP	0x0020		/* AGP */
+#define	PCI_PRODUCT_APPLE_GMAC	0x0021		/* GMAC */
+#define	PCI_PRODUCT_APPLE_KEYLARGO	0x0022		/* MACIO */
 
 /* AMD products */
 #define	PCI_PRODUCT_AMD_PCNET_PCI	0x2000		/* 79c970 PCnet-PCI LANCE */
@@ -685,9 +694,6 @@
 #define	PCI_PRODUCT_AMD_PBC756_PMC	0x740B		/* 756 Power Management */
 #define	PCI_PRODUCT_AMD_PBC756_USB	0x740C		/* 756 USB Host */
 
-/* Apple products */
-#define	PCI_PRODUCT_APPLE_BANDIT	0x0001		/* PCI */
-
 /* ARC Logic products */
 #define	PCI_PRODUCT_ARC_1000PV	0xa091		/* 1000PV */
 #define	PCI_PRODUCT_ARC_2000PV	0xa099		/* 2000PV */
@@ -1561,6 +1567,10 @@
 /* Winbond Electronics products (PCI products set 2) */
 #define	PCI_PRODUCT_WINBOND2_W89C940	0x1980		/* Linksys EtherPCI */
 
+/* Motorola products */
+#define	PCI_PRODUCT_MOT_MPC105	0x0001		/* MPC105 PPC PCI bridge */
+#define	PCI_PRODUCT_MOT_MPC106	0x0002		/* MPC106 PPC PCI bridge */
+
 /* Yamaha products */
 #define	PCI_PRODUCT_YAMAHA_YMF724E_V	0x0004		/* 724 Audio */
 
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 7f2ed5f87b0..c1def46cca0 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcidevs,v 1.223 2000/03/05 21:42:00 mickey Exp 
+ *		OpenBSD: pcidevs,v 1.224 2000/03/20 07:33:07 rahnds Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -561,6 +561,60 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "PCI",
 	},
 	{
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_GC,
+	    0,
+	    "Apple Computer",
+	    "PCI",
+	},
+	{
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_OHARE,
+	    0,
+	    "Apple Computer",
+	    "PCI",
+	},
+	{
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_HEATHROW,
+	    0,
+	    "Apple Computer",
+	    "MACIO",
+	},
+	{
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_PADDINGTON,
+	    0,
+	    "Apple Computer",
+	    "MACIO",
+	},
+	{
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTHETH,
+	    0,
+	    "Apple Computer",
+	    "PCI",
+	},
+	{
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTH,
+	    0,
+	    "Apple Computer",
+	    "PCI",
+	},
+	{
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTHAGP,
+	    0,
+	    "Apple Computer",
+	    "AGP",
+	},
+	{
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_GMAC,
+	    0,
+	    "Apple Computer",
+	    "GMAC",
+	},
+	{
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_KEYLARGO,
+	    0,
+	    "Apple Computer",
+	    "MACIO",
+	},
+	{
 	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PCNET_PCI,
 	    0,
 	    "AMD",
@@ -621,12 +675,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "756 USB Host",
 	},
 	{
-	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_BANDIT,
-	    0,
-	    "Apple Computer",
-	    "PCI",
-	},
-	{
 	    PCI_VENDOR_ARC, PCI_PRODUCT_ARC_1000PV,
 	    0,
 	    "ARC Logic",
@@ -4353,6 +4401,18 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Linksys EtherPCI",
 	},
 	{
+	    PCI_VENDOR_MOT, PCI_PRODUCT_MOT_MPC105,
+	    0,
+	    "Motorola",
+	    "MPC105 PPC PCI bridge",
+	},
+	{
+	    PCI_VENDOR_MOT, PCI_PRODUCT_MOT_MPC106,
+	    0,
+	    "Motorola",
+	    "MPC106 PPC PCI bridge",
+	},
+	{
 	    PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF724E_V,
 	    0,
 	    "Yamaha",