From: deraadt <deraadt@openbsd.org>
Date: Tue, 28 Mar 2000 00:02:13 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f44c842df2d8e4fdbd34989aa7401e323057b48b;p=openbsd

sync
---

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index dd01b207ae6..a8f8765c768 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.231 2000/03/27 19:36:04 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.232 2000/03/28 00:02:08 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -1481,6 +1481,7 @@
 #define	PCI_PRODUCT_VIATECH_VT82C595	0x0595		/* VT82C595 (Apollo VP2) Host-PCI */
 #define	PCI_PRODUCT_VIATECH_VT82C597PCI	0x0597		/* VT82C597 (Apollo VP3) Host-PCI */
 #define	PCI_PRODUCT_VIATECH_VT82C598PCI	0x0598		/* VT82C598 (Apollo MVP3) Host-PCI */
+#define	PCI_PRODUCT_VIATECH_VT82C686	0x0686		/* VT82C686 PCI-ISA */
 #define	PCI_PRODUCT_VIATECH_VT86C926	0x0926		/* VT86C926 Amazon */
 #define	PCI_PRODUCT_VIATECH_VT82C570M	0x1000		/* VT82C570M (Apollo) Host-PCI */
 #define	PCI_PRODUCT_VIATECH_VT82C570MV	0x1006		/* VT82C570M (Apollo) PCI-ISA */
@@ -1588,6 +1589,9 @@
 
 /* Yamaha products */
 #define	PCI_PRODUCT_YAMAHA_YMF724E_V	0x0004		/* 724 Audio */
+#define	PCI_PRODUCT_YAMAHA_YMF744	0x0010		/* DS-1S Audio */
+#define	PCI_PRODUCT_YAMAHA_YMF724	0x000d		/* DS-1 Audio */
+#define	PCI_PRODUCT_YAMAHA_YMF740	0x000d		/* DS-1L Audio */
 
 /* Zeinet products */
 #define	PCI_PRODUCT_ZEINET_1221	0x0001		/* 1221 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index ce9996747fe..cfab96cf158 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.231 2000/03/27 19:36:04 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.232 2000/03/28 00:02:08 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -4034,6 +4034,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "VIA",
 	    "VT82C598 (Apollo MVP3) Host-PCI",
 	},
+	{
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686,
+	    0,
+	    "VIA",
+	    "VT82C686 PCI-ISA",
+	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT86C926,
 	    0,
@@ -4508,6 +4514,24 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Yamaha",
 	    "724 Audio",
 	},
+	{
+	    PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF744,
+	    0,
+	    "Yamaha",
+	    "DS-1S Audio",
+	},
+	{
+	    PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF724,
+	    0,
+	    "Yamaha",
+	    "DS-1 Audio",
+	},
+	{
+	    PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF740,
+	    0,
+	    "Yamaha",
+	    "DS-1L Audio",
+	},
 	{
 	    PCI_VENDOR_ZEINET, PCI_PRODUCT_ZEINET_1221,
 	    0,