Update.

diff --git a/iab.txt b/iab.txt
index 0b6439c255d4549856edc9642580e168f027a513..bdd8a7013eb7e62f590c1c6b1a868635eab5034f 100644 (file)
--- a/iab.txt
+++ b/iab.txt
@@ -26307,3 +26307,9 @@ FFF000-FFFFFF   (base 16)       MSR-Solutions GmbH
                                Hachioji Tokyo 192-0073
                                JAPAN
 
+40-D8-55       (hex)           Wheatstone Corporation
+07F000-07FFFF  (base 16)       Wheatstone Corporation
+                               600 Industrial Drive
+                               New Bern NC 28562
+                               UNITED STATES
+

diff --git a/oui.txt b/oui.txt
index 2b6c02212ccce899dd2fcaf461e03ad55788d4cc..b79858b4371526dd9b4fafd8fbd9d2de011b1df3 100644 (file)
--- a/oui.txt
+++ b/oui.txt
@@ -80438,6 +80438,13 @@ company_id                     Organization
                                GuangZhou GuangDong 510630
                                CHINA
 
+04-4C-EF   (hex)               Fujian Sanao Technology Co.,Ltd
+044CEF     (base 16)           Fujian Sanao Technology Co.,Ltd
+                               Fuzhou shibei bicyclic road no. 117
+                               blue building three layer
+                               Fuzhou Fujian 350000
+                               CHINA
+
 04-4F-AA   (hex)               Ruckus Wireless
 044FAA     (base 16)           Ruckus Wireless
                                880 West Maude Ave.
@@ -85379,6 +85386,13 @@ company_id                     Organization
                                Beijing 100026
                                CHINA
 
+28-31-52   (hex)               HUAWEI TECHNOLOGIES CO.,LTD
+283152     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD
+                               D1,Huawei Industrial Base
+                               Bantian,Longgang
+                               ShenZhen GuangDong 518129
+                               CHINA
+
 28-34-10   (hex)               Enigma Diagnostics Limited
 283410     (base 16)           Enigma Diagnostics Limited
                                Milton Park Innovation Centre
@@ -96619,6 +96633,13 @@ company_id                     Organization
                                Gumi Gyeongbuk 730-350
                                KOREA, REPUBLIC OF
 
+8C-77-16   (hex)               LONGCHEER TELECOMMUNICATION LIMITED
+8C7716     (base 16)           LONGCHEER TELECOMMUNICATION LIMITED
+                               Building 1,No.401,Caobao Rd
+                               Xuhui District
+                               Shanghai 200233
+                               CHINA
+
 8C-7B-9D   (hex)               Apple, Inc.
 8C7B9D     (base 16)           Apple, Inc.
                                1 Infinite Loop
@@ -97743,6 +97764,12 @@ company_id                     Organization
                                BLACKPOOL LANCASHIRE FY4 2DP
                                UNITED KINGDOM
 
+94-EB-CD   (hex)               Research In Motion Limited
+94EBCD     (base 16)           Research In Motion Limited
+                               295 Phillip Street
+                               Waterloo Ontario N2L3W8
+                               CANADA
+
 94-F6-92   (hex)               Geminico co.,Ltd.
 94F692     (base 16)           Geminico co.,Ltd.
                                #102-1112, Chunui-Technopark, 200-1,
@@ -100547,6 +100574,13 @@ B01408     (base 16)         LIGHTSPEED INTERNATIONAL CO.
                                Hsinchu Not US/Canada 30091
                                TAIWAN, PROVINCE OF CHINA
 
+B0-17-43   (hex)               EDISON GLOBAL CIRCUITS LLC
+B01743     (base 16)           EDISON GLOBAL CIRCUITS LLC
+                               1475  Sawdust Rd
+                               Ste 3108
+                               Spring TX 77380-2974
+                               UNITED STATES
+
 B0-1B-7C   (hex)               Ontrol A.S.
 B01B7C     (base 16)           Ontrol A.S.
                                Turcan Cad No:19 Y.Dudullu
