sync

2 files changed, 51 insertions, 5 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index e1bb283feab..87b65f3fb88 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.32 1998/03/10 08:26:08 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.33 1998/03/10 08:43:50 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -491,6 +491,7 @@
 #define	PCI_VENDOR_STALLION	0x124d		/* Stallion Technologies */
 #define	PCI_VENDOR_LINEARSYS	0x1254		/* Linear Systems */
 #define	PCI_VENDOR_AURORA	0x125c		/* Aurora Technologies */
+#define	PCI_VENDOR_ENSONIQ	0x1274		/* Ensoniq */
 #define	PCI_VENDOR_NETAPP	0x1275		/* Network Appliance */
 #define	PCI_VENDOR_ROCKWELL	0x127a		/* Rockwell Semiconductor Systems */
 #define	PCI_VENDOR_KOFAX	0x1296		/* Kofax Image Products */
@@ -575,6 +576,7 @@
 #define	PCI_PRODUCT_ARC_1000PV	0xa091		/* 1000PV */
 #define	PCI_PRODUCT_ARC_2000PV	0xa099		/* 2000PV */
 #define	PCI_PRODUCT_ARC_2000MT	0xa0a1		/* 2000MT */
+#define	PCI_PRODUCT_ARC_2000MI	0xa0a9		/* 2000MI */
 
 /* ATI products */
 #define	PCI_PRODUCT_ATI_MACH32	0x4158		/* Mach32 */
@@ -811,6 +813,9 @@
 #define	PCI_PRODUCT_NS_DP83810	0x0001		/* DP83810 10/100 Ethernet */
 #define	PCI_PRODUCT_NS_NS87410	0xd001		/* NS87410 */
 
+/* NeoMagic */
+#define	PCI_PRODUCT_NEOMAGIC_NM3160	0x0004		/* NM3160 */
+
 /* NCR/Symbios Logic products */
 #define	PCI_PRODUCT_SYMBIOS_810	0x0001		/* 53c810 */
 #define	PCI_PRODUCT_SYMBIOS_820	0x0002		/* 53c820 */
@@ -871,7 +876,7 @@
 #define	PCI_PRODUCT_S3_AURORA64P	0x8812		/* Aurora64V+ */
 #define	PCI_PRODUCT_S3_TRIO64UVP	0x8814		/* Trio64UV+ */
 #define	PCI_PRODUCT_S3_868	0x8880		/* 868 */
-#define	PCI_PRODUCT_S3_VIRGE_VX	0x883d		/* ViRGE/VX */
+#define	PCI_PRODUCT_S3_VIRGE_VX	0x883d		/* ViRGE VX */
 #define	PCI_PRODUCT_S3_928	0x88b0		/* 86C928 */
 #define	PCI_PRODUCT_S3_864_0	0x88c0		/* 86C864-0 (Vision864) */
 #define	PCI_PRODUCT_S3_864_1	0x88c1		/* 86C864-1 (Vision864) */
@@ -886,11 +891,16 @@
 #define	PCI_PRODUCT_S3_968_2	0x88f2		/* 86C968-2 (Vision968) */
 #define	PCI_PRODUCT_S3_968_3	0x88f3		/* 86C968-3 (Vision968) */
 #define	PCI_PRODUCT_S3_TRIO64V2_DX	0x8901		/* Trio64V2/DX */
+#define	PCI_PRODUCT_S3_PLATO	0x8902		/* Plato */
+#define	PCI_PRODUCT_S3_VIRGE_DX_GX	0x8a01		/* ViRGE DX/GX */
 
 /* SGS Thomson products */
 #define	PCI_PRODUCT_SGSTHOMSON_2000	0x0008		/* STG 2000X */
 #define	PCI_PRODUCT_SGSTHOMSON_1764	0x1746		/* STG 1764X */
 
+/* Sigma Designs */
+#define	PCI_PRODUCT_SIGMA_64GX	0x6401		/* 64GX */
+
 /* Silicon Integrated System products */
 #define	PCI_PRODUCT_SIS_86C201	0x0001		/* 86C201 */
 #define	PCI_PRODUCT_SIS_86C202	0x0002		/* 86C202 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index e6be623dff2..60922270749 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.32 1998/03/10 08:26:08 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.33 1998/03/10 08:43:50 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -255,6 +255,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "2000MT",
 	},
 	{
+	    PCI_VENDOR_ARC, PCI_PRODUCT_ARC_2000MI,
+	    0,
+	    "ARC Logic",
+	    "2000MI",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH32,
 	    0,
 	    "ATI Technologies",
@@ -773,7 +779,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_ENSONIQ, PCI_PRODUCT_ENSONIQ_AUDIOPCI,
 	    0,
-	    "",
+	    "Ensoniq",
 	    "AudioPCI",
 	},
 	{
@@ -1197,6 +1203,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "NS87410",
 	},
 	{
+	    PCI_VENDOR_NEOMAGIC, PCI_PRODUCT_NEOMAGIC_NM3160,
+	    0,
+	    "Neomagic",
+	    "NM3160",
+	},
+	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_810,
 	    0,
 	    "Symbios Logic",
@@ -1410,7 +1422,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_VIRGE_VX,
 	    0,
 	    "S3",
-	    "ViRGE/VX",
+	    "ViRGE VX",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_928,
@@ -1497,6 +1509,18 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Trio64V2/DX",
 	},
 	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_PLATO,
+	    0,
+	    "S3",
+	    "Plato",
+	},
+	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_VIRGE_DX_GX,
+	    0,
+	    "S3",
+	    "ViRGE DX/GX",
+	},
+	{
 	    PCI_VENDOR_SGSTHOMSON, PCI_PRODUCT_SGSTHOMSON_2000,
 	    0,
 	    "SGS Thomson Microelectric",
@@ -1509,6 +1533,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "STG 1764X",
 	},
 	{
+	    PCI_VENDOR_SIGMA, PCI_PRODUCT_SIGMA_64GX,
+	    0,
+	    "Sigma Designs",
+	    "64GX",
+	},
+	{
 	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_86C201,
 	    0,
 	    "Silicon Integrated System",
@@ -4719,6 +4749,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    PCI_VENDOR_ENSONIQ, 0,
+	    PCI_KNOWNDEV_NOPROD,
+	    "Ensoniq",
+	    NULL,
+	},
+	{
 	    PCI_VENDOR_NETAPP, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Network Appliance",