Sanitize NVIDIA SATA/AHCI/RAID IDs. Not all of these have been seen in the

wild, but there is an obvious pattern.  Fix a typo in one of the NVIDIA USB
Ids while there.

ok mikeb@ (a while ago)

1 files changed, 37 insertions, 37 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 5a8e494f177..a98a7eb91b9 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1625 2011/10/22 19:03:05 camield Exp $
+$OpenBSD: pcidevs,v 1.1626 2011/11/12 11:47:17 kettenis Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -4370,7 +4370,7 @@ product NVIDIA MCP61_LAN3	0x03ee	MCP61 LAN
 product NVIDIA MCP61_LAN4	0x03ef	MCP61 LAN
 product NVIDIA MCP61_HDA_2	0x03f0	MCP61 HD Audio
 product NVIDIA MCP61_OHCI	0x03f1	MCP61 USB
-product NVIDIA MCP61_EHCI	0x03f2	MPC61 USB
+product NVIDIA MCP61_EHCI	0x03f2	MCP61 USB
 product NVIDIA MCP61_PPB_3	0x03f3	MCP61
 product NVIDIA MCP61_SMU	0x03f4	MCP61 SMU
 product NVIDIA MCP61_MEM2	0x03f5	MCP61 Memory
@@ -4408,10 +4408,10 @@ product NVIDIA MCP65_PPB_2	0x0458	MCP65 PCIE
 product NVIDIA MCP65_PPB_3	0x0459	MCP65 PCIE
 product NVIDIA MCP65_PPB_4	0x045a	MCP65 PCIE
 product NVIDIA MCP65_PPB_5	0x045b	MCP65 PCIE
-product NVIDIA MCP65_SATA	0x045c	MCP65 SATA
-product NVIDIA MCP65_SATA2	0x045d	MCP65 SATA
-product NVIDIA MCP65_SATA3	0x045e	MCP65 SATA
-product NVIDIA MCP65_SATA4	0x045f	MCP65 SATA
+product NVIDIA MCP65_SATA_1	0x045c	MCP65 SATA
+product NVIDIA MCP65_SATA_2	0x045d	MCP65 SATA
+product NVIDIA MCP65_SATA_3	0x045e	MCP65 SATA
+product NVIDIA MCP65_SATA_4	0x045f	MCP65 SATA
 product NVIDIA GEFORCEGTX285	0x05e3	GeForce GTX 285
 product NVIDIA GEFORCE7000M	0x0533	GeForce 7000M
 product NVIDIA GEFORCE7050_PV	0x053b	GeForce 7050 PV
@@ -4424,18 +4424,18 @@ product NVIDIA MCP67_LAN1	0x054c	MCP67 LAN
 product NVIDIA MCP67_LAN2	0x054d	MCP67 LAN
 product NVIDIA MCP67_LAN3	0x054e	MCP67 LAN
 product NVIDIA MCP67_LAN4	0x054f	MCP67 LAN
-product NVIDIA MCP67_SATA	0x0550	MCP67 SATA
-product NVIDIA MCP67_SATA2	0x0551	MCP67 SATA
-product NVIDIA MCP67_SATA3	0x0552	MCP67 SATA
-product NVIDIA MCP67_SATA4	0x0553	MCP67 SATA
+product NVIDIA MCP67_SATA_1	0x0550	MCP67 SATA
+product NVIDIA MCP67_SATA_2	0x0551	MCP67 SATA
+product NVIDIA MCP67_SATA_3	0x0552	MCP67 SATA
+product NVIDIA MCP67_SATA_4	0x0553	MCP67 SATA
 product NVIDIA MCP67_AHCI_1	0x0554	MCP67 AHCI
 product NVIDIA MCP67_AHCI_2	0x0555	MCP67 AHCI
 product NVIDIA MCP67_AHCI_3	0x0556	MCP67 AHCI
 product NVIDIA MCP67_AHCI_4	0x0557	MCP67 AHCI
-product NVIDIA MCP67_AHCI_5	0x0558	MCP67 AHCI
-product NVIDIA MCP67_AHCI_6	0x0559	MCP67 AHCI
-product NVIDIA MCP67_AHCI_7	0x055a	MCP67 AHCI
-product NVIDIA MCP67_AHCI_8	0x055b	MCP67 AHCI
+product NVIDIA MCP67_RAID_1	0x0558	MCP67 RAID
+product NVIDIA MCP67_RAID_2	0x0559	MCP67 RAID
+product NVIDIA MCP67_RAID_3	0x055a	MCP67 RAID
+product NVIDIA MCP67_RAID_4	0x055b	MCP67 RAID
 product NVIDIA MCP67_HDA_1	0x055c	MCP67 HD Audio
 product NVIDIA MCP67_HDA_2	0x055d	MCP67 HD Audio
 product NVIDIA MCP67_OHCI	0x055e	MCP67 USB
@@ -4509,18 +4509,18 @@ product NVIDIA MCP73_LAN3	0x07de	MCP73 LAN
 product NVIDIA MCP73_LAN4	0x07df	MCP73 LAN
 product	NVIDIA GEFORCE7100	0x07e1	GeForce 7100
 product NVIDIA GEFORCE7050	0x07e3	GeForce 7050
