sync

2 files changed, 158 insertions, 17 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 7d72584c46c..b07fef993ff 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.179 1999/09/11 10:10:42 matthieu Exp 
+ *	OpenBSD: pcidevs,v 1.180 1999/09/16 06:38:16 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -646,6 +646,7 @@
 #define	PCI_PRODUCT_ADVSYS_WIDE	0x2300		/* ABP-940UW */
 
 /* Alliance products */
+#define	PCI_PRODUCT_ALLIANCE_AT22	0x6424		/* AT22 */
 #define	PCI_PRODUCT_ALLIANCE_AT24	0x6424		/* AT24 */
 
 /* Alteon products */
@@ -673,7 +674,7 @@
 #define	PCI_PRODUCT_ASIX_AX88140A	0x1400		/* AX88140A 10/100 */
 #define	PCI_PRODUCT_ASIX_AX88141	0x1400		/* AX88141 10/100 */
 
-/* ATI products */
+/* ATI Technologies */
 #define	PCI_PRODUCT_ATI_MACH32	0x4158		/* Mach32 */
 #define	PCI_PRODUCT_ATI_MACH64_CT	0x4354		/* Mach64 CT */
 #define	PCI_PRODUCT_ATI_MACH64_CX	0x4358		/* Mach64 CX */
@@ -789,7 +790,6 @@
 #define	PCI_PRODUCT_COMPAQ_QVISION_V2	0x3034		/* QVision */
 #define	PCI_PRODUCT_COMPAQ_TRIFLEX4	0x4000		/* Triflex Host-PCI */
 #define	PCI_PRODUCT_COMPAQ_USB	0x7020		/* USB */
-
 #define	PCI_PRODUCT_COMPAQ_FXP	0xa0f0		/* Netelligent FXP */
 #define	PCI_PRODUCT_COMPAQ_N100TX	0xae32		/* Netelligent 10/100 TX */
 #define	PCI_PRODUCT_COMPAQ_Nunknown	0xae33		/* Netelligent unknown */
@@ -951,6 +951,20 @@
 #define	PCI_PRODUCT_INTEL_82380AB	0x123c		/* 82380AB Mobile PCI-to-ISA (MISA) */
 #define	PCI_PRODUCT_INTEL_82380FB	0x124b		/* 82380FB Mobile PCI-to-PCI (MPCI2) */
 #define	PCI_PRODUCT_INTEL_82439HX	0x1250		/* 82439HX (Triton II) TXC Host */
+#define	PCI_PRODUCT_INTEL_82801AA_LPC	0x2410		/* 82801AA LPC Interface */
+#define	PCI_PRODUCT_INTEL_82801AA_IDE	0x2411		/* 82801AA IDE */
+#define	PCI_PRODUCT_INTEL_82801AA_USB	0x2412		/* 82801AA USB */
+#define	PCI_PRODUCT_INTEL_82801AA_SMB	0x2413		/* 82801AA SMBus */
+#define	PCI_PRODUCT_INTEL_82801AA_ACA	0x2415		/* 82801AA AC-97 Audio */
+#define	PCI_PRODUCT_INTEL_82801AA_ACM	0x2416		/* 82801AA AC-97 Modem */
+#define	PCI_PRODUCT_INTEL_82801AA_HPB	0x2418		/* 82801AA Hub-to-PCI */
+#define	PCI_PRODUCT_INTEL_82801AB_LPC	0x2420		/* 82801AB LPC */
+#define	PCI_PRODUCT_INTEL_82801AB_IDE	0x2421		/* 82801AB IDE */
+#define	PCI_PRODUCT_INTEL_82801AB_USB	0x2422		/* 82801AB USB */
+#define	PCI_PRODUCT_INTEL_82801AB_SMB	0x2423		/* 82801AB SMBus */
+#define	PCI_PRODUCT_INTEL_82801AB_ACA	0x2425		/* 82801AB AC-97 Audio */
+#define	PCI_PRODUCT_INTEL_82801AB_ACM	0x2426		/* 82801AB AC-97 Modem */
+#define	PCI_PRODUCT_INTEL_82801AB_HPB	0x2428		/* 82801AB Hub-to-PCI */
 #define	PCI_PRODUCT_INTEL_82371SB	0x7000		/* 82371SB (Triton II) PCI-ISA */
 #define	PCI_PRODUCT_INTEL_82371SB_IDE	0x7010		/* 82371SB (Triton II) IDE */
 #define	PCI_PRODUCT_INTEL_82371USB	0x7020		/* 82371SB (Triton II) USB */
