regen

2 files changed, 130 insertions, 16 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 972ebb59cd3..9ea224178a6 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.943 2005/10/15 15:46:41 brad Exp 
+ *	OpenBSD: pcidevs,v 1.944 2005/10/15 22:40:48 brad Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -245,8 +245,9 @@
 #define	PCI_VENDOR_SYBA	0x1592		/* Syba */
 #define	PCI_VENDOR_BLUESTEEL	0x15ab		/* Bluesteel */
 #define	PCI_VENDOR_VMWARE	0x15ad		/* VMware */
-#define	PCI_VENDOR_NDC	0x15e8		/* National Datacomm */
 #define	PCI_VENDOR_ZOLTRIX	0x15b0		/* Zoltrix */
+#define	PCI_VENDOR_NDC	0x15e8		/* National Datacomm */
+#define	PCI_VENDOR_PDC	0x15e9		/* Pacific Data */
 #define	PCI_VENDOR_EUMITCOM	0x1638		/* Eumitcom */
 #define	PCI_VENDOR_NETSEC	0x1660		/* NetSec */
 #define	PCI_VENDOR_ZYDAS	0x167b		/* ZyDAS Technology */
@@ -255,6 +256,7 @@
 #define	PCI_VENDOR_GLOBALSUN	0x16ab		/* Global Sun */
 #define	PCI_VENDOR_SAFENET	0x16ae		/* SafeNet */
 #define	PCI_VENDOR_USR2	0x16ec		/* US Robotics */
+#define	PCI_VENDOR_VITESSE	0x1725		/* Vitesse */
 #define	PCI_VENDOR_LINKSYS	0x1737		/* Linksys */
 #define	PCI_VENDOR_NETOCTAVE	0x170b		/* Netoctave */
 #define	PCI_VENDOR_ALTIMA	0x173b		/* Altima */
@@ -337,7 +339,7 @@
 #define	PCI_PRODUCT_3COM_GLOBALMODEM56	0x6565		/* 56k Global Modem */
 #define	PCI_PRODUCT_3COM_3CSOHO100TX	0x7646		/* 3cSOHO-TX */
 #define	PCI_PRODUCT_3COM_3CRWE777A	0x7770		/* 3crwe777a AirConnect */
-#define	PCI_PRODUCT_3COM_GIG	0x80eb		/* Gig */
+#define	PCI_PRODUCT_3COM_3C940B	0x80eb		/* 3c940B */
 #define	PCI_PRODUCT_3COM_3C900TPO	0x9000		/* 3c900 10Base-T */
 #define	PCI_PRODUCT_3COM_3C900COMBO	0x9001		/* 3c900 10Mbps-Combo */
 #define	PCI_PRODUCT_3COM_3C900B	0x9004		/* 3c900B 10Mbps */
@@ -456,6 +458,9 @@
 #define	PCI_PRODUCT_ALI_M5237	0x5237		/* M5237 USB */
 #define	PCI_PRODUCT_ALI_M5247	0x5247		/* M5247 AGP/PCI-PCI */
 #define	PCI_PRODUCT_ALI_M5243	0x5243		/* M5243 AGP/PCI-PCI */
+#define	PCI_PRODUCT_ALI_M5281	0x5281		/* M5281 SATA */
+#define	PCI_PRODUCT_ALI_M5287	0x5287		/* M5287 SATA */
+#define	PCI_PRODUCT_ALI_M5289	0x5289		/* M5289 SATA */
 #define	PCI_PRODUCT_ALI_M5451	0x5451		/* M5451 Audio */
 #define	PCI_PRODUCT_ALI_M5457	0x5457		/* M5457 Modem */
 #define	PCI_PRODUCT_ALI_M7101	0x7101		/* M7101 Power */
@@ -1898,8 +1903,11 @@
 #define	PCI_PRODUCT_MARTINMARIETTA_I740	0x00d1		/* i740 PCI */
 
 /* Marvell products */
-#define	PCI_PRODUCT_MARVELL_88W8310_1	0x1fa6		/* Libertas 88W8310 */
-#define	PCI_PRODUCT_MARVELL_88W8310_2	0x1fa7		/* Libertas 88W8310 */
+#define	PCI_PRODUCT_MARVELL_88W8300_1	0x1fa6		/* Libertas 88W8300 */
+#define	PCI_PRODUCT_MARVELL_88W8310	0x1fa7		/* Libertas 88W8310 */
+#define	PCI_PRODUCT_MARVELL_88W8335_1	0x1faa		/* Libertas 88W8335 */
+#define	PCI_PRODUCT_MARVELL_88W8335_2	0x1fab		/* Libertas 88W8335 */
+#define	PCI_PRODUCT_MARVELL_88W8300_2	0x2a01		/* Libertas 88W8300 */
 #define	PCI_PRODUCT_MARVELL_SK_V2	0x4320		/* SKv2 */
 #define	PCI_PRODUCT_MARVELL_YUKON_1	0x4340		/* Yukon */
 #define	PCI_PRODUCT_MARVELL_YUKON_2	0x4341		/* Yukon */