-product NVIDIA MCP73_AHCI_1	0x07f0	MCP73 AHCI
-product NVIDIA MCP73_AHCI_2	0x07f1	MCP73 AHCI
-product NVIDIA MCP73_AHCI_3	0x07f2	MCP73 AHCI
-product NVIDIA MCP73_AHCI_4	0x07f3	MCP73 AHCI
-product NVIDIA MCP73_AHCI_5	0x07f4	MCP73 AHCI
-product NVIDIA MCP73_AHCI_6	0x07f5	MCP73 AHCI
-product NVIDIA MCP73_AHCI_7	0x07f6	MCP73 AHCI
-product NVIDIA MCP73_AHCI_8	0x07f7	MCP73 AHCI
-product NVIDIA MCP73_AHCI_9	0x07f8	MCP73 AHCI
-product NVIDIA MCP73_AHCI_10	0x07f9	MCP73 AHCI
-product NVIDIA MCP73_AHCI_11	0x07fa	MCP73 AHCI
-product NVIDIA MCP73_AHCI_12	0x07fb	MCP73 AHCI
+product NVIDIA MCP73_SATA_1	0x07f0	MCP73 SATA
+product NVIDIA MCP73_SATA_2	0x07f1	MCP73 SATA
+product NVIDIA MCP73_SATA_3	0x07f2	MCP73 SATA
+product NVIDIA MCP73_SATA_4	0x07f3	MCP73 SATA
+product NVIDIA MCP73_AHCI_1	0x07f4	MCP73 AHCI
+product NVIDIA MCP73_AHCI_2	0x07f5	MCP73 AHCI
+product NVIDIA MCP73_AHCI_3	0x07f6	MCP73 AHCI
+product NVIDIA MCP73_AHCI_4	0x07f7	MCP73 AHCI
+product NVIDIA MCP73_RAID_1	0x07f8	MCP73 RAID
+product NVIDIA MCP73_RAID_2	0x07f9	MCP73 RAID
+product NVIDIA MCP73_RAID_3	0x07fa	MCP73 RAID
+product NVIDIA MCP73_RAID_4	0x07fb	MCP73 RAID
 product NVIDIA MCP73_HDA_1	0x07fc	MCP73 HD Audio
 product NVIDIA MCP73_HDA_2	0x07fd	MCP73 HD Audio
 product NVIDIA MCP73_OHCI	0x07fe	MCP73 USB
@@ -4585,17 +4585,17 @@ product NVIDIA MCP79_PPB_5	0x0ac6	MCP79 PCIE
 product NVIDIA MCP79_PPB_6	0x0ac7	MCP79 PCIE
 product NVIDIA MCP79_PPB_7	0x0ac8	MCP79 PCIE
 product NVIDIA MCP77_SATA_1	0x0ad0	MCP77 SATA
-product NVIDIA MCP77_AHCI_2	0x0ad1	MCP77 AHCI
-product NVIDIA MCP77_AHCI_3	0x0ad2	MCP77 AHCI
-product NVIDIA MCP77_AHCI_4	0x0ad3	MCP77 AHCI
-product NVIDIA MCP77_AHCI_5	0x0ad4	MCP77 AHCI
-product NVIDIA MCP77_AHCI_6	0x0ad5	MCP77 AHCI
-product NVIDIA MCP77_AHCI_7	0x0ad6	MCP77 AHCI
-product NVIDIA MCP77_AHCI_8	0x0ad7	MCP77 AHCI
-product NVIDIA MCP77_AHCI_9	0x0ad8	MCP77 AHCI
-product NVIDIA MCP77_AHCI_10	0x0ad9	MCP77 AHCI
-product NVIDIA MCP77_AHCI_11	0x0ada	MCP77 AHCI
-product NVIDIA MCP77_AHCI_12	0x0adb	MCP77 AHCI
+product NVIDIA MCP77_SATA_2	0x0ad1	MCP77 SATA
+product NVIDIA MCP77_SATA_3	0x0ad2	MCP77 SATA
+product NVIDIA MCP77_SATA_4	0x0ad3	MCP77 SATA
+product NVIDIA MCP77_AHCI_1	0x0ad4	MCP77 AHCI
+product NVIDIA MCP77_AHCI_2	0x0ad5	MCP77 AHCI
+product NVIDIA MCP77_AHCI_3	0x0ad6	MCP77 AHCI
+product NVIDIA MCP77_AHCI_4	0x0ad7	MCP77 AHCI
+product NVIDIA MCP77_RAID_1	0x0ad8	MCP77 RAID
+product NVIDIA MCP77_RAID_2	0x0ad9	MCP77 RAID
+product NVIDIA MCP77_RAID_3	0x0ada	MCP77 RAID
+product NVIDIA MCP77_RAID_4	0x0adb	MCP77 RAID
 product NVIDIA GF108_HDA	0x0bea	GF108 HD Audio
 product NVIDIA MCP89_HB		0x0d60	MCP89 Host
 product NVIDIA MCP89_MEM_1	0x0d68	MCP89 Memory