Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci - Fix entries. The following problems were found...



details:   https://anonhg.NetBSD.org/src/rev/d84392136a03
branches:  trunk
changeset: 347369:d84392136a03
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Aug 23 09:18:01 2016 +0000

description:
- Fix entries. The following problems were found while sorting entries:
  - Remove the following entries because the value is duplicated:

    CMDTECH_240                 (CMDTECH_AAR_1210SA has the same value)
    INTEL_C610_SATA_RAID        (INTEL_82801H_SATA_RAID has the same vaule)
    INTEL_C610_PCIE_1_3         (82801BA_HPB has the same value)
    GEFORCE_610M3               (GEFORCE_610M2 has the same value)

  - RADEON_RV350_NQ is not 0x4e41 but 0x4e51
  - 82801JD_SATA_RAID is not 0x3a02 but 0x3a05.

  - The following two entries have the same number. Fix one of them:

    DH89XXCL_USB_2 to 0x23b5            (was 0x23b4 (== DH89XXCL_USB_1))
    5500_HB to 0x3404 and change the desc (was 0x3403 (== 3400_HB))
    82X58_PCIE_0_1 to 0x3421            (was 0x3420 (== 82X58_PCIE_0_0))
    82801JI_THERMAL to 0x3a32           (was 0x3a30 (== 82801JI_SMB))

- Sort entries in device ID's order.

diffstat:

 sys/dev/pci/pcidevs |  201 +++++++++++++++++++++++++--------------------------
 1 files changed, 98 insertions(+), 103 deletions(-)

diffs (truncated from 778 to 300 lines):

diff -r 29b0630a4bb2 -r d84392136a03 sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Tue Aug 23 09:11:06 2016 +0000
+++ b/sys/dev/pci/pcidevs       Tue Aug 23 09:18:01 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1260 2016/08/19 10:22:27 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1261 2016/08/23 09:18:01 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -693,6 +693,7 @@
 product 3COM 3C339     0x3390  3c339 TokenLink Velocity
 product 3COM 3C359     0x3590  3c359 TokenLink Velocity XL
 product 3COM 3C450TX   0x4500  3c450-TX 10/100 Ethernet
+product 3COM 3C555     0x5055  3c555 10/100 Mini-PCI Ethernet
 product 3COM 3C575TX   0x5057  3c575-TX 10/100 Ethernet
 product 3COM 3C575BTX  0x5157  3CCFE575BT 10/100 Ethernet
 product 3COM 3C575CTX  0x5257  3CCFE575CT 10/100 Ethernet
@@ -700,7 +701,6 @@
 product 3COM 3C595TX   0x5950  3c595-TX 10/100 Ethernet
 product 3COM 3C595T4   0x5951  3c595-T4 10/100 Ethernet
 product 3COM 3C595MII  0x5952  3c595-MII 10/100 Ethernet
-product 3COM 3C555     0x5055  3c555 10/100 Mini-PCI Ethernet
 product 3COM 3C154G72  0x6001  3CRWE154G72 Wireless LAN Adapter
 product 3COM 3C556     0x6055  3c556 10/100 Mini-PCI Ethernet
 product 3COM 3C556B    0x6056  3c556B 10/100 Mini-PCI Ethernet
@@ -716,11 +716,11 @@
 product 3COM TOKEN     0x8811  Token Ring
 product 3COM 3C900TPO  0x9000  3c900-TPO Ethernet
 product 3COM 3C900COMBO        0x9001  3c900-COMBO Ethernet
-product 3COM 3C905TX   0x9050  3c905-TX 10/100 Ethernet
-product 3COM 3C905T4   0x9051  3c905-T4 10/100 Ethernet
 product 3COM 3C900BTPO 0x9004  3c900B-TPO Ethernet
 product 3COM 3C900BCOMBO 0x9005        3c900B-COMBO Ethernet
 product 3COM 3C900BTPC 0x9006  3c900B-TPC Ethernet
