regen

2 files changed, 48 insertions, 8 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 60addc3f2a3..29b9a2cc83e 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.1033 2006/03/06 22:06:23 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.1034 2006/03/07 07:21:56 jsg Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -731,11 +731,13 @@
 #define	PCI_PRODUCT_ATI_FIREGL_V3200	0x3154		/* FireGL V3200 */
 #define	PCI_PRODUCT_ATI_RADEON_X600_RV380	0x3e50		/* Radeon X600 (RV380) */
 #define	PCI_PRODUCT_ATI_RADEON_X600_RV380_S	0x3e70		/* Radeon X600 (RV380) Sec */
+#define	PCI_PRODUCT_ATI_RADEON_9500PRO	0x4144		/* Radeon 9500 Pro */
 #define	PCI_PRODUCT_ATI_RADEON_9600PRO	0x4150		/* Radeon 9600 Pro */
 #define	PCI_PRODUCT_ATI_RADEON_9600LE	0x4151		/* Radeon 9600 LE */
 #define	PCI_PRODUCT_ATI_RADEON_9600XT	0x4152		/* Radeon 9600 XT */
 #define	PCI_PRODUCT_ATI_RADEON_9550	0x4153		/* Radeon 9550 */
 #define	PCI_PRODUCT_ATI_MACH32	0x4158		/* Mach32 */
+#define	PCI_PRODUCT_ATI_RADEON_9500PRO_S	0x4164		/* Radeon 9500 Pro Sec */
 #define	PCI_PRODUCT_ATI_RADEON_9600PRO_S	0x4170		/* Radeon 9600 Pro Sec */
 #define	PCI_PRODUCT_ATI_RADEON_9600LE_S	0x4171		/* Radeon 9600 LE Sec */
 #define	PCI_PRODUCT_ATI_RADEON_9600XT_S	0x4172		/* Radeon 9600 XT Sec */
@@ -2374,8 +2376,8 @@
 #define	PCI_PRODUCT_NVIDIA_NFORCE4_ISA2	0x0051		/* nForce4 ISA */
 #define	PCI_PRODUCT_NVIDIA_NFORCE4_SMB	0x0052		/* nForce4 SMBus */
 #define	PCI_PRODUCT_NVIDIA_NFORCE4_ATA133	0x0053		/* nForce4 IDE */
-#define	PCI_PRODUCT_NVIDIA_NFORCE4_SATA1	0x0054		/* nForce4 SATA 1 */
-#define	PCI_PRODUCT_NVIDIA_NFORCE4_SATA2	0x0055		/* nForce4 SATA 2 */
+#define	PCI_PRODUCT_NVIDIA_NFORCE4_SATA1	0x0054		/* nForce4 SATA */
+#define	PCI_PRODUCT_NVIDIA_NFORCE4_SATA2	0x0055		/* nForce4 SATA */
 #define	PCI_PRODUCT_NVIDIA_CK804_LAN1	0x0056		/* CK804 LAN */
 #define	PCI_PRODUCT_NVIDIA_CK804_LAN2	0x0057		/* CK804 LAN */
 #define	PCI_PRODUCT_NVIDIA_NFORCE4_AC	0x0059		/* nForce4 AC97 */
@@ -3225,6 +3227,7 @@
 /* VIA Technologies products */
 #define	PCI_PRODUCT_VIATECH_K8M800_0	0x0204		/* K8M800 Host */
 #define	PCI_PRODUCT_VIATECH_K8T890_0	0x0238		/* K8T890 Host */
+#define	PCI_PRODUCT_VIATECH_PT880_0	0x0258		/* PT880 Host */
 #define	PCI_PRODUCT_VIATECH_PM800_AGP	0x0259		/* PM800 AGP */
 #define	PCI_PRODUCT_VIATECH_KT880_AGP	0x0269		/* KT880 AGP */
 #define	PCI_PRODUCT_VIATECH_K8HTB_0	0x0282		/* K8HTB Host */
@@ -3251,6 +3254,7 @@
 #define	PCI_PRODUCT_VIATECH_VT82C570MV	0x1006		/* VT82C570M ISA */
 #define	PCI_PRODUCT_VIATECH_K8M800_1	0x1204		/* K8M800 Host */
 #define	PCI_PRODUCT_VIATECH_K8T890_1	0x1238		/* K8T890 Host */
+#define	PCI_PRODUCT_VIATECH_PT880_1	0x1258		/* PT880 Host */
 #define	PCI_PRODUCT_VIATECH_PM800_ERRS	0x1259		/* PM800 Errors */
 #define	PCI_PRODUCT_VIATECH_KT880_1	0x1269		/* KT880 Host */
 #define	PCI_PRODUCT_VIATECH_K8HTB_1	0x1282		/* K8HTB Host */
@@ -3258,6 +3262,7 @@
 #define	PCI_PRODUCT_VIATECH_VT82C1595	0x1595		/* VT82C1595 PCI */
 #define	PCI_PRODUCT_VIATECH_K8M800_2	0x2204		/* K8M800 Host */
 #define	PCI_PRODUCT_VIATECH_K8T890_2	0x2238		/* K8T890 Host */
+#define	PCI_PRODUCT_VIATECH_PT880_2	0x2258		/* PT880 Host */
 #define	PCI_PRODUCT_VIATECH_PM800	0x2259		/* PM800 Host */
 #define	PCI_PRODUCT_VIATECH_KT880_2	0x2269		/* KT880 Host */
 #define	PCI_PRODUCT_VIATECH_K8HTB_2	0x2282		/* K8HTB Host */
