sync

2 files changed, 100 insertions, 14 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index d120b0b5119..451e1f2677c 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.137 1999/05/07 18:31:36 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.138 1999/05/07 20:39:43 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -1065,6 +1065,8 @@
 #define	PCI_PRODUCT_OPTI_82C557	0xc557		/* 82C557 Host */
 #define	PCI_PRODUCT_OPTI_82C558	0xc558		/* 82C558 PCI-ISA */
 #define	PCI_PRODUCT_OPTI_82C621	0xc621		/* 82C621 IDE */
+#define	PCI_PRODUCT_OPTI_82C700	0xc700		/* 82C700 */
+#define	PCI_PRODUCT_OPTI_82C701	0xc701		/* 82C701 */
 #define	PCI_PRODUCT_OPTI_82C822	0xc822		/* 82C822 */
 #define	PCI_PRODUCT_OPTI_RM861HA	0xc861		/* RM861HA */
 
@@ -1093,6 +1095,14 @@
 #define	PCI_PRODUCT_REALTEK_RT8129	0x8129		/* 8129 */
 #define	PCI_PRODUCT_REALTEK_RT8139	0x8139		/* 8139 */
 
++/* RICOH products */
+#define	PCI_PRODUCT_RICOH_RF5C465	0x0465		/* 5C465 PCI-CardBus */
+#define	PCI_PRODUCT_RICOH_RF5C466	0x0466		/* 5C466 PCI-CardBus */
+#define	PCI_PRODUCT_RICOH_RF5C475	0x0475		/* 5C475 PCI-CardBus */
+#define	PCI_PRODUCT_RICOH_RF5C476	0x0476		/* 5C476 PCI-CardBus */
+#define	PCI_PRODUCT_RICOH_RF5C477	0x0477		/* 5C477 PCI-CardBus */
+#define	PCI_PRODUCT_RICOH_RF5C478	0x0478		/* 5C478 PCI-CardBus */
+
 /* S3 products */
 #define	PCI_PRODUCT_S3_VIRGE	0x5631		/* ViRGE */
 #define	PCI_PRODUCT_S3_TRIO32	0x8810		/* Trio32 */
@@ -1181,10 +1191,13 @@
 /* Texas Instruments products */
 #define	PCI_PRODUCT_TI_TLAN	0x0500		/* TLAN */
 #define	PCI_PRODUCT_TI_PCI1130	0xac12		/* PCI1130 PCI-CardBus */
-#define	PCI_PRODUCT_TI_PCI1131	0xac15		/* PCI1131 */
-#define	PCI_PRODUCT_TI_PCI1250	0xac16		/* PCI1250 */
+#define	PCI_PRODUCT_TI_PCI1031	0xac13		/* PCI1031 PCI-pcmcia */
+#define	PCI_PRODUCT_TI_PCI1131	0xac15		/* PCI1131 PCI-CardBus */
+#define	PCI_PRODUCT_TI_PCI1250	0xac16		/* PCI1250 PCI-CardBus */
 #define	PCI_PRODUCT_TI_PCI1220	0xac17		/* PCI1220 PCI-CardBus */
-#define	PCI_PRODUCT_TI_PCI2030	0xac20		/* PCI2030 */
+#define	PCI_PRODUCT_TI_PCI1221	0xac19		/* PCI1221 PCI-CardBus */
+#define	PCI_PRODUCT_TI_PCI1225	0xac1C		/* PCI1225 PCI-CardBus */
+#define	PCI_PRODUCT_TI_PCI2030	0xac20		/* PCI2030 PCI-CardBus */
 #define	PCI_PRODUCT_TI_PERMEDIA	0x3d04		/* 3DLabs Permedia */
 #define	PCI_PRODUCT_TI_PERMEDIA2	0x3d07		/* 3DLabs Permedia 2 */
 
@@ -1194,8 +1207,9 @@
 
 /* Toshiba (2nd ID) products */
 #define	PCI_PRODUCT_TOSHIBA2_THB	0x0601		/* Host-PCI */
