regen

2 files changed, 56 insertions, 26 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 8c8807a50e6..bfa7ea3c942 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.1368 2008/05/24 05:44:35 brad Exp 
+ *	OpenBSD: pcidevs,v 1.1369 2008/05/24 06:00:56 brad Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -845,19 +845,25 @@
 #define	PCI_PRODUCT_ATI_RADEON_IGP320M	0x4336		/* Radeon IGP 320M */
 #define	PCI_PRODUCT_ATI_MOBILITY_M6	0x4337		/* Mobility M6 */
 #define	PCI_PRODUCT_ATI_IXP_AUDIO_200	0x4341		/* IXP200 AC97 */
-#define	PCI_PRODUCT_ATI_SB200_PPB	0x4342		/* SB200 PCI-PCI */
-#define	PCI_PRODUCT_ATI_SB200_EHCI	0x4345		/* SB200 USB2 */
-#define	PCI_PRODUCT_ATI_SB200_OHCI_1	0x4347		/* SB200 USB */
-#define	PCI_PRODUCT_ATI_SB200_OHCI_2	0x4348		/* SB200 USB */
+#define	PCI_PRODUCT_ATI_IXP_PCI_200	0x4342		/* IXP200 PCI */
+#define	PCI_PRODUCT_ATI_IXP_EHCI_200	0x4345		/* IXP200 USB2 */
+#define	PCI_PRODUCT_ATI_IXP_OHCI_200_1	0x4347		/* IXP200 USB */
+#define	PCI_PRODUCT_ATI_IXP_OHCI_200_2	0x4348		/* IXP200 USB */
 #define	PCI_PRODUCT_ATI_IXP_IDE_200	0x4349		/* IXP200 IDE */
-#define	PCI_PRODUCT_ATI_SB200_ISA	0x434c		/* SB200 PCI-ISA */
+#define	PCI_PRODUCT_ATI_IXP_ISA_200	0x434c		/* IXP200 ISA */
 #define	PCI_PRODUCT_ATI_IXP_MODEM_200	0x434d		/* IXP200 Modem */
-#define	PCI_PRODUCT_ATI_SB200_SMB	0x4353		/* SB200 SMBus */
+#define	PCI_PRODUCT_ATI_IXP_SMB_200	0x4353		/* IXP200 SMBus */
 #define	PCI_PRODUCT_ATI_MACH64_CT	0x4354		/* Mach64 CT */
 #define	PCI_PRODUCT_ATI_MACH64_CX	0x4358		/* Mach64 CX */
 #define	PCI_PRODUCT_ATI_IXP_AUDIO_300	0x4361		/* IXP300 AC97 */
+#define	PCI_PRODUCT_ATI_IXP_PCI_300	0x4362		/* IXP300 PCI */
 #define	PCI_PRODUCT_ATI_IXP_SMB_300	0x4363		/* IXP300 SMBus */
+#define	PCI_PRODUCT_ATI_IXP_EHCI_300	0x3265		/* IXP300 USB2 */
+#define	PCI_PRODUCT_ATI_IXP_OHCI_300_1	0x4367		/* IXP300 USB */
+#define	PCI_PRODUCT_ATI_IXP_OHCI_300_2	0x4368		/* IXP300 USB */
 #define	PCI_PRODUCT_ATI_IXP_IDE_300	0x4369		/* IXP300 IDE */
+#define	PCI_PRODUCT_ATI_IXP_ISA_300	0x436c		/* IXP300 ISA */
+#define	PCI_PRODUCT_ATI_IXP_MODEM_300	0x436d		/* IXP300 Modem */
 #define	PCI_PRODUCT_ATI_IXP_SATA_300	0x436e		/* IXP300 SATA */
 #define	PCI_PRODUCT_ATI_IXP_AUDIO_400	0x4370		/* IXP400 AC97 */
 #define	PCI_PRODUCT_ATI_IXP_PCI_400	0x4371		/* IXP400 PCI */