+product 3COM 3C905TX   0x9050  3c905-TX 10/100 Ethernet
+product 3COM 3C905T4   0x9051  3c905-T4 10/100 Ethernet
 product 3COM 3C905BTX  0x9055  3c905B-TX 10/100 Ethernet
 product 3COM 3C905BT4  0x9056  3c905B-T4 10/100 Ethernet
 product 3COM 3C905BCOMBO 0x9058        3c905B-COMBO 10/100 Ethernet
@@ -821,13 +821,13 @@
 product ALI M1689      0x1689  M1689 Host-PCI Bridge
 product ALI M3309      0x3309  M3309 MPEG Decoder
 product ALI M4803      0x5215  M4803
-product ALI M5257      0x5257  M5257 PCI Software Modem
 product ALI M5229      0x5229  M5229 UDMA IDE Controller
 product ALI M5237      0x5237  M5237 USB 1.1 Host Controller
 product ALI M5239      0x5239  M5239 USB 2.0 Host Controller
 product ALI M5243      0x5243  M5243 PCI-AGP Bridge
 product ALI M5247      0x5247  M5247 PCI-AGP Bridge
 product ALI M5249      0x5249  M5249 Hypertransport to PCI Bridge
+product ALI M5257      0x5257  M5257 PCI Software Modem
 product ALI M5261      0x5261  M5261 Tulip Ethernet Controller
 product ALI M5288      0x5288  M5288 SATA/Raid Controller
 product ALI M5451      0x5451  M5451 AC-Link Controller Audio Device
@@ -841,10 +841,10 @@
 product ADP AIC7855    0x5578  AIC-7855
 product ADP AIC5900    0x5900  AIC-5900 ATM
 product ADP AIC5905    0x5905  AIC-5905 ATM
-product ADP AIC6915    0x6915  AIC-6915 10/100 Ethernet
+product ADP APA1480    0x6075  APA-1480 Ultra
 product ADP AIC7860    0x6078  AIC-7860
-product ADP APA1480    0x6075  APA-1480 Ultra
 product ADP 2940AU     0x6178  AHA-2940A Ultra
+product ADP AIC6915    0x6915  AIC-6915 10/100 Ethernet
 product ADP AIC7870    0x7078  AIC-7870
 product ADP 2940       0x7178  AHA-2940
 product ADP 3940       0x7278  AHA-3940
@@ -875,6 +875,7 @@
 product ADP2 AIC7899P          0x00cf  AIC-7899P U160
 product ADP2 1420SA            0x0241  RAID 1420SA
 product ADP2 1430SA            0x0243  RAID 1430SA
+product ADP2 SERVERAID         0x0250  ServeRAID 6/7 (marco)
 product ADP2 AAC2622           0x0282  AAC-2622
 product ADP2 ASR2200S          0x0285  ASR-2200S
 product ADP2 ASR2120S          0x0286  ASR-2120S
@@ -890,11 +891,10 @@
 /* XXX guess */
 product ADP2 PERC_3QC          0x1365  Dell PERC 3/QC
 product ADP2 HP_M110_G2                0x3227  HP M110 G2 / ASR-2610SA
-product ADP2 SERVERAID         0x0250  ServeRAID 6/7 (marco)
 
 /* Addtron Products */
+product ADDTRON RHINEII        0x1320  Rhine II 10/100 Ethernet
 product ADDTRON 8139   0x1360  8139 Ethernet
-product ADDTRON RHINEII        0x1320  Rhine II 10/100 Ethernet
 
 /* ADMtek products */
 product ADMTEK AL981   0x0981  AL981 (Comet) 10/100 Ethernet
@@ -919,9 +919,9 @@
 /* Aironet Wireless Communicasions products */
 product AIRONET PC4xxx         0x0001  PC4500/PC4800 Wireless LAN Adapter
 product AIRONET PCI350         0x0350  PCI350 Wireless LAN Adapter
