sync

2 files changed, 100 insertions, 33 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index ef043f711c9..37000296828 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.300 2000/08/06 22:30:45 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.301 2000/08/08 17:01:09 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -150,7 +150,7 @@
 #define	PCI_VENDOR_DIVERSIFIED	0x1068		/* Diversified Technology */
 #define	PCI_VENDOR_MYLEX	0x1069		/* Mylex */
 #define	PCI_VENDOR_ATEN	0x106a		/* Aten Research */
-#define	PCI_VENDOR_APPLE	0x106b		/* Apple Computer */
+#define	PCI_VENDOR_APPLE	0x106b		/* Apple */
 #define	PCI_VENDOR_HYUNDAI	0x106c		/* Hyundai */
 #define	PCI_VENDOR_SEQUENT	0x106d		/* Sequent */
 #define	PCI_VENDOR_DFI	0x106e		/* DFI */
@@ -510,6 +510,7 @@
 #define	PCI_VENDOR_KOFAX	0x1296		/* Kofax Image Products */
 #define	PCI_VENDOR_RISCOM	0x12aa		/* RISCom */
 #define	PCI_VENDOR_ALTEON	0x12ae		/* Alteon */
+#define	PCI_VENDOR_USR	0x12b9		/* US Robotics */
 #define	PCI_VENDOR_PICTUREEL	0x12c5		/* Picture Elements */
 #define	PCI_VENDOR_STB2	0x12d2		/* NVidia/SGS-Thomson */
 #define	PCI_VENDOR_AUREAL	0x12eb		/* Aureal */
@@ -522,6 +523,7 @@
 #define	PCI_VENDOR_THREEWARE	0x13c1		/* 3ware */
 #define	PCI_VENDOR_SUNDANCE	0x13f0		/* Sundance */
 #define	PCI_VENDOR_CMI	0x13f6		/* C-Media Electronics Inc. */
+#define	PCI_VENDOR_LAVA	0x1407		/* Lava */
 #define	PCI_VENDOR_INVERTEX	0x14e1		/* Invertex */
 #define	PCI_VENDOR_AIRONET	0x14b9		/* Aironet */
 #define	PCI_VENDOR_BROADCOM	0x14e4		/* Broadcom */
@@ -710,17 +712,17 @@
 #define	PCI_PRODUCT_AMD_PBC756_USB	0x740C		/* 756 USB Host */
 
 /* 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_BANDIT	0x0001		/* Bandit */
+#define	PCI_PRODUCT_APPLE_GC	0x0002		/* GC */
+#define	PCI_PRODUCT_APPLE_OHARE	0x0007		/* OHare */
+#define	PCI_PRODUCT_APPLE_HEATHROW	0x0010		/* Heathrow */
+#define	PCI_PRODUCT_APPLE_PADDINGTON	0x0017		/* Paddington */
+#define	PCI_PRODUCT_APPLE_UNINORTHETH	0x001e		/* Uni-North Ethernet */
+#define	PCI_PRODUCT_APPLE_UNINORTH	0x001f		/* Uni-North */
 #define	PCI_PRODUCT_APPLE_USB	0x0019		/* USB */
-#define	PCI_PRODUCT_APPLE_UNINORTHAGP	0x0020		/* AGP */
+#define	PCI_PRODUCT_APPLE_UNINORTHAGP	0x0020		/* Uni-North AGP */
 #define	PCI_PRODUCT_APPLE_GMAC	0x0021		/* GMAC */
-#define	PCI_PRODUCT_APPLE_KEYLARGO	0x0022		/* MACIO */
+#define	PCI_PRODUCT_APPLE_KEYLARGO	0x0022		/* Keylargo */
 
 /* ARC Logic products */
 #define	PCI_PRODUCT_ARC_1000PV	0xa091		/* 1000PV */
@@ -1119,6 +1121,13 @@
 #define	PCI_PRODUCT_LMC_SSI	0x0005		/* SSI */
 #define	PCI_PRODUCT_LMC_DS1	0x0006		/* DS1 */
 
+/* Lava */
+#define	PCI_PRODUCT_LAVA_PARALLEL	0x8000		/* Parallel */
+#define	PCI_PRODUCT_LAVA_PARALLEL2	0x8001		/* Dual Parallel */
+#define	PCI_PRODUCT_LAVA_PARALLEL2A	0x8002		/* Dual Parallel */
+#define	PCI_PRODUCT_LAVA_PARALLELB	0x8003		/* Dual Parallel B */
+#define	PCI_PRODUCT_LAVA_SERIAL	0x0100		/* Dual Serial */
+
 /* LeadTek Research */
 #define	PCI_PRODUCT_LEADTEK_S3_805	0x0000		/* S3 805 */
 
@@ -1200,6 +1209,7 @@
 #define	PCI_PRODUCT_NEC_USB	0x0035		/* USB */
 #define	PCI_PRODUCT_NEC_POWERVR2	0x0046		/* PowerVR PCX2 */
 #define	PCI_PRODUCT_NEC_MARTH	0x0074		/* I/O */