@@ -1917,6 +1925,12 @@
 #define	PCI_PRODUCT_MARVELL_YUKON_8053	0x4362		/* Yukon 8053 */
 #define	PCI_PRODUCT_MARVELL_YUKON_10	0x4363		/* Yukon */
 #define	PCI_PRODUCT_MARVELL_SK_V2_BELKIN	0x5005		/* Belkin F5D5005 */
+#define	PCI_PRODUCT_MARVELL_MV88SX5040	0x5040		/* MV88SX5040 SATA */
+#define	PCI_PRODUCT_MARVELL_MV88SX5041	0x5041		/* MV88SX5041 SATA */
+#define	PCI_PRODUCT_MARVELL_MV88SX5080	0x5080		/* MV88SX5080 SATA */
+#define	PCI_PRODUCT_MARVELL_MV88SX5081	0x5081		/* MV88SX5081 SATA */
+#define	PCI_PRODUCT_MARVELL_MV88SX6041	0x6041		/* MV88SX6041 SATA */
+#define	PCI_PRODUCT_MARVELL_MV88SX6081	0x6081		/* MV88SX6041 SATA */
 
 /* Matrox products */
 #define	PCI_PRODUCT_MATROX_ATLAS	0x0518		/* MGA PX2085 (Atlas) */
@@ -2161,8 +2175,10 @@
 #define	PCI_PRODUCT_NVIDIA_RIVA_TNT2_ULTRA	0x0029		/* Riva TNT2 Ultra */
 #define	PCI_PRODUCT_NVIDIA_VANTA1	0x002c		/* Vanta */
 #define	PCI_PRODUCT_NVIDIA_VANTA2	0x002d		/* Vanta */
+#define	PCI_PRODUCT_NVIDIA_MCP04_SATA	0x0036		/* MCP04 SATA */
 #define	PCI_PRODUCT_NVIDIA_MCP04_LAN1	0x0037		/* MCP04 LAN */
 #define	PCI_PRODUCT_NVIDIA_MCP04_LAN2	0x0038		/* MCP04 LAN */
+#define	PCI_PRODUCT_NVIDIA_MCP04_SATA2	0x003e		/* MCP04 SATA */
 #define	PCI_PRODUCT_NVIDIA_NFORCE4_ISA	0x0050		/* nForce4 ISA */
 #define	PCI_PRODUCT_NVIDIA_NFORCE4_ISA2	0x0051		/* nForce4 ISA */
 #define	PCI_PRODUCT_NVIDIA_NFORCE4_SMBUS	0x0052		/* nForce4 SMBus */
@@ -2222,6 +2238,7 @@
 #define	PCI_PRODUCT_NVIDIA_NFORCE3_250_USB2	0x00e8		/* nForce3 250 USB2 */
 #define	PCI_PRODUCT_NVIDIA_NFORCE3_250_ACA	0x00ea		/* nForce3 250 AC97 */
 #define	PCI_PRODUCT_NVIDIA_NFORCE3_250_PPB	0x00ed		/* nForce3 250 PCI-PCI */
+#define	PCI_PRODUCT_NVIDIA_NFORCE3_250_SATA2	0x00ee		/* nForce3 250 SATA */
 #define	PCI_PRODUCT_NVIDIA_GEFORCE6600GTAGP	0x00f1		/* GeForce 6600 GT AGP */
 #define	PCI_PRODUCT_NVIDIA_QUADROFX330	0x00fd		/* Quadro FX 330 */
 #define	PCI_PRODUCT_NVIDIA_GEFORCE256	0x0100		/* GeForce256 */
@@ -2290,6 +2307,8 @@
 #define	PCI_PRODUCT_NVIDIA_QUADRO4900XGL	0x0258		/* Quadro4 900 XGL */
 #define	PCI_PRODUCT_NVIDIA_QUADRO4750XGL	0x0259		/* Quadro4 750 XGL */
 #define	PCI_PRODUCT_NVIDIA_QUADRO4700XGL	0x025B		/* Quadro4 700 XGL */
