summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2008-02-09 19:05:02 +0000
committerkettenis <kettenis@openbsd.org>2008-02-09 19:05:02 +0000
commitfa468a7fce2ec3204f37fd7daa4f7b475f5c54d2 (patch)
tree825ea76587d3b270fa07e3af5da49814fdb06031
parentin cvs_update_enterdir() write the CVS/Tag file if the (diff)
downloadwireguard-openbsd-fa468a7fce2ec3204f37fd7daa4f7b475f5c54d2.tar.xz
wireguard-openbsd-fa468a7fce2ec3204f37fd7daa4f7b475f5c54d2.zip
Correct/normalize a few Intel server chipset IDs.
ok henning@, marco@
-rw-r--r--sys/dev/pci/pcidevs54
1 files changed, 27 insertions, 27 deletions
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 1108e0609a8..399ffe2ed21 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1320 2008/02/09 15:03:25 kettenis Exp $
+$OpenBSD: pcidevs,v 1.1321 2008/02/09 19:05:02 kettenis Exp $
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
/*
@@ -1937,7 +1937,7 @@ product INTEL 82840_AGP 0x1a23 82840 AGP
product INTEL 82840_PCI 0x1a24 82840 PCI
product INTEL 82845_HB 0x1a30 82845 Host
product INTEL 82845_AGP 0x1a31 82845 AGP
-product INTEL 5000_DMA 0x1a38 5000 DMA Engine
+product INTEL 5000_DMA 0x1a38 5000 DMA
product INTEL 82597EX_SR 0x1a48 PRO/10GbE SR (82597EX)
product INTEL 82597EX_LR 0x1b48 PRO/10GbE LR (82597EX)
product INTEL 82801AA_LPC 0x2410 82801AA LPC
@@ -2015,19 +2015,19 @@ product INTEL 82860_PCI2 0x2534 82860 PCI
product INTEL 82860_PCI3 0x2535 82860 PCI
product INTEL 82860_PCI4 0x2536 82860 PCI
product INTEL E7500_HB 0x2540 E7500 Host
-product INTEL E7500_DRAM 0x2541 E7500 DRAM
-product INTEL E7500_HI_B1 0x2543 E7500 MCH
-product INTEL E7500_HI_B2 0x2544 E7500 MCH
-product INTEL E7500_HI_C1 0x2545 E7500 MCH
-product INTEL E7500_HI_C2 0x2546 E7500 MCH
-product INTEL E7500_HI_D1 0x2547 E7500 MCH
-product INTEL E7500_HI_D2 0x2548 E7500 MCH
+product INTEL E7500_ERR 0x2541 E7500 Error Reporting
+product INTEL E7500_PCI_B1 0x2543 E7500 PCI
+product INTEL E7500_PCI_B2 0x2544 E7500 PCI
+product INTEL E7500_PCI_C1 0x2545 E7500 PCI
+product INTEL E7500_PCI_C2 0x2546 E7500 PCI
+product INTEL E7500_PCI_D1 0x2547 E7500 PCI
+product INTEL E7500_PCI_D2 0x2548 E7500 PCI
product INTEL E7501_HB 0x254c E7501 Host
product INTEL E7505_HB 0x2550 E7505 Host
-product INTEL E7505_RAS 0x2551 E7505 RAS
+product INTEL E7505_ERR 0x2551 E7505 Error Reporting
product INTEL E7505_AGP 0x2552 E7505 AGP
-product INTEL E7505_HI_B1 0x2553 E7505 PCI
-product INTEL E7505_HI_B2 0x2554 E7505 PCI
+product INTEL E7505_PCI_B1 0x2553 E7505 PCI
+product INTEL E7505_PCI_B2 0x2554 E7505 PCI
product INTEL 82845G_HB 0x2560 82845G Host
product INTEL 82845G_AGP 0x2561 82845G AGP
product INTEL 82845G_IGD 0x2562 82845G Video
@@ -2073,15 +2073,15 @@ product INTEL 5000_PCIE_3 0x25e4 5000 PCIE
product INTEL 5000_PCIE_4 0x25e5 5000 PCIE
product INTEL 5000_PCIE_5 0x25e6 5000 PCIE
product INTEL 5000_PCIE_6 0x25e7 5000 PCIE
-product INTEL 5000_ERR_REG 0x25f0 5000 Error Reporting
+product INTEL 5000_ERR 0x25f0 5000 Error Reporting
product INTEL 5000_RESERVED_1 0x25f1 5000 Reserved
product INTEL 5000_RESERVED_2 0x25f3 5000 Reserved
product INTEL 5000_FBD_1 0x25f5 5000 FBD
product INTEL 5000_FBD_2 0x25f6 5000 FBD
-product INTEL 5000_PCIE_7 0x25f7 5000 PCIE
-product INTEL 5000_PCIE_8 0x25f8 5000 PCIE
-product INTEL 5000_PCIE_9 0x25f9 5000 PCIE
-product INTEL 5000X_PCIE 0x25fa 5000X PCIE
+product INTEL 5000_PCIE_7 0x25f7 5000 PCIE x8
+product INTEL 5000_PCIE_8 0x25f8 5000 PCIE x8
+product INTEL 5000_PCIE_9 0x25f9 5000 PCIE x8
+product INTEL 5000_PCIE_10 0x25fa 5000 PCIE x16
product INTEL E8500_HB 0x2600 E8500 Host
product INTEL E8500_PCIE_1 0x2601 E8500 PCIE
product INTEL E8500_PCIE_2 0x2602 E8500 PCIE
@@ -2093,7 +2093,7 @@ product INTEL E8500_PCIE_7 0x2607 E8500 PCIE
product INTEL E8500_PCIE_8 0x2608 E8500 PCIE x8
product INTEL E8500_PCIE_9 0x2609 E8500 PCIE x8
product INTEL E8500_PCIE_10 0x260a E8500 PCIE x8
-product INTEL E8500_IMI_1 0x260c E8500 IMI
+product INTEL E8500_IMI 0x260c E8500 IMI
product INTEL E8500_FSBINT 0x2610 E8500 FSB/Boot/Interrupt
product INTEL E8500_AM 0x2611 E8500 Address Mapping
product INTEL E8500_RAS 0x2612 E8500 RAS
@@ -2324,17 +2324,17 @@ product INTEL 82855GM_CFG 0x3585 82855GM Config
product INTEL 82854_HB 0x358c 82854 Host
product INTEL 82854_IGD 0x358e 82854 Video
product INTEL E7520_HB 0x3590 E7520 Host
-product INTEL E7520_MCH_ERR 0x3591 E7520 Error Reporting
+product INTEL E7520_ERR 0x3591 E7520 Error Reporting
product INTEL E7320_HB 0x3592 E7320 Host
-product INTEL E7525_ERR 0x3593 E7525 Error Reporting
+product INTEL E7320_ERR 0x3593 E7320 Error Reporting
product INTEL E7520_DMA 0x3594 E7520 DMA
-product INTEL MCH_PCIEA0 0x3595 MCH PCIE
-product INTEL MCH_PCIEA1 0x3596 MCH PCIE
-product INTEL MCH_PCIEB0 0x3597 MCH PCIE
-product INTEL MCH_PCIEB1 0x3598 MCH PCIE
-product INTEL MCH_PCIEC0 0x3599 MCH PCIE
-product INTEL MCH_PCIEC1 0x359a MCH PCIE
-product INTEL E7525_CFG 0x359b E7525 Config
+product INTEL E7520_PCIE_A0 0x3595 E7520 PCIE
+product INTEL E7520_PCIE_A1 0x3596 E7520 PCIE
+product INTEL E7520_PCIE_B0 0x3597 E7520 PCIE
+product INTEL E7520_PCIE_B1 0x3598 E7520 PCIE
+product INTEL E7520_PCIE_C0 0x3599 E7520 PCIE
+product INTEL E7520_PCIE_C1 0x359a E7520 PCIE
+product INTEL E7520_CFG 0x359b E7520 Config
product INTEL E7525_HB 0x359e E7525 Host
product INTEL PRO_WL_2200BG 0x4220 PRO/Wireless 2200BG
product INTEL PRO_WL_2225BG 0x4221 PRO/Wireless 2225BG