- remove wrongly-sorted duplicate entries

- add some unknown Intel devices in dmeslog from infinst911_autol.zip

ok jsg@

1 files changed, 20 insertions, 11 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index af2cf6887fe..ab122ed032f 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1506 2009/11/08 11:54:48 damien Exp $
+$OpenBSD: pcidevs,v 1.1507 2009/11/09 14:04:32 sthen Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -2797,6 +2797,7 @@ product INTEL 82G45_HB		0x2e20	G45 Host
 product INTEL 82G45_PCIE	0x2e21	G45 PCIE
 product INTEL 82G45_IGD_1	0x2e22	G45 Video
 product INTEL 82G45_IGD_2	0x2e23	G45 Video
+product INTEL 82G45_PCIE_1	0x2e29	G45 PCIE
 product INTEL 82G41_HB		0x2e30	G41 Host
 product INTEL 82G41_IGD_1	0x2e32	G41 Video
 product INTEL 82G41_IGD_2	0x2e33	G41 Video
@@ -2819,6 +2820,8 @@ product INTEL 82X58_PCIE_7	0x340e	X58 PCIE
 product INTEL 82X58_PCIE_8	0x340f	X58 PCIE
 product INTEL 82X58_PCIE_9	0x3410	X58 PCIE
 product INTEL 82X58_PCIE_10	0x3411	X58 PCIE
+product INTEL 82X58_QP0_PHY	0x3418	5520/X58 QuickPath
+product INTEL 5520_QP1_PHY	0x3419	5520 QuickPath
 product INTEL 82X58_GPIO	0x3422	X58 GPIO
 product INTEL 82X58_RAS		0x3423	X58 RAS
 product INTEL 82X58_QP0_P0	0x3425	X58 QuickPath
@@ -2936,6 +2939,7 @@ product INTEL 82801JD_PCIE_4	0x3a76	82801JD PCIE
 product INTEL 82801JD_PCIE_5	0x3a78	82801JD PCIE
 product INTEL 82801JD_PCIE_6	0x3a7a	82801JD PCIE
 product INTEL 82801JD_LAN	0x3a7c	82801JD LAN
+product INTEL P55_LPC		0x3b02	P55 LPC
 product INTEL 3400_LPC		0x3b14	3400 LPC
 product INTEL 3400_SATA_1	0x3b20	3400 SATA
 product INTEL 3400_SATA_2	0x3b21	3400 SATA
@@ -2951,8 +2955,16 @@ product INTEL 3400_SATA_6	0x3b2e	3400 SATA
 product INTEL 3400_AHCI_4	0x3b2f	3400 AHCI
 product INTEL 3400_SMB		0x3b30	3400 SMBus
 product INTEL 3400_THERMAL	0x3b32	3400 Thermal
-product INTEL 3400_EHCI_1	0x3b34	3400 EHCI
-product INTEL 3400_EHCI_2	0x3b3c	3400 EHCI
+product INTEL 3400_EHCI_1	0x3b34	3400 USB
+product INTEL 3400_UHCI_1	0x3b36	3400 USB
+product INTEL 3400_UHCI_2	0x3b37	3400 USB
+product INTEL 3400_UHCI_3	0x3b38	3400 USB
+product INTEL 3400_UHCI_4	0x3b39	3400 USB
+product INTEL 3400_UHCI_5	0x3b3a	3400 USB
+product INTEL 3400_UHCI_6	0x3b3b	3400 USB
+product INTEL 3400_EHCI_2	0x3b3c	3400 USB
+product INTEL 3400_UHCI_7	0x3b3e	3400 USB
+product INTEL 3400_UHCI_8	0x3b3f	3400 USB
 product INTEL 3400_PCIE_1	0x3b42	3400 PCIE
 product INTEL 3400_PCIE_2	0x3b44	3400 PCIE
 product INTEL 3400_PCIE_3	0x3b46	3400 PCIE
@@ -3102,20 +3114,17 @@ product INTEL RCU31		0x9641	RCU31 I2O RAID
 product INTEL RCU31L		0x96a1	RCU31L I2O RAID
 product INTEL 21152		0xb152	S21152BB PCI-PCI
 product INTEL 21154		0xb154	21154AE/BE PCI-PCI
-product INTEL CORE_DMI_0	0xd150	Core DMI
-product INTEL CORE_DMI_1	0xd151	Core DMI
-product INTEL CORE_DMI_2	0xd152	Core DMI
-product INTEL CORE_DMI_3	0xd153	Core DMI
-product INTEL CORE_DMI_4	0xd154	Core DMI
-product INTEL CORE_DMI_5	0xd155	Core DMI
-product INTEL CORE_DMI_6	0xd156	Core DMI
-product INTEL CORE_DMI_7	0xd157	Core DMI
+product INTEL CORE_DMI_0	0xd130	Core DMI
+product INTEL CORE_DMI_1	0xd131	Core DMI
 product INTEL CORE_PCIE_1	0xd138	Core PCIE
 product INTEL CORE_PCIE_2	0xd139	Core PCIE
 product INTEL CORE_PCIE_3	0xd13a	Core PCIE
 product INTEL CORE_PCIE_4	0xd13b	Core PCIE
 product INTEL CORE_QPI_L	0xd150	Core QPI Link
 product INTEL CORE_QPI_R	0xd151	Core QPI Routing
+product INTEL CORE_DMI_2	0xd152	Core DMI
+product INTEL CORE_DMI_3	0xd153	Core DMI
+product INTEL CORE_DMI_4	0xd154	Core DMI
 product INTEL CORE_MANAGEMENT	0xd155	Core Management
 product INTEL CORE_SCRATCH	0xd156	Core Scratch
 product INTEL CORE_CONTROL	0xd157	Core Control