-#define	PCI_PRODUCT_TOSHIBA2_TOPIC95	0x060a		/* PCI-CardBus */
-#define	PCI_PRODUCT_TOSHIBA2_TCB	0x060f		/* PCI-CardBus */
+#define	PCI_PRODUCT_TOSHIBA2_ToPIC95	0x0603		/* ToPIC95 CardBus-PCI */
+#define	PCI_PRODUCT_TOSHIBA2_ToPIC95	0x060a		/* ToPIC95B PCI-CardBus */
+#define	PCI_PRODUCT_TOSHIBA2_ToPIC97	0x060f		/* ToPIC97 PCI-CardBus */
 #define	PCI_PRODUCT_TOSHIBA2_TFIRO	0x0701		/* PCI-FIRO */
 
 /* Trident products */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 4428be71cd6..da17fdfaf33 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.137 1999/05/07 18:31:36 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.138 1999/05/07 20:39:43 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -2109,6 +2109,18 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "82C621 IDE",
 	},
 	{
+	    PCI_VENDOR_OPTI, PCI_PRODUCT_OPTI_82C700,
+	    0,
+	    "Opti",
+	    "82C700",
+	},
+	{
+	    PCI_VENDOR_OPTI, PCI_PRODUCT_OPTI_82C701,
+	    0,
+	    "Opti",
+	    "82C701",
+	},
+	{
 	    PCI_VENDOR_OPTI, PCI_PRODUCT_OPTI_82C822,
 	    0,
 	    "Opti",
@@ -2199,6 +2211,42 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "8139",
 	},
 	{
+	    PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C465,
+	    0,
+	    "Ricoh",
+	    "5C465 PCI-CardBus",
+	},
+	{
+	    PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C466,
+	    0,
+	    "Ricoh",
+	    "5C466 PCI-CardBus",
+	},
+	{
+	    PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C475,
+	    0,
+	    "Ricoh",
+	    "5C475 PCI-CardBus",
+	},
+	{
+	    PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C476,
+	    0,
+	    "Ricoh",
+	    "5C476 PCI-CardBus",
+	},
+	{
+	    PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C477,
+	    0,
+	    "Ricoh",
+	    "5C477 PCI-CardBus",
+	},
+	{
+	    PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C478,
+	    0,
+	    "Ricoh",
+	    "5C478 PCI-CardBus",
+	},
+	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_VIRGE,
 	    0,
 	    "S3",
@@ -2589,16 +2637,22 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "PCI1130 PCI-CardBus",
 	},
 	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1031,
+	    0,
+	    "Texas Instruments",
+	    "PCI1031 PCI-pcmcia",
+	},
+	{
 	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1131,
 	    0,
 	    "Texas Instruments",
-	    "PCI1131",
+	    "PCI1131 PCI-CardBus",
 	},
 	{
 	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1250,
 	    0,
 	    "Texas Instruments",
-	    "PCI1250",
+	    "PCI1250 PCI-CardBus",
 	},
 	{
 	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1220,
@@ -2607,10 +2661,22 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "PCI1220 PCI-CardBus",
 	},
 	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1221,
+	    0,
+	    "Texas Instruments",
+	    "PCI1221 PCI-CardBus",
+	},
+	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1225,
+	    0,
+	    "Texas Instruments",
+	    "PCI1225 PCI-CardBus",
+	},
+	{
 	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI2030,
 	    0,
 	    "Texas Instruments",
-	    "PCI2030",
+	    "PCI2030 PCI-CardBus",
 	},
 	{
 	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PERMEDIA,
@@ -2643,16 +2709,22 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Host-PCI",
 	},
 	{
-	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_TOPIC95,
+	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC95,
+	    0,
+	    "Toshiba (2nd ID)",
+	    "ToPIC95 CardBus-PCI",
+	},
+	{
+	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC95,
 	    0,
 	    "Toshiba (2nd ID)",
-	    "PCI-CardBus",
+	    "ToPIC95B PCI-CardBus",
 	},
 	{
-	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_TCB,
+	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC97,
 	    0,
 	    "Toshiba (2nd ID)",
-	    "PCI-CardBus",
+	    "ToPIC97 PCI-CardBus",
 	},
 	{
 	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_TFIRO,