-product AIRONET MPI350         0xa504  MPI350 Mini-PCI Wireless LAN Adapter
 product AIRONET PC4500         0x4500  PC4500 Wireless LAN Adapter
 product AIRONET PC4800         0x4800  PC4800 Wireless LAN Adapter
+product AIRONET MPI350         0xa504  MPI350 Mini-PCI Wireless LAN Adapter
 
 /* Alacritech products */
 product ALACRITECH SES1001T    0x0005  SES1001T iSCSI Accelerator
@@ -970,9 +970,9 @@
 product AMD F16_MISC   0x1535  Family16h Miscellaneous Configuration
 product AMD F16_RC     0x1536  Family16h Root Complex
 product AMD CRYPTO_COP 0x1537  Cryptographic Coprocessor
-product AMD F16_HB     0x1568  Family16h Host Bridge
 product AMD F16_30_RC  0x1566  Family16h Root Complex
 product AMD F16_30_IOMMU       0x1567  Family16h IOMMU
+product AMD F16_HB     0x1568  Family16h Host Bridge
 product AMD F16_30_HB  0x156b  Family16h Host Bridge
 product AMD F16_30_HT  0x1580  Family16h HyperTransport Configuration
 product AMD F16_30_ADDR        0x1581  Family16h Address Map Configuration
@@ -1085,9 +1085,9 @@
 product AMD RS780_PPB7         0x960b  RS780 PCI-PCIE Bridge (ext gfx port 1)
 
 /* American Megatrends products */
+product AMI MEGARAID3          0x1960  MegaRAID 3
 product AMI MEGARAID           0x9010  MegaRAID
 product AMI MEGARAID2          0x9060  MegaRAID 2
-product AMI MEGARAID3          0x1960  MegaRAID 3
 
 /* Analog Devices products */
 product ANALOG AD1889  0x1889  AD1889 PCI SoundMAX Controller
@@ -1255,6 +1255,8 @@
 product ATI SB200_ISA          0x434c  SB200 PCI-ISA Bridge
 product ATI SB200_MODEM        0x434d  SB200 Modem
 product ATI SB200_SMB          0x4353  SB200 SMBus Controller
+product ATI MACH64_CT          0x4354  Mach64 CT
+product ATI MACH64_CX          0x4358  Mach64 CX
 product ATI IXP_AUDIO_300      0x4361  IXP AC'97 Audio Controller
 product ATI SB300_SMB          0x4363  SB300 SMBus Controller
 product ATI IXP_IDE_300        0x4369  SB300 IXP IDE Controller
@@ -1282,17 +1284,17 @@
 product ATI SB600_USB_OHCI2    0x4389  SB600 USB OHCI2 Controller
 product ATI SB600_USB_OHCI3    0x438a  SB600 USB OHCI3 Controller
 product ATI SB600_USB_OHCI4    0x438b  SB600 USB OHCI4 Controller
-product ATI SB600_AC97_MODEM   0x438e  SB600 AC97 Modem
 product ATI IXP_IDE_600        0x438c  SB600 IXP IDE Controller
 product ATI SB600_PLB_438D     0x438d  SB600 PCI to LPC Bridge
+product ATI SB600_AC97_MODEM   0x438e  SB600 AC97 Modem
 product ATI SB700_SATA_IDE     0x4390  SB700-SB900 SATA Controller (IDE mode)
 product ATI SB700_SATA_AHCI    0x4391  SB700-SB900 SATA Controller (AHCI mode)
 product ATI SB700_SATA_RAID    0x4392  SB700-SB900 RAID SATA Controller
 product ATI SB700_SATA_RAID5   0x4393  SB700-SB900 RAID5 SATA Controller
 product ATI SB700_SATA_FC      0x4394  SB700-SB900 FC SATA Controller
 product ATI SB700_SATA_AHCI2   0x4395  SB700-SB900 SATA Controller (AHCI mode)
