regen

1 files changed, 119 insertions, 119 deletions

diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index c0540516d9a..be211ea0f50 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.1412 2008/09/17 05:29:25 brad Exp 
+ *	OpenBSD: pcidevs,v 1.1413 2008/09/17 05:54:48 brad Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -1800,40 +1800,40 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Mobility M6",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_200,
-	    "IXP200 AC97",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_AUDIO,
+	    "SB200 AC97",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_PCI_200,
-	    "IXP200 PCI",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_PCI,
+	    "SB200 PCI",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_EHCI_200,
-	    "IXP200 USB2",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_EHCI,
+	    "SB200 USB2",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_200_1,
-	    "IXP200 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_OHCI_1,
+	    "SB200 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_200_2,
-	    "IXP200 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_OHCI_2,
+	    "SB200 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_200,
-	    "IXP200 IDE",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_IDE,
+	    "SB200 IDE",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_200,
-	    "IXP200 ISA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_ISA,
+	    "SB200 ISA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_MODEM_200,
-	    "IXP200 Modem",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_MODEM,
+	    "SB200 Modem",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_200,
-	    "IXP200 SMBus",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_SMB,
+	    "SB200 SMBus",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_CT,
@@ -1844,204 +1844,204 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Mach64 CX",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_300,
-	    "IXP300 AC97",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_AUDIO,
+	    "SB300 AC97",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_PCI_300,
-	    "IXP300 PCI",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_PCI,
+	    "SB300 PCI",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_300,
-	    "IXP300 SMBus",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_SMB,
+	    "SB300 SMBus",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_EHCI_300,
-	    "IXP300 USB2",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_EHCI,
+	    "SB300 USB2",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_300_1,
-	    "IXP300 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_OHCI_1,
+	    "SB300 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_300_2,
-	    "IXP300 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_OHCI_2,
+	    "SB300 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_300,
-	    "IXP300 IDE",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_IDE,
+	    "SB300 IDE",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_300,
-	    "IXP300 ISA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_ISA,
+	    "SB300 ISA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_MODEM_300,
-	    "IXP300 Modem",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_MODEM,
+	    "SB300 Modem",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_300,
-	    "IXP300 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_SATA,
+	    "SB300 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_400,
-	    "IXP400 AC97",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_AUDIO,
+	    "SB400 AC97",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_PCI_400,
-	    "IXP400 PCI",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_PCI,
+	    "SB400 PCI",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_400,
-	    "IXP400 SMBus",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_SMB,
+	    "SB400 SMBus",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_EHCI_400,
-	    "IXP400 USB2",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_EHCI,
+	    "SB400 USB2",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_400_1,
-	    "IXP400 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_OHCI_1,
+	    "SB400 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_400_2,
-	    "IXP400 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_OHCI_2,
+	    "SB400 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_400,
-	    "IXP400 IDE",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_IDE,
+	    "SB400 IDE",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_400,
-	    "IXP400 ISA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_ISA,
+	    "SB400 ISA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_MODEM_400,
-	    "IXP400 Modem",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_MODEM,
+	    "SB400 Modem",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_400_1,
-	    "IXP400 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_SATA_1,
+	    "SB400 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_400_2,
-	    "IXP400 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_SATA_2,
+	    "SB400 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_HDA_450,
-	    "IXP450 HD Audio",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB450_HDA,
+	    "SB450 HD Audio",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_600,
-	    "IXP600 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_SATA,
+	    "SB600 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_600,
-	    "IXP600 AC97",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_AUDIO,
+	    "SB600 AC97",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_HDA_X00,
-	    "IXPx00 HD Audio",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_HDA,
+	    "SBx00 HD Audio",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_PCI_600,
-	    "IXP600 PCI",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_PCI,
+	    "SB600 PCI",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_X00,
-	    "IXPx00 SMBus",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SMB,
+	    "SBx00 SMBus",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_EHCI_600,
-	    "IXP600 USB2",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_EHCI,
+	    "SB600 USB2",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_600_1,
-	    "IXP600 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_OHCI_1,
+	    "SB600 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_600_2,
-	    "IXP600 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_OHCI_2,
+	    "SB600 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_600_3,
-	    "IXP600 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_OHCI_3,
+	    "SB600 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_600_4,
-	    "IXP600 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_OHCI_4,
+	    "SB600 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_600_5,
-	    "IXP600 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_OHCI_5,
+	    "SB600 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_600,
-	    "IXP600 IDE",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_IDE,
+	    "SB600 IDE",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_600,
-	    "IXP600 ISA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_ISA,
+	    "SB600 ISA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_MODEM_600,
-	    "IXP600 Modem",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_MODEM,
+	    "SB600 Modem",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_X00_1,
-	    "IXPx00 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_1,
+	    "SBx00 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_X00_2,
-	    "IXPx00 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_2,
+	    "SBx00 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_X00_3,
-	    "IXPx00 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_3,
+	    "SBx00 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_X00_4,
-	    "IXPx00 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_4,
+	    "SBx00 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_X00_5,
-	    "IXPx00 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_5,
+	    "SBx00 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_X00_6,
-	    "IXPx00 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_6,
+	    "SBx00 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_EHCI_700,
-	    "IXP700 USB2",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_EHCI,
+	    "SB700 USB2",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_700_1,
-	    "IXP700 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_OHCI_1,
+	    "SB700 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_700_2,
-	    "IXP700 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_OHCI_2,
+	    "SB700 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_700_3,
-	    "IXP700 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_OHCI_3,
+	    "SB700 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_700_4,
-	    "IXP700 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_OHCI_4,
+	    "SB700 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_700_5,
-	    "IXP700 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_OHCI_5,
+	    "SB700 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_700,
-	    "IXP700 IDE",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_IDE,
+	    "SB700 IDE",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_700,
-	    "IXP700 ISA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_ISA,
+	    "SB700 ISA",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_ET,