+#define	PCI_PRODUCT_NEC_PKUG	0x007d		/* I/O */
 
 /* NeoMagic */
 #define	PCI_PRODUCT_NEOMAGIC_NM2070	0x0001		/* Magicgraph NM2070 */
@@ -1595,6 +1605,9 @@
 /* ULSI Systems products */
 #define	PCI_PRODUCT_ULSI_US201	0x0201		/* US201 */
 
+/* US Rebotics */
+#define	PCI_PRODUCT_USR_3CP5610	0x1008		/* 3CP5610 */
+
 /* V3 Semiconductor products */
 #define	PCI_PRODUCT_V3_V292PBC	0x0292		/* V292PBC AMD290x0 Host-PCI */
 #define	PCI_PRODUCT_V3_V960PBC	0x0960		/* V960PBC i960 Host-PCI */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 1fb167fae78..6f6efc161e9 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.300 2000/08/06 22:30:45 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.301 2000/08/08 17:01:09 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -719,68 +719,68 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_BANDIT,
 	    0,
-	    "Apple Computer",
-	    "PCI",
+	    "Apple",
+	    "Bandit",
 	},
 	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_GC,
 	    0,
-	    "Apple Computer",
-	    "PCI",
+	    "Apple",
+	    "GC",
 	},
 	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_OHARE,
 	    0,
-	    "Apple Computer",
-	    "PCI",
+	    "Apple",
+	    "OHare",
 	},
 	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_HEATHROW,
 	    0,
-	    "Apple Computer",
-	    "MACIO",
+	    "Apple",
+	    "Heathrow",
 	},
 	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_PADDINGTON,
 	    0,
-	    "Apple Computer",
-	    "MACIO",
+	    "Apple",
+	    "Paddington",
 	},
 	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTHETH,
 	    0,
-	    "Apple Computer",
-	    "PCI",
+	    "Apple",
+	    "Uni-North Ethernet",
 	},
 	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTH,
 	    0,
-	    "Apple Computer",
-	    "PCI",
+	    "Apple",
+	    "Uni-North",
 	},
 	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_USB,
 	    0,
-	    "Apple Computer",
+	    "Apple",
 	    "USB",
 	},
 	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTHAGP,
 	    0,
-	    "Apple Computer",
-	    "AGP",
+	    "Apple",
+	    "Uni-North AGP",
 	},
 	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_GMAC,
 	    0,
-	    "Apple Computer",
+	    "Apple",
 	    "GMAC",
 	},
 	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_KEYLARGO,
 	    0,
-	    "Apple Computer",
-	    "MACIO",
+	    "Apple",
+	    "Keylargo",
 	},
 	{
 	    PCI_VENDOR_ARC, PCI_PRODUCT_ARC_1000PV,
@@ -2481,6 +2481,36 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "DS1",
 	},
 	{
+	    PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_PARALLEL,
+	    0,
+	    "Lava",
+	    "Parallel",
+	},
+	{
+	    PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_PARALLEL2,
+	    0,
+	    "Lava",
+	    "Dual Parallel",
+	},
+	{
+	    PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_PARALLEL2A,
+	    0,
+	    "Lava",
+	    "Dual Parallel",
+	},
+	{
+	    PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_PARALLELB,
+	    0,
+	    "Lava",
+	    "Dual Parallel B",
+	},
+	{
+	    PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_SERIAL,
+	    0,
+	    "Lava",
+	    "Dual Serial",
+	},
+	{
 	    PCI_VENDOR_LEADTEK, PCI_PRODUCT_LEADTEK_S3_805,
 	    0,
 	    "LeadTek Research",
@@ -2829,6 +2859,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "I/O",
 	},
 	{
+	    PCI_VENDOR_NEC, PCI_PRODUCT_NEC_PKUG,
+	    0,
+	    "NEC",
+	    "I/O",
+	},
+	{
 	    PCI_VENDOR_NEOMAGIC, PCI_PRODUCT_NEOMAGIC_NM2070,
 	    0,
 	    "Neomagic",
@@ -4569,6 +4605,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "US201",
 	},
 	{
+	    PCI_VENDOR_USR, PCI_PRODUCT_USR_3CP5610,
+	    0,
+	    "US Robotics",
+	    "3CP5610",
+	},
+	{
 	    PCI_VENDOR_V3, PCI_PRODUCT_V3_V292PBC,
 	    0,
 	    "V3 Semiconductor",
@@ -5873,7 +5915,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_APPLE, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Apple Computer",
+	    "Apple",
 	    NULL,
 	},
 	{
@@ -8031,6 +8073,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    PCI_VENDOR_USR, 0,
+	    PCI_KNOWNDEV_NOPROD,
+	    "US Robotics",
+	    NULL,
+	},
+	{
 	    PCI_VENDOR_PICTUREEL, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Picture Elements",
@@ -8103,6 +8151,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    PCI_VENDOR_LAVA, 0,
+	    PCI_KNOWNDEV_NOPROD,
+	    "Lava",
+	    NULL,
+	},
+	{
 	    PCI_VENDOR_INVERTEX, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Invertex",