+product ATI SB800_SATA         0x4395  SB800/SB900 SATA Controller
 product ATI SB700_USB_EHCI     0x4396  SB700-SB900 USB EHCI Controller
-product ATI SB800_SATA         0x4395  SB800/SB900 SATA Controller
 product ATI SB700_USB_OHCI0    0x4397  SB700-SB900 USB OHCI Controller
 product ATI SB700_USB_OHCI1    0x4398  SB700-SB900 USB OHCI Controller
 product ATI SB700_USB_OHCI2    0x4399  SB700-SB900 USB OHCI Controller
@@ -1302,8 +1304,6 @@
 product ATI SB700_PCIE1                0x43a1  SB700-SB900 PCI to PCI bridge (PCIe 1)
 product ATI SB900_PCIE2                0x43a2  SB900 PCI to PCI bridge (PCIe 2)
 product ATI SB900_PCIE3                0x43a3  SB900 PCI to PCI bridge (PCIe 3)
-product ATI MACH64_CT          0x4354  Mach64 CT
-product ATI MACH64_CX          0x4358  Mach64 CX
 product ATI RADEON_RS250_D7    0x4437  Radeon Mobility 7000 IGP
 product ATI RAGE_PRO_AGP       0x4742  3D Rage Pro (AGP)
 product ATI RAGE_PRO_AGP1X     0x4744  3D Rage Pro (AGP 1x)
@@ -1366,7 +1366,7 @@
 product ATI RADEON_R360_NJ     0x4e4a  Radeon 9800XT NJ
 product ATI RADEON_R350_NK     0x4e4b  FireGL X2 NK
 product ATI RADEON_RV350_NP    0x4e50  Radeon Mobility 9600/9700 (M10/11) NP
-product ATI RADEON_RV350_NQ    0x4e41  Radeon Mobility 9600 (M10) NQ
+product ATI RADEON_RV350_NQ    0x4e51  Radeon Mobility 9600 (M10) NQ
 product ATI RADEON_RV350_NR    0x4e52  Radeon Mobility 9600 (M11) NR
 product ATI RADEON_RV350_NS    0x4e53  Radeon Mobility 9600 (M10) NS
 product ATI RADEON_RV350_NT    0x4e54  FireGL Mobility T2 (M10) NT
@@ -1565,12 +1565,12 @@
 
 /* Applied Micro Circuts products */
 product AMCIRCUITS S5933       0x4750  S5933 PCI Matchmaker
+product AMCIRCUITS S5920       0x5920  S5920 PCI Target
 product AMCIRCUITS LANAI       0x8043  Myrinet LANai Interface
 product AMCIRCUITS CAMAC       0x812d  FZJ/ZEL CAMAC Controller
 product AMCIRCUITS VICBUS      0x812e  FZJ/ZEL VICBUS Interface
 product AMCIRCUITS PCISYNC     0x812f  FZJ/ZEL Synchronisation Module
 product AMCIRCUITS ADDI7800    0x818e  ADDI-DATA APCI-7800 8-port Serial
-product AMCIRCUITS S5920       0x5920  S5920 PCI Target
 
 /* ASPEED Technology products */
 product ASPEED AST1150         0x1150  AST1150 PCIe-to-PCI bridge
@@ -1606,8 +1606,8 @@
 product ATHEROS QCA988X                0x003c QCA986x/988x Wireless LAN
 product ATHEROS AR5201_AP      0x0207 AR5201 Wireless LAN Reference Card (Early AP11)
 product ATHEROS AR5201_DEFAULT 0x1107 AR5201 Wireless LAN (no eeprom)
+product ATHEROS AR5211_DEFAULT 0x1112 AR5211 Wireless LAN (no eeprom)
 product ATHEROS AR5212_DEFAULT 0x1113 AR5212 Wireless LAN (no eeprom)