@@ -101395,6 +101429,12 @@ B81413     (base 16)         Keen High Holding(HK) Ltd.
                                Shenzhen Guangdong 518040
                                CHINA
 
+B8-16-19   (hex)               Motorola Mobility, Inc.
+B81619     (base 16)           Motorola Mobility, Inc.
+                               6450 Sequence Drive
+                               San Diego CA 92121
+                               UNITED STATES
+
 B8-17-C2   (hex)               Apple, Inc.
 B817C2     (base 16)           Apple, Inc.
                                1 Infinite Loop
@@ -103729,6 +103769,12 @@ CC0CDA     (base 16)         Miljovakt AS
                                Borre Vestfold 3184
                                NORWAY
 
+CC-0D-EC   (hex)               Cisco SPVTG
+CC0DEC     (base 16)           Cisco SPVTG
+                               5030 Sugarloaf Parkway
+                               Lawrenceville GA 30044
+                               UNITED STATES
+
 CC-14-A6   (hex)               Yichun MyEnergy Domain, Inc
 CC14A6     (base 16)           Yichun MyEnergy Domain, Inc
                                349W. Yuanshan Rd, Yichun
@@ -104458,6 +104504,13 @@ D0BB80     (base 16)         SHL Telemedicine International Ltd.
                                Tel Aviv  67891
                                ISRAEL
 
+D0-BE-2C   (hex)               CNSLink Co., Ltd.
+D0BE2C     (base 16)           CNSLink Co., Ltd.
+                               room 807, Jungang Induspia 5
+                               138-6, Sangdaewon 1-dong, Jungwong-gu
+                               Seongnam Gyeonggi 462-807
+                               KOREA, REPUBLIC OF
+
 D0-C1-B1   (hex)               Samsung Electronics Co.,Ltd
 D0C1B1     (base 16)           Samsung Electronics Co.,Ltd
                                #94-1, Imsoo-Dong
@@ -105627,6 +105680,12 @@ DC1D9F     (base 16)         U & B tech
                                Anyang-Si Gyeonggi-Do 431-061
                                KOREA, REPUBLIC OF
 
+DC-1D-D4   (hex)               Microstep-MIS spol. s r.o.
+DC1DD4     (base 16)           Microstep-MIS spol. s r.o.
+                               Cavojskeho 1
+                               Bratislava  84104
+                               SLOVAKIA
+
 DC-1E-A3   (hex)               Accensus LLC
 DC1EA3     (base 16)           Accensus LLC
                                200 South Wacker Drive
@@ -106608,6 +106667,13 @@ E467BA     (base 16)         Danish Interpretation Systems A/S
                                Copenhagen SV 2450
                                DENMARK
 
+E4-68-A3   (hex)               HUAWEI TECHNOLOGIES CO.,LTD
+E468A3     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD
+                               D1,Huawei Industrial Base
+                               Bantian,Longgang
+                               ShenZhen GuangDong 518129
+                               CHINA
+
 E4-6C-21   (hex)               messMa GmbH
 E46C21     (base 16)           messMa GmbH
                                Am Stadtfeld 8
@@ -109417,6 +109483,13 @@ FCD6BD     (base 16)         Robert Bosch GmbH
                                Leonberg BW 71206
                                GERMANY
 
+FC-DD-55   (hex)               Shenzhen WeWins wireless Co.,Ltd
+FCDD55     (base 16)           Shenzhen WeWins wireless Co.,Ltd
+                               6/F.,B Wing,Yuehai Piaza,Nanhai Road
+                               Nanshan District
+                               Shenzhen Guangdong 518000
+                               CHINA
+
 FC-E1-92   (hex)               Sichuan Jinwangtong Electronic Science&Technology Co,.Ltd
 FCE192     (base 16)           Sichuan Jinwangtong Electronic Science&Technology Co,.Ltd
                                No.28,Xinchuang Rd.,West Gaoxin District

diff --git a/pci.ids b/pci.ids
index 6d556766a6a4cd50497dffc709487fc0963a9f05..62098eac6c943d4b2011ff66c1e7e4bbeef9b887 100644 (file)
--- a/pci.ids
+++ b/pci.ids
@@ -1,8 +1,8 @@
 #
 #      List of PCI ID's
 #