+#define	PCI_PRODUCT_NVIDIA_MCP51_SATA	0x0266		/* MCP51 SATA */
+#define	PCI_PRODUCT_NVIDIA_MCP51_SATA2	0x0267		/* MCP51 SATA */
 #define	PCI_PRODUCT_NVIDIA_GEFORCE4TI4200GO	0x0286		/* GeForce4 Ti 4200 Go */
 #define	PCI_PRODUCT_NVIDIA_GEFORCEFX5800_U	0x0301		/* GeForce FX 5800 Ultra */
 #define	PCI_PRODUCT_NVIDIA_GEFORCEFX5800	0x0302		/* GeForce FX 5800 */
@@ -2345,6 +2364,9 @@
 #define	PCI_PRODUCT_OXFORD2_VSCOM_PCI011H	0x8403		/* 011H */
 #define	PCI_PRODUCT_OXFORD2_EXSYS_EX41098	0x9511		/* Exsys EX-41098 */
 
+/* Pacific Data products */
+#define	PCI_PRODUCT_PDC_QSTOR_SATA	0x2068		/* QStor SATA */
+
 /* Packet Engines products */
 #define	PCI_PRODUCT_PE_GNIC2	0x0911		/* PMC/GNIC2 */
 
@@ -2955,7 +2977,7 @@
 #define	PCI_PRODUCT_VIATECH_VT8623	0x3123		/* VT8623 PCI */
 #define	PCI_PRODUCT_VIATECH_VT8233_ISA	0x3147		/* VT8233 ISA */
 #define	PCI_PRODUCT_VIATECH_VT8751	0x3148		/* VT8751 PCI */
-#define	PCI_PRODUCT_VIATECH_VT8237_SATA	0x3149		/* VT8237 SATA */
+#define	PCI_PRODUCT_VIATECH_VT6420_SATA	0x3149		/* VT6420 SATA */
 #define	PCI_PRODUCT_VIATECH_VT8235_ISA	0x3177		/* VT8235 ISA */
 #define	PCI_PRODUCT_VIATECH_K8HTB	0x3188		/* K8HTB Host */
 #define	PCI_PRODUCT_VIATECH_VT8377	0x3189		/* VT8377 PCI */
@@ -2963,6 +2985,7 @@
 #define	PCI_PRODUCT_VIATECH_VT8378	0x3205		/* VT8378 PCI */
 #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_PM800_DRAM	0x3259		/* PM800 DRAM */
 #define	PCI_PRODUCT_VIATECH_K8HTB_3	0x3282		/* K8HTB Host */
 #define	PCI_PRODUCT_VIATECH_K8T890_4	0x4238		/* K8T890 Host */
@@ -2993,6 +3016,9 @@
 #define	PCI_PRODUCT_VIATECH_K8T890_PPB_D	0xd238		/* K8T390 PCI-PCI */
 #define	PCI_PRODUCT_VIATECH_K8T890_PPB_E	0xe238		/* K8T390 PCI-PCI */
 
+/* Vitesse Semiconductor products */
+#define	PCI_PRODUCT_VITESSE_VSC_7174	0x7174		/* VSC-7174 SATA */
+
 /* Vortex Computer Systems products */
 #define	PCI_PRODUCT_VORTEX_GDT_60x0	0x0000		/* GDT6000/6020/6050 */
 #define	PCI_PRODUCT_VORTEX_GDT_6000B	0x0001		/* GDT6000B/6010 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 66f7824066e..2a963016618 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.943 2005/10/15 15:46:41 brad Exp 