@@ -883,7 +889,7 @@
 #define	PCI_PRODUCT_ATI_IXP_OHCI_600_4	0x438a		/* IXP600 USB */
 #define	PCI_PRODUCT_ATI_IXP_OHCI_600_5	0x438b		/* IXP600 USB */
 #define	PCI_PRODUCT_ATI_IXP_IDE_600	0x438c		/* IXP600 IDE */
-#define	PCI_PRODUCT_ATI_IXP_LPC_600	0x438d		/* IXP600 LPC */
+#define	PCI_PRODUCT_ATI_IXP_ISA_600	0x438d		/* IXP600 ISA */
 #define	PCI_PRODUCT_ATI_IXP_MODEM_600	0x438e		/* IXP600 Modem */
 #define	PCI_PRODUCT_ATI_IXP_SATA_X00_1	0x4390		/* IXPx00 SATA */
 #define	PCI_PRODUCT_ATI_IXP_SATA_X00_2	0x4391		/* IXPx00 SATA */
@@ -898,7 +904,7 @@
 #define	PCI_PRODUCT_ATI_IXP_OHCI_700_4	0x439a		/* IXP700 USB */
 #define	PCI_PRODUCT_ATI_IXP_OHCI_700_5	0x439b		/* IXP700 USB */
 #define	PCI_PRODUCT_ATI_IXP_IDE_700	0x439c		/* IXP700 IDE */
-#define	PCI_PRODUCT_ATI_SB700_ISA	0x439d		/* SB700 ISA */
+#define	PCI_PRODUCT_ATI_IXP_ISA_700	0x439d		/* IXP700 ISA */
 #define	PCI_PRODUCT_ATI_MACH64_ET	0x4554		/* Mach64 ET */
 #define	PCI_PRODUCT_ATI_RAGEPRO	0x4742		/* Rage Pro */
 #define	PCI_PRODUCT_ATI_MACH64_GD	0x4744		/* Mach64 GD */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 27d703987d0..f7316b8ff7b 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.1368 2008/05/24 05:44:35 brad Exp 
+ *	OpenBSD: pcidevs,v 1.1369 2008/05/24 06:00:56 brad Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -1800,36 +1800,36 @@ static const struct pci_known_product pci_known_products[] = {
 	    "IXP200 AC97",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_PPB,
-	    "SB200 PCI-PCI",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_PCI_200,
+	    "IXP200 PCI",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_EHCI,
-	    "SB200 USB2",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_EHCI_200,
+	    "IXP200 USB2",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_OHCI_1,
-	    "SB200 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_200_1,
+	    "IXP200 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_OHCI_2,
-	    "SB200 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_200_2,
+	    "IXP200 USB",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_200,
 	    "IXP200 IDE",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_ISA,
-	    "SB200 PCI-ISA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_200,
+	    "IXP200 ISA",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_MODEM_200,
 	    "IXP200 Modem",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_SMB,
-	    "SB200 SMBus",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_200,
+	    "IXP200 SMBus",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_CT,
@@ -1844,14 +1844,38 @@ static const struct pci_known_product pci_known_products[] = {
 	    "IXP300 AC97",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_PCI_300,
+	    "IXP300 PCI",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_300,
 	    "IXP300 SMBus",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_EHCI_300,
+	    "IXP300 USB2",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_300_1,
+	    "IXP300 USB",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_300_2,
+	    "IXP300 USB",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_300,
 	    "IXP300 IDE",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_300,
+	    "IXP300 ISA",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_MODEM_300,
+	    "IXP300 Modem",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_300,
 	    "IXP300 SATA",
 	},
@@ -1952,8 +1976,8 @@ static const struct pci_known_product pci_known_products[] = {
 	    "IXP600 IDE",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_LPC_600,
-	    "IXP600 LPC",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_600,
+	    "IXP600 ISA",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_MODEM_600,
@@ -2012,8 +2036,8 @@ static const struct pci_known_product pci_known_products[] = {
 	    "IXP700 IDE",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_ISA,
-	    "SB700 ISA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_700,
+	    "IXP700 ISA",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_ET,