-#      Version: 2013.01.11
-#      Date:    2013-01-11 03:15:02
+#      Version: 2013.01.12
+#      Date:    2013-01-12 03:15:01
 #
 #      Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
 #      PCI ID Project at http://pci-ids.ucw.cz/.
@@ -21,43 +21,23 @@
 #      device  device_name                             <-- single tab
 #              subvendor subdevice  subsystem_name     <-- two tabs
 
-0010  Allied Telesis, Inc
+0010  Allied Telesis, Inc (Wrong ID)
 # This is a relabelled RTL-8139
        8139  AT-2500TX V3 Ethernet
-001a  Ascend Communications, Inc.
 001c  PEAK-System Technik GmbH
        0001  PCAN-PCI CAN-Bus controller
                001c 0004  2 Channel CAN Bus SJC1000
                001c 0005  2 Channel CAN Bus SJC1000 (Optically Isolated)
-0033  Paradyne corp.
 003d  Lockheed Martin-Marietta Corp
 # Real TJN ID is e159, but they got it wrong several times --mj
 0059  Tiger Jet Network Inc. (Wrong ID)
 0070  Hauppauge computer works Inc.
-       0003  WinTV PVR-250
-       0009  WinTV PVR-150
-       0801  WinTV PVR-150
-       0807  WinTV PVR-150
-       4000  WinTV PVR-350
-       4001  WinTV PVR-250 (v1)
-       4009  WinTV PVR-250
-       4800  WinTV PVR-350
-       4801  WinTV PVR-250 MCE
-       4803  WinTV PVR-250
-       7444  WinTV HVR-1600
        7801  WinTV HVR-1800 MCE
-       8003  WinTV PVR-150
-       8801  WinTV PVR-150
-       c108  WinTV-HVR-4400-HD model 1278
-       c801  WinTV PVR-150
-       e807  WinTV PVR-500 MCE (1st tuner)
-       e817  WinTV PVR-500 MCE (2nd tuner)
 0071  Nebula Electronics Ltd.
 0095  Silicon Image, Inc. (Wrong ID)
        0680  Ultra ATA/133 IDE RAID CONTROLLER CARD
 # Wrong ID used in subsystem ID of the TELES.S0/PCI 2.x ISDN adapter
 00a7  Teles AG (Wrong ID)
-00f5  BFG Technologies, Inc.
 0100  Ncipher Corp Ltd
 0123  General Dynamics
 # 018a is not LevelOne but there is a board misprogrammed
@@ -67,18 +47,14 @@
 021b  Compaq Computer Corporation
        8139  HNE-300 (RealTek RTL8139c) [iPaq Networking]
 0270  Hauppauge computer works Inc. (Wrong ID)
-0291  Davicom Semiconductor, Inc.
-       8212  DM9102A(DM9102AE, SM9102AF) Ethernet 100/10 MBit(Rev 40)
 # SpeedStream is Efficient Networks, Inc, a Siemens Company
 02ac  SpeedStream
        1012  1012 PCMCIA 10/100 Ethernet Card [RTL81xx]
-02e0  XFX Pine Group Inc
 0303  Hewlett-Packard Company (Wrong ID)
-0308  ZyXEL Communications Corporation
+0308  ZyXEL Communications Corporation (Wrong ID)
 0315  SK-Electronics Co., Ltd.
-0357  TTTech AG
+0357  TTTech Computertechnik AG (Wrong ID)
        000a  TTP-Monitoring Card V2.0
-036f  Trigem Computer Inc.
 0432  SCM Microsystems, Inc.
        0001  Pluto2 DVB-T Receiver for PCMCIA [EasyWatch MobilSet]
 0675  Dynalink
@@ -656,6 +632,7 @@
                1002 4772  All-in-Wonder 9600 XT
                1043 c002  Radeon 9600 XT TVD
                1043 c01a  A9600XT/TD