+ *	OpenBSD: pcidevs,v 1.944 2005/10/15 22:40:48 brad Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -195,8 +195,8 @@ static const struct pci_known_product pci_known_products[] = {
 	    "3crwe777a AirConnect",
 	},
 	{
-	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_GIG,
-	    "Gig",
+	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C940B,
+	    "3c940B",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C900TPO,
@@ -583,6 +583,18 @@ static const struct pci_known_product pci_known_products[] = {
 	    "M5243 AGP/PCI-PCI",
 	},
 	{
+	    PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M5281,
+	    "M5281 SATA",
+	},
+	{
+	    PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M5287,
+	    "M5287 SATA",
+	},
+	{
+	    PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M5289,
+	    "M5289 SATA",
+	},
+	{
 	    PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M5451,
 	    "M5451 Audio",
 	},
@@ -5451,14 +5463,26 @@ static const struct pci_known_product pci_known_products[] = {
 	    "i740 PCI",
 	},
 	{
-	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8310_1,
-	    "Libertas 88W8310",
+	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8300_1,
+	    "Libertas 88W8300",
 	},
 	{
-	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8310_2,
+	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8310,
 	    "Libertas 88W8310",
 	},
 	{
+	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8335_1,
+	    "Libertas 88W8335",
+	},
+	{
+	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8335_2,
+	    "Libertas 88W8335",
+	},
+	{
+	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8300_2,
+	    "Libertas 88W8300",
+	},
+	{
 	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_SK_V2,
 	    "SKv2",
 	},
@@ -5527,6 +5551,30 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Belkin F5D5005",
 	},
 	{
+	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_MV88SX5040,
+	    "MV88SX5040 SATA",
+	},
+	{
+	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_MV88SX5041,
+	    "MV88SX5041 SATA",
+	},
+	{
+	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_MV88SX5080,
+	    "MV88SX5080 SATA",
+	},
+	{
+	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_MV88SX5081,
+	    "MV88SX5081 SATA",
+	},
+	{
+	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_MV88SX6041,
+	    "MV88SX6041 SATA",
+	},
+	{
+	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_MV88SX6081,
+	    "MV88SX6041 SATA",
+	},
+	{
 	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_ATLAS,
 	    "MGA PX2085 (Atlas)",
 	},
@@ -6247,6 +6295,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Vanta",
 	},
 	{
+	    PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP04_SATA,
+	    "MCP04 SATA",
+	},
+	{
 	    PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP04_LAN1,
 	    "MCP04 LAN",
 	},
@@ -6255,6 +6307,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "MCP04 LAN",
 	},
 	{
+	    PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP04_SATA2,
+	    "MCP04 SATA",
+	},
+	{
 	    PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_ISA,
 	    "nForce4 ISA",
 	},
@@ -6491,6 +6547,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "nForce3 250 PCI-PCI",
 	},
 	{
+	    PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_250_SATA2,
+	    "nForce3 250 SATA",
+	},
+	{
 	    PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_GEFORCE6600GTAGP,
 	    "GeForce 6600 GT AGP",
 	},
@@ -6763,6 +6823,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Quadro4 700 XGL",
 	},
 	{
+	    PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP51_SATA,
+	    "MCP51 SATA",
+	},
+	{
+	    PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP51_SATA2,
+	    "MCP51 SATA",
+	},
+	{
 	    PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_GEFORCE4TI4200GO,
 	    "GeForce4 Ti 4200 Go",
 	},
@@ -6939,6 +7007,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Exsys EX-41098",
 	},
 	{
+	    PCI_VENDOR_PDC, PCI_PRODUCT_PDC_QSTOR_SATA,
+	    "QStor SATA",
+	},
+	{
 	    PCI_VENDOR_PE, PCI_PRODUCT_PE_GNIC2,
 	    "PMC/GNIC2",
 	},
@@ -8943,8 +9015,8 @@ static const struct pci_known_product pci_known_products[] = {
 	    "VT8751 PCI",
 	},
 	{
-	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237_SATA,
-	    "VT8237 SATA",
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT6420_SATA,
+	    "VT6420 SATA",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8235_ISA,
@@ -8975,6 +9047,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "K8T890 Host",
 	},
 	{
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT6421_SATA,
+	    "VT6421 SATA",
+	},
+	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_PM800_DRAM,
 	    "PM800 DRAM",
 	},
@@ -9091,6 +9167,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "K8T390 PCI-PCI",
 	},
 	{
+	    PCI_VENDOR_VITESSE, PCI_PRODUCT_VITESSE_VSC_7174,
+	    "VSC-7174 SATA",
+	},
+	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_60x0,
 	    "GDT6000/6020/6050",
 	},
@@ -10371,12 +10451,16 @@ static const struct pci_known_vendor pci_known_vendors[] = {
 	    "VMware",
 	},
 	{
+	    PCI_VENDOR_ZOLTRIX,
+	    "Zoltrix",
+	},
+	{
 	    PCI_VENDOR_NDC,
 	    "National Datacomm",
 	},
 	{
-	    PCI_VENDOR_ZOLTRIX,
-	    "Zoltrix",
+	    PCI_VENDOR_PDC,
+	    "Pacific Data",
 	},
 	{
 	    PCI_VENDOR_EUMITCOM,
@@ -10411,6 +10495,10 @@ static const struct pci_known_vendor pci_known_vendors[] = {
 	    "US Robotics",
 	},
 	{
+	    PCI_VENDOR_VITESSE,
+	    "Vitesse",
+	},
+	{
 	    PCI_VENDOR_LINKSYS,
 	    "Linksys",
 	},