@@ -3307,6 +3312,7 @@
 #define	PCI_PRODUCT_VIATECH_VT8237_ISA	0x3227		/* VT8237 ISA */
 #define	PCI_PRODUCT_VIATECH_K8T890_3	0x3238		/* K8T890 Host */
 #define	PCI_PRODUCT_VIATECH_VT6421_SATA	0x3249		/* VT6421 SATA */
+#define	PCI_PRODUCT_VIATECH_PT880_3	0x3258		/* PT880 Host */
 #define	PCI_PRODUCT_VIATECH_PM800_DRAM	0x3259		/* PM800 DRAM */
 #define	PCI_PRODUCT_VIATECH_KT880_3	0x3269		/* KT880 Host */
 #define	PCI_PRODUCT_VIATECH_K8HTB_3	0x3282		/* K8HTB Host */
@@ -3314,6 +3320,7 @@
 #define	PCI_PRODUCT_VIATECH_VT8251_SATA	0x3349		/* VT8251 SATA */
 #define	PCI_PRODUCT_VIATECH_K8M800_4	0x4204		/* K8M800 Host */
 #define	PCI_PRODUCT_VIATECH_K8T890_4	0x4238		/* K8T890 Host */
+#define	PCI_PRODUCT_VIATECH_PT880_4	0x4258		/* PT880 Host */
 #define	PCI_PRODUCT_VIATECH_PM800_PMC	0x4259		/* PM800 PMC */
 #define	PCI_PRODUCT_VIATECH_KT880_4	0x4269		/* KT880 Host */
 #define	PCI_PRODUCT_VIATECH_K8HTB_4	0x4282		/* K8HTB Host */
@@ -3322,6 +3329,7 @@
 #define	PCI_PRODUCT_VIATECH_K8M800_7	0x7204		/* K8M800 Host */
 #define	PCI_PRODUCT_VIATECH_VT8378_VGA	0x7205		/* VT8378 VGA */
 #define	PCI_PRODUCT_VIATECH_K8T890_7	0x7238		/* K8T890 Host */
+#define	PCI_PRODUCT_VIATECH_PT880_7	0x7258		/* PT880 Host */
 #define	PCI_PRODUCT_VIATECH_PM800_PCI	0x7259		/* PM800 PCI */
 #define	PCI_PRODUCT_VIATECH_KT880_7	0x7269		/* KT880 Host */
 #define	PCI_PRODUCT_VIATECH_K8HTB_7	0x7282		/* K8HTB Host */
@@ -3340,7 +3348,7 @@
 #define	PCI_PRODUCT_VIATECH_VT8361_AGP	0xb112		/* VT8361 AGP */
 #define	PCI_PRODUCT_VIATECH_VT8235_AGP	0xb168		/* VT8235 AGP */
 #define	PCI_PRODUCT_VIATECH_K8HTB_AGP	0xb188		/* K8HTB AGP */
-#define	PCI_PRODUCT_VIATECH_VT8377_AGP	0xb198		/* VT8377 PCI-PCI */
+#define	PCI_PRODUCT_VIATECH_VT8377_AGP	0xb198		/* VT8377 AGP */
 #define	PCI_PRODUCT_VIATECH_K8T890_PPB_C	0xc238		/* K8T890 PCI-PCI */
 #define	PCI_PRODUCT_VIATECH_K8T890_PPB_D	0xd238		/* K8T890 PCI-PCI */
 #define	PCI_PRODUCT_VIATECH_K8T890_PPB_E	0xe238		/* K8T890 PCI-PCI */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index e26642f9f02..09e3dca7535 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.1033 2006/03/06 22:06:23 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.1034 2006/03/07 07:21:56 jsg Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -1475,6 +1475,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Radeon X600 (RV380) Sec",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9500PRO,
+	    "Radeon 9500 Pro",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9600PRO,
 	    "Radeon 9600 Pro",
 	},
@@ -1495,6 +1499,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Mach32",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9500PRO_S,
+	    "Radeon 9500 Pro Sec",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9600PRO_S,
 	    "Radeon 9600 Pro Sec",
 	},
@@ -7032,11 +7040,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_SATA1,
-	    "nForce4 SATA 1",
+	    "nForce4 SATA",
 	},
 	{
 	    PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_SATA2,
-	    "nForce4 SATA 2",
+	    "nForce4 SATA",
 	},
 	{
 	    PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_CK804_LAN1,
@@ -9907,6 +9915,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "K8T890 Host",
 	},
 	{
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_PT880_0,
+	    "PT880 Host",
+	},
+	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_PM800_AGP,
 	    "PM800 AGP",
 	},
@@ -10011,6 +10023,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "K8T890 Host",
 	},
 	{
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_PT880_1,
+	    "PT880 Host",
+	},
+	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_PM800_ERRS,
 	    "PM800 Errors",
 	},
@@ -10039,6 +10055,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "K8T890 Host",
 	},
 	{
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_PT880_2,
+	    "PT880 Host",
+	},
+	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_PM800,
 	    "PM800 Host",
 	},
@@ -10235,6 +10255,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "VT6421 SATA",
 	},
 	{
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_PT880_3,
+	    "PT880 Host",
+	},
+	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_PM800_DRAM,
 	    "PM800 DRAM",
 	},
@@ -10263,6 +10287,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "K8T890 Host",
 	},
 	{
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_PT880_4,
+	    "PT880 Host",
+	},
+	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_PM800_PMC,
 	    "PM800 PMC",
 	},
@@ -10295,6 +10323,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "K8T890 Host",
 	},
 	{
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_PT880_7,
+	    "PT880 Host",
+	},
+	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_PM800_PCI,
 	    "PM800 PCI",
 	},
@@ -10368,7 +10400,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8377_AGP,
-	    "VT8377 PCI-PCI",
+	    "VT8377 AGP",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_K8T890_PPB_C,