+               1462 9510  RX9600XT (MS-8951)
                174b 7c29  Sapphire Radeon 9600XT
                1787 4002  Radeon 9600 XT
        4153  RV350 AS [Radeon 9550]
@@ -1517,6 +1494,7 @@
        5e4d  RV410 [Radeon X700 (PCIE)]
                148c 2116  PowerColor Bravo X700
        5e4f  RV410 [Radeon X700]
+               1569 1e4f  Radeon X550 XT
        5e6b  RV410 [Radeon X700 Pro (PCIE)] (Secondary)
        5e6d  RV410 [Radeon X700 (PCIE)] (Secondary)
                148c 2117  PowerColor Bravo X700
@@ -3160,8 +3138,8 @@
        002a  PowerVR 3D
        002c  Star Alpha 2
        002d  PCI to C-bus Bridge
-       0035  USB
-               1033 0035  Hama USB 2.0 CardBus
+       0035  OHCI USB Controller
+               1033 0035  USB Controller
                103c 1293  USB add-in card
                103c 1294  USB 2.0 add-in card
                1179 0001  USB
@@ -3195,7 +3173,7 @@
                12ee 8011  Root hub
        00ce  uPD72871 [Firewarden] IEEE1394a OHCI 1.0 Link/1-port PHY Controller
        00df  Vr4131
-       00e0  USB 2.0
+       00e0  uPD72010x USB 2.0 Controller
                12ee 7001  Root hub
                14c2 0205  PTI-205N USB 2.0 Host Controller
                1799 0002  Root Hub
@@ -3665,6 +3643,9 @@
        0008  STG 2000X
        0009  STG 1764X
        0010  STG4000 [3D Prophet Kyro Series]
+               104a 4018  ST PowerVR Kyro (64MB AGP TVO)
+               1681 0028  3D Prophet 4000XT
+               1681 c010  3D Prophet 4500 TV-Out
                1681 c069  3D Prophet 4000XT
        0201  STPC Vega Northbridge
        0209  STPC Consumer/Industrial North- and Southbridge
@@ -5694,6 +5675,7 @@
                1092 4a00  Viper V770
                1092 4a02  Viper V770 Ultra
                1092 5a00  RIVA TNT2/TNT2 Pro
+               1092 5a40  Viper V770D AGP
                1092 6a02  Viper V770 Ultra
                1092 7a02  Viper V770 Ultra
                10de 0005  RIVA TNT2 Pro
@@ -5729,12 +5711,14 @@
                1043 0201  AGP-V3800M
                1048 0c3a  Erazor III LT
                1048 0c3b  Erazor III LT
+               107d 2137  WinFast 3D S325
                10de 0006  RIVA TNT2 Model 64/Model 64 Pro
                10de 001e  M64 AGP4x
                1102 1023  CT6892 RIVA TNT2 Value
                1102 1024  CT6932 RIVA TNT2 Value 32Mb
                1102 102c  CT6931 RIVA TNT2 Value [Jumper]
                1462 8808  MSI-8808
+               14af 5620  Gamer Cougar Video Edition
                1554 1041  Pixelview RIVA TNT2 M64
                1569 002d  Palit Microsystems Daytona TNT2 M64
        002e  NV6 [Vanta]
@@ -5752,7 +5736,10 @@
        0040  NV40 [GeForce 6800 Ultra]
        0041  NV40 [GeForce 6800]
                1043 817b  V9999 Gamer Edition
+               107d 2992  WinFast A400
+               1458 310f  Geforce 6800 GV-N6812
        0042  NV40.2 [GeForce 6800 LE]
+               107d 299b  WinFast A400 LE
        0043  NV40.3 [GeForce 6800 XE]
        0044  NV40 [GeForce 6800 XT]
        0045  NV40 [GeForce 6800 GT]
@@ -14759,7 +14746,7 @@
        a101  VigraWATCH PCI
        a102  VigraWATCH PMC
        a103  Vigra I/O
-187e  ZyXEL Communication Corporation
+187e  ZyXEL Communications Corporation
        3403  ZyAir G-110 802.11g
        340e  M-302 802.11g XtremeMIMO
 1885  Avvida Systems Inc.