-product ATHEROS AR5211_DEFAULT 0x1112 AR5211 Wireless LAN (no eeprom)
 product ATHEROS AR5212_FPGA    0xf013 AR5212 Wireless LAN Reference Card (emulation board)
 product ATHEROS AR5211_FPGA11B 0xf11b AR5211 Wireless LAN Reference Card (11b emulation board)
 product ATHEROS AR5211_LEGACY  0xff12 AR5211 Wireless LAN Reference Card (original emulation board)
@@ -1631,9 +1631,9 @@
 product CCUBE CINEMASTER       0x8888  Cinemaster C 3.0 DVD Decoder
 
 /* AVM products */
+product AVM B1                 0x0700  Basic Rate B1 ISDN Interface
 product AVM FRITZ_CARD         0x0a00  Fritz! Card ISDN Interface
 product AVM FRITZ_PCI_V2_ISDN  0x0e00  Fritz!PCI v2.0 ISDN Interface
-product AVM B1                 0x0700  Basic Rate B1 ISDN Interface
 product AVM T1                 0x1200  Primary Rate T1 ISDN Interface
 
 /* AWT products */
@@ -1884,7 +1884,6 @@
 
 /* Inclusion of 'A' in the following entry is probably wrong. */
 /* No data on the CMD Tech. web site for the following as of Mar. 3 '98 */
-product CMDTECH 240            0x0240  Sil240 SATALink
 product CMDTECH 650A           0x0650  PCI0650A
 product CMDTECH 670            0x0670  USB0670
 product CMDTECH 673            0x0673  USB0673
@@ -1915,6 +1914,7 @@
 /* Compaq products */
 product COMPAQ PCI_EISA_BRIDGE 0x0001  PCI-EISA Bridge
 product COMPAQ PCI_ISA_BRIDGE  0x0002  PCI-ISA Bridge
+product COMPAQ CSA64XX         0x0046  Smart Array 64xx
 product COMPAQ TRIFLEX1                0x1000  Triflex Host-PCI Bridge
 product COMPAQ TRIFLEX2                0x2000  Triflex Host-PCI Bridge
 product COMPAQ QVISION_V0      0x3032  QVision
@@ -1931,28 +1931,27 @@
 product COMPAQ CSA6400         0x409c  Smart Array 6400
 product COMPAQ CSA6400EM       0x409d  Smart Array 6400 EM
 product COMPAQ CSA6422         0x409e  Smart Array 6422
-product COMPAQ CSA64XX         0x0046  Smart Array 64xx
 product COMPAQ USB             0x7020  USB Controller
 product COMPAQ ASMC            0xa0f0  Advanced Systems Management Controller
 /* MediaGX Cx55x0 built-in OHCI seems to have this ID */
 product COMPAQ USB_MEDIAGX     0xa0f8  USB Controller
 product COMPAQ SMART2P         0xae10  SMART2P RAID
 product COMPAQ N100TX          0xae32  Netelligent 10/100 TX
-product COMPAQ N10T2           0xb012  Netelligent 10 T/2 UTP/Coax
-product COMPAQ INT100TX                0xb030  Integrated Netelligent 10/100 TX
 product COMPAQ N10T            0xae34  Netelligent 10 T
 product COMPAQ IntNF3P         0xae35  Integrated NetFlex 3/P
 product COMPAQ DPNet100TX      0xae40  Dual Port Netelligent 10/100 TX
 product COMPAQ IntPL100TX      0xae43  ProLiant Integrated Netelligent 10/100 TX
 product COMPAQ DP4000          0xb011  Deskpro 4000 5233MMX