@@ -960,6 +974,9 @@
 #define	PCI_PRODUCT_INTEL_82371AB_IDE	0x7111		/* 82371AB IDE (PIIX4) */
 #define	PCI_PRODUCT_INTEL_82371AB_USB	0x7112		/* 82371AB USB (PIIX4) */
 #define	PCI_PRODUCT_INTEL_82371AB_PMC	0x7113		/* 82371AB Power Management (PIIX4) */
+#define	PCI_PRODUCT_INTEL_82810_MCH	0x7120		/* 82810 Memory Hub */
+#define	PCI_PRODUCT_INTEL_82810_GC	0x7121		/* 82810 Graphics */
+#define	PCI_PRODUCT_INTEL_82810_DC100_GC	0x7123		/* 82810-DC100 Graphics */
 #define	PCI_PRODUCT_INTEL_82443LX	0x7180		/* 82443LX PCI-AGP (PAC) */
 #define	PCI_PRODUCT_INTEL_82443LX_AGP	0x7181		/* 82443LX AGP (PAC) */
 #define	PCI_PRODUCT_INTEL_82443BX	0x7190		/* 82443BX PCI-AGP (PAC) */
@@ -1012,13 +1029,17 @@
 #define	PCI_PRODUCT_MATROX_MYSTIQUE_220	0x051A		/* MGA 1064SG 220MHz */
 #define	PCI_PRODUCT_MATROX_MILLENNIUM_II	0x051B		/* MGA Millennium II 2164W */
 #define	PCI_PRODUCT_MATROX_MILLENNIUM_IIAGP	0x051F		/* MGA Millennium II 2164WA-B AGP */
-#define	PCI_PRODUCT_MATROX_MILL_II_G200_PCI	0x0520		/* MGA Millennium G200 PCI */
-#define	PCI_PRODUCT_MATROX_MILL_II_G200_AGP	0x0521		/* MGA Millennium G200 AGP */
+#define	PCI_PRODUCT_MATROX_MILL_II_G200_PCI	0x0520		/* MGA G200 PCI */
+#define	PCI_PRODUCT_MATROX_MILL_II_G200_AGP	0x0521		/* MGA G200 AGP */
+#define	PCI_PRODUCT_MATROX_MILL_II_G400_AGP	0x0525		/* MGA G400 AGP */
 #define	PCI_PRODUCT_MATROX_IMPRESSION	0x0d10		/* MGA Impression */
-#define	PCI_PRODUCT_MATROX_PRODUCTIVA_PCI	0x1000		/* MGA Productiva G100 PCI */
-#define	PCI_PRODUCT_MATROX_PRODUCTIVA_AGP	0x1001		/* MGA Productiva G100 AGP */
+#define	PCI_PRODUCT_MATROX_PRODUCTIVA_PCI	0x1000		/* MGA G100 PCI */
+#define	PCI_PRODUCT_MATROX_PRODUCTIVA_AGP	0x1001		/* MGA G100 AGP */
 #define	PCI_PRODUCT_MATROX_MYSTIQUE	0x102B		/* MGA 1064SG */
 
+/* Motorola products */
+#define	PCI_PRODUCT_MOT_MPC106	0x0002		/* MPC106 Host-PCI */
+
 /* Mylex products */
 #define	PCI_PRODUCT_MYLEX_960P	0x0001		/* DAC960P RAID */
 
@@ -1030,7 +1051,7 @@
 #define	PCI_PRODUCT_NS_NS87410	0xd001		/* NS87410 */
 
 /* NEC */
-#define	PCI_PRODUCT_NEC_XXX	0x0035		/* XXX USB */
+#define	PCI_PRODUCT_NEC_USB	0x0035		/* USB */
 #define	PCI_PRODUCT_NEC_POWERVR2	0x0046		/* PowerVR PCX2 */
 
 /* NeoMagic */
@@ -1253,7 +1274,7 @@
 #define	PCI_PRODUCT_TOSHIBA2_ToPIC95	0x0603		/* ToPIC95 CardBus-PCI */
 #define	PCI_PRODUCT_TOSHIBA2_ToPIC95B	0x060a		/* ToPIC95B PCI-CardBus */
 #define	PCI_PRODUCT_TOSHIBA2_ToPIC97	0x060f		/* ToPIC97 PCI-CardBus */
-#define	PCI_PRODUCT_TOSHIBA2_TFIRO	0x0701		/* PCI-FIRO */
+#define	PCI_PRODUCT_TOSHIBA2_TFIRO	0x0701		/* Fast Infrared Type O */
 
 /* Trident products */
 #define	PCI_PRODUCT_TRIDENT_4DWAVE_DX	0x2000		/* 4DWAVE DX */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index c65731fdb5c..0e23ec6445b 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.179 1999/09/11 10:10:42 matthieu Exp 
+ *	OpenBSD: pcidevs,v 1.180 1999/09/16 06:38:16 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -489,6 +489,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "ABP-940UW",
 	},
 	{
+	    PCI_VENDOR_ALLIANCE, PCI_PRODUCT_ALLIANCE_AT22,
+	    0,
+	    "Alliance Semiconductor",
+	    "AT22",
+	},
+	{
 	    PCI_VENDOR_ALLIANCE, PCI_PRODUCT_ALLIANCE_AT24,
 	    0,
 	    "Alliance Semiconductor",
@@ -1719,6 +1725,90 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "82439HX (Triton II) TXC Host",
 	},
 	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_LPC,
+	    0,
+	    "Intel",
+	    "82801AA LPC Interface",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_IDE,
+	    0,
+	    "Intel",
+	    "82801AA IDE",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_USB,
+	    0,
+	    "Intel",
+	    "82801AA USB",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_SMB,
+	    0,
+	    "Intel",
+	    "82801AA SMBus",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_ACA,
+	    0,
+	    "Intel",
+	    "82801AA AC-97 Audio",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_ACM,
+	    0,
+	    "Intel",
+	    "82801AA AC-97 Modem",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_HPB,
+	    0,
+	    "Intel",
+	    "82801AA Hub-to-PCI",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AB_LPC,
+	    0,
+	    "Intel",
+	    "82801AB LPC",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AB_IDE,
+	    0,
+	    "Intel",
+	    "82801AB IDE",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AB_USB,
+	    0,
+	    "Intel",
+	    "82801AB USB",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AB_SMB,
+	    0,
+	    "Intel",
+	    "82801AB SMBus",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AB_ACA,
+	    0,
+	    "Intel",
+	    "82801AB AC-97 Audio",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AB_ACM,
+	    0,
+	    "Intel",
+	    "82801AB AC-97 Modem",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AB_HPB,
+	    0,
+	    "Intel",
+	    "82801AB Hub-to-PCI",
+	},
+	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371SB,
 	    0,
 	    "Intel",
@@ -1773,6 +1863,24 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "82371AB Power Management (PIIX4)",
 	},
 	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_MCH,
+	    0,
+	    "Intel",
+	    "82810 Memory Hub",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_GC,
+	    0,
+	    "Intel",
+	    "82810 Graphics",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_DC100_GC,
+	    0,
+	    "Intel",
+	    "82810-DC100 Graphics",
+	},
+	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443LX,
 	    0,
 	    "Intel",
@@ -1956,13 +2064,19 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G200_PCI,
 	    0,
 	    "Matrox",
-	    "MGA Millennium G200 PCI",
+	    "MGA G200 PCI",
 	},
 	{
 	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G200_AGP,
 	    0,
 	    "Matrox",
-	    "MGA Millennium G200 AGP",
+	    "MGA G200 AGP",
+	},
+	{
+	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G400_AGP,
+	    0,
+	    "Matrox",
+	    "MGA G400 AGP",
 	},
 	{
 	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_IMPRESSION,
@@ -1974,13 +2088,13 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_PRODUCTIVA_PCI,
 	    0,
 	    "Matrox",
-	    "MGA Productiva G100 PCI",
+	    "MGA G100 PCI",
 	},
 	{
 	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_PRODUCTIVA_AGP,
 	    0,
 	    "Matrox",
-	    "MGA Productiva G100 AGP",
+	    "MGA G100 AGP",
 	},
 	{
 	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MYSTIQUE,
@@ -1989,6 +2103,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "MGA 1064SG",
 	},
 	{
+	    PCI_VENDOR_MOT, PCI_PRODUCT_MOT_MPC106,
+	    0,
+	    "Motorola",
+	    "MPC106 Host-PCI",
+	},
+	{
 	    PCI_VENDOR_MYLEX, PCI_PRODUCT_MYLEX_960P,
 	    0,
 	    "Mylex",
@@ -2013,10 +2133,10 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "NS87410",
 	},
 	{
-	    PCI_VENDOR_NEC, PCI_PRODUCT_NEC_XXX,
+	    PCI_VENDOR_NEC, PCI_PRODUCT_NEC_USB,
 	    0,
 	    "NEC",
-	    "XXX USB",
+	    "USB",
 	},
 	{
 	    PCI_VENDOR_NEC, PCI_PRODUCT_NEC_POWERVR2,
@@ -2934,7 +3054,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_TFIRO,
 	    0,
 	    "Toshiba (2nd ID)",
-	    "PCI-FIRO",
+	    "Fast Infrared Type O",
 	},
 	{
 	    PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_4DWAVE_DX,