+product COMPAQ N10T2           0xb012  Netelligent 10 T/2 UTP/Coax
+product COMPAQ INT100TX                0xb030  Integrated Netelligent 10/100 TX
 product COMPAQ CSA5300_2       0xb060  Smart Array 5300 rev. 2
 product COMPAQ PRESARIO56XX    0xb0b8  Presario 56xx
 product COMPAQ M700            0xb112  Armada M700
 product COMPAQ CSA5i_2         0xb178  Smart Array 5i/532 rev. 2
 product COMPAQ ILO_1           0xb203  iLO
 product COMPAQ ILO_2           0xb204  iLO
+product COMPAQ NF3P            0xf130  NetFlex 3/P
 product COMPAQ NF3P_BNC                0xf150  NetFlex 3/P w/ BNC
-product COMPAQ NF3P            0xf130  NetFlex 3/P
 
 /* Compex products - XXX better descriptions */
 product COMPEX NE2KETHER       0x1401  Ethernet
@@ -1987,9 +1986,9 @@
 product COMTROL ROCKETPORT5508B        0x8019  RocketPort 550/8 part B
 
 /* Conexant Systems products */
-product CONEXANT SOFTK56       0x2443  SoftK56 PCI Software Modem
 product CONEXANT 56KFAXMODEM   0x1085  HW 56K Fax Modem
 product CONEXANT LANFINITY     0x1803  LANfinity MiniPCI 10/100 Ethernet
+product CONEXANT SOFTK56       0x2443  SoftK56 PCI Software Modem
 product CONEXANT CX2388X       0x8800  CX23880/1/2/3 PCI Video/Audio Decoder
 product CONEXANT CX2388XAUDIO  0x8801  CX23880/1/2/3 PCI Audio Port
 product CONEXANT CX2388XMPEG   0x8802  CX23880/1/2/3 PCI MPEG Port
@@ -2099,13 +2098,13 @@
 product DELL PERC_3DI_3_SUB    0x0106  PERC 3/Di
 product DELL PERC_3DI_3_SUB2   0x011b  PERC 3/Di
 product DELL PERC_3DI_3_SUB3   0x0121  PERC 3/Di
+product DELL CERC_1_5          0x0291  CERC SATA RAID 1.5/6ch
 product DELL PERC_5_1          0x1f01  PERC 5/e
 product DELL PERC_5_2          0x1f02  PERC 5/i
-product DELL CERC_1_5          0x0291  CERC SATA RAID 1.5/6ch
 
 /* Delta products */
+product DELTA RHINEII  0x1320  Rhine II 10/100 Ethernet
 product DELTA 8139     0x1360  8139 Ethernet
-product DELTA RHINEII  0x1320  Rhine II 10/100 Ethernet
 
 /* Diamond products */
 product DIAMOND VIPER  0x9001  Viper/PCI
@@ -2131,11 +2130,11 @@
 product DLINK DGE530T          0x4c00  DGE-530T Gigabit Ethernet
 
 /* Distributed Processing Technology products */
+product DPT MEMCTLR    0x1012  Memory Controller
 product DPT SC_RAID    0xa400  SmartCache/SmartRAID (EATA)
 product DPT I960_PPB   0xa500  PCI-PCI Bridge
 product DPT RAID_I2O   0xa501  SmartRAID (I2O)
 product DPT RAID_2005S 0xa511  Zero Channel SmartRAID (I2O)
-product DPT MEMCTLR    0x1012  Memory Controller
 
 /* Dolphin products */
 product DOLPHIN PCISCI32       0x0658  PCI-SCI Bridge (32-bit, 33 MHz)
@@ -2185,8 +2184,8 @@
 product ENE CB720      0x1421  CB720 CardBus Controller
 
 /* Ensoniq products */
+product ENSONIQ AUDIOPCI97     0x1371  AudioPCI 97
 product ENSONIQ AUDIOPCI       0x5000  AudioPCI
-product ENSONIQ AUDIOPCI97     0x1371  AudioPCI 97
 product ENSONIQ CT5880         0x5880  CT5880
 



Home | Main Index | Thread Index | Old Index