Update.

diff --git a/oui.txt b/oui.txt
index e3ca30992c7e6c570f9a80ba9d15a388c31b4f0f..36a6f4799ebd6395f74d0f064ea4c33e910d00df 100644 (file)
--- a/oui.txt
+++ b/oui.txt
@@ -644,7 +644,7 @@
 
   00-00-64   (hex)             Yokogawa Electric Corporation
   000064     (base 16)         Yokogawa Electric Corporation
-                               9-2-32 Nakacho Musashino-Shi
+                               2-9-32 Nakacho Musashino-shi
                                Tokyo
                                180-8750
                                JAPAN
@@ -69869,6 +69869,13 @@
                                Shenzhen Guangdong 518057
                                CHINA
 
+  00-6B-8E   (hex)             Shanghai Feixun Communication Co.,Ltd.
+  006B8E     (base 16)         Shanghai Feixun Communication Co.,Ltd.
+                               Building 90,No,4855,Guangfulin Road
+                               ,Songjiang District
+                               Shanghai 201616
+                               CHINA
+
   00-6B-9E   (hex)             VIZIO Inc
   006B9E     (base 16)         VIZIO Inc
                                39 Tesla
@@ -82174,6 +82181,12 @@
                                Kobe Hyogo 6500047
                                JAPAN
 
+  08-3D-88   (hex)             Samsung Electronics Co.,Ltd
+  083D88     (base 16)         Samsung Electronics Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   08-3E-0C   (hex)             ARRIS Group, Inc.
   083E0C     (base 16)         ARRIS Group, Inc.
                                3871 Lakfield Drive
@@ -82213,12 +82226,6 @@
                                New Taipei city  23504
                                TAIWAN, PROVINCE OF CHINA
 
-  08-49-29   (hex)             CYBATI
-  084929     (base 16)         CYBATI
-                               1701 East Empire Street, Suite 360
-                               Bloomington IL 61704
-                               UNITED STATES
-
   08-4E-1C   (hex)             H2A Systems, LLC
   084E1C     (base 16)         H2A Systems, LLC
                                7545 Irvine Center Drive
@@ -83000,6 +83007,13 @@
                                Kulim Kedah 09000
                                MALAYSIA
 
+  0C-8C-8F   (hex)             Kamo Technology Limited
+  0C8C8F     (base 16)         Kamo Technology Limited
+                               Room 1502, 15/F., Yue Xiu Building,
+                               160-174 Lockhart Road,
+                               Wanchai Hong Kong 160-174
+                               CHINA
+
   0C-8C-DC   (hex)             Suunto Oy
   0C8CDC     (base 16)         Suunto Oy
                                Valimotie 7
@@ -84387,6 +84401,12 @@
                                Xiamen Fujian 361006
                                CHINA
 
+  14-A3-64   (hex)             Samsung Electronics Co.,Ltd
+  14A364     (base 16)         Samsung Electronics Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   14-A6-2C   (hex)             S.M. Dezac S.A.
   14A62C     (base 16)         S.M. Dezac S.A.
                                Vial Sant jordi S/N
@@ -86273,6 +86293,13 @@
                                MONTEVIALE VICENZA 36050
                                ITALY
 
+  20-93-4D   (hex)             Fujian Star-net Communication Co., Ltd
+  20934D     (base 16)         Fujian Star-net Communication Co., Ltd
+                               19-22# Building,,Star-net Science Plaza
+                               Juyuanzhou, 618 Jinshan Road
+                               Fuzhou Fujian 350002
+                               CHINA
+
   20-9A-E9   (hex)             Volacomm Co., Ltd
   209AE9     (base 16)         Volacomm Co., Ltd
                                15F-6., No.7, Sec.3, New Taipei Blvd., Xinzhuang Dist., New Taipei City 242., Taiwan (R.O.C)
@@ -87018,6 +87045,12 @@
                                Qingdao Shandong 266510
                                CHINA
 
+  24-E3-14   (hex)             Apple
+  24E314     (base 16)         Apple
+                               1 Infinite Loop
+                               Cupertino CA 95014
+                               UNITED STATES
+
   24-E6-BA   (hex)             JSC Zavod im. Kozitsky
   24E6BA     (base 16)         JSC Zavod im. Kozitsky
                                Bld. 70, 5th line, V.O,
@@ -88256,6 +88289,12 @@
                                Shenzhen Guangdong 518067
                                CHINA
 
+  2C-AB-A4   (hex)             Cisco SPVTG
+  2CABA4     (base 16)         Cisco SPVTG
+                               5030 Sugarloaf Parkway
+                               Lawrenceville GA 30044
+                               UNITED STATES
+
   2C-B0-5D   (hex)             NETGEAR
   2CB05D     (base 16)         NETGEAR
                                350 EAST PLUMERIA DRIVE
@@ -88522,6 +88561,12 @@
                                Seongnam Kyonggi-do 462-120
                                KOREA, REPUBLIC OF
 
+  30-33-35   (hex)             Boosty
+  303335     (base 16)         Boosty
+                               40 Princes Street
+                               Ipswich Suffolk IP11RJ
+                               UNITED KINGDOM
+
   30-37-A6   (hex)             CISCO SYSTEMS, INC.
   3037A6     (base 16)         CISCO SYSTEMS, INC.
                                170 W. TASMAN DRIVE
@@ -89437,6 +89482,12 @@
                                Waterloo Ontario N2L 3W8
                                CANADA
 
+  34-BB-26   (hex)             Motorola Mobility LLC
+  34BB26     (base 16)         Motorola Mobility LLC
+                               222 Merchandise Mart Plaza, Suite 1800
+                               Chicago IL 60654
+                               UNITED STATES
+
   34-BC-A6   (hex)             Beijing Ding Qing Technology, Ltd.
   34BCA6     (base 16)         Beijing Ding Qing Technology, Ltd.
                                218 Han Tai Hua Office Building, 13 Huan Yuan Lu,
@@ -89620,6 +89671,12 @@
                                Chiyoda-ku Tokyo 100-8019
                                JAPAN
 
+  34-F0-CA   (hex)             Shenzhen Linghangyuan Digital Technology Co.,Ltd.
+  34F0CA     (base 16)         Shenzhen Linghangyuan Digital Technology Co.,Ltd.
+                               Building R, Linghangyuan Industrial Park, No. 163 Banxuegang Road, Longgang Distrial, Shenzhen, China
+                               Shenzhen Guangdong 518129
+                               CHINA
+
   34-F3-9B   (hex)             WizLAN Ltd.
   34F39B     (base 16)         WizLAN Ltd.
                                P.O.Box 7948
@@ -89720,6 +89777,13 @@
                                Oulu Ou 90450
                                FINLAND
 
+  38-1C-1A   (hex)             Cisco
+  381C1A     (base 16)         Cisco
+                               170 West Tasman Drive
+                               SJCM/2
+                               San Jose CA 95134
+                               UNITED STATES
+
   38-1C-4A   (hex)             SIMCom Wireless Solutions Co.,Ltd.
   381C4A     (base 16)         SIMCom Wireless Solutions Co.,Ltd.
                                Building A,SIM Technology Building,No.633,Jinzhong Road,
@@ -90772,6 +90836,13 @@
                                Houston Texas 77070
                                UNITED STATES
 
+  3C-D9-CE   (hex)             Eclipse WiFi
+  3CD9CE     (base 16)         Eclipse WiFi
+                               68 S Service Rd
+                               Suite 100
+                               Melville NY 11747
+                               UNITED STATES
+
   3C-DF-1E   (hex)             CISCO SYSTEMS, INC.
   3CDF1E     (base 16)         CISCO SYSTEMS, INC.
                                170 W. TASMAN DRIVE
@@ -92186,6 +92257,13 @@
                                Huizhou Guangdong 516029
                                CHINA
 
+  48-0C-49   (hex)             NAKAYO TELECOMMUNICATIONS,INC
+  480C49     (base 16)         NAKAYO TELECOMMUNICATIONS,INC
+                               165
+                               Higashiomuro-machi
+                               Maebashi-shi Gunma 379-2105
+                               JAPAN
+
   48-12-49   (hex)             Luxcom Technologies Inc.
   481249     (base 16)         Luxcom Technologies Inc.
                                102 Walgreen Road
@@ -95432,6 +95510,13 @@
                                Lund  22181
                                SWEDEN
 
+  5C-B8-CB   (hex)             Allis Communications
+  5CB8CB     (base 16)         Allis Communications
+                               10F.-3,No.31-1, Lane 169 Kangning St.,
+                               Xizhi Dist.,
+                               New Taipei City 221
+                               TAIWAN, PROVINCE OF CHINA
+
   5C-BD-9E   (hex)             HONGKONG MIRACLE EAGLE TECHNOLOGY(GROUP) LIMITED
   5CBD9E     (base 16)         HONGKONG MIRACLE EAGLE TECHNOLOGY(GROUP) LIMITED
                                FLAT RM 2103,  EASEY COMMERCIAL BLDG,253-261 HENNESSY RD,
@@ -95930,6 +96015,12 @@
                                Morgan Hill CA 95037
                                UNITED STATES
 
+  60-77-E2   (hex)             Samsung Electronics Co.,Ltd
+  6077E2     (base 16)         Samsung Electronics Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   60-81-2B   (hex)             Custom Control Concepts
   60812B     (base 16)         Custom Control Concepts
                                6020 S 190th ST
@@ -98678,6 +98769,12 @@
                                KUNSHAN SUZHOU 215300
                                CHINA
 
+  70-5B-2E   (hex)             M2Communication Inc.
+  705B2E     (base 16)         M2Communication Inc.
+                               Room 12, 18F., No.65, Gaotie 7th Road
+                               Zhubei City Hsinchu County 302
+                               TAIWAN, PROVINCE OF CHINA
+
   70-5C-AD   (hex)             Konami Gaming Inc
   705CAD     (base 16)         Konami Gaming Inc
                                585 Trade Center Drive
@@ -99710,6 +99807,12 @@
                                Beijing China 100089
                                CHINA
 
+  74-F4-13   (hex)             Maxwell Forest
+  74F413     (base 16)         Maxwell Forest
+                               Level 2, 51 Murray Street
+                               Pyrmont NSW 2009
+                               AUSTRALIA
+
   74-F6-12   (hex)             ARRIS Group, Inc.
   74F612     (base 16)         ARRIS Group, Inc.
                                3871 Lakefield Drive
@@ -101846,7 +101949,7 @@
   80D21D     (base 16)         AzureWave Technologies, Inc
                                8F., No. 94, Baozhong Rd.
                                Sindian Dist.
-                               New Taipei City Taiwan 231
+                               New Taipei City  231
                                TAIWAN, PROVINCE OF CHINA
 
   80-D4-33   (hex)             LzLabs GmbH
@@ -104380,6 +104483,13 @@
                                San Jose CA 95129-5034
                                UNITED STATES
 
+  90-DA-6A   (hex)             MCC System Co., Ltd.
+  90DA6A     (base 16)         MCC System Co., Ltd.
+                               #113, Doosan Venture Digm, 126-1
+                               Pyeongchon-Dong, Dongan-Gu,
+                               Anyang Gyeonggi-Do 431-755
+                               KOREA, REPUBLIC OF
+
   90-DB-46   (hex)             E-LEAD ELECTRONIC CO., LTD
   90DB46     (base 16)         E-LEAD ELECTRONIC CO., LTD
                                NO.37, GUNGDUNG 1ST RD.
@@ -106318,6 +106428,13 @@
                                Waiblingen Baden-Württemberg 71332
                                GERMANY
 
+  A0-06-27   (hex)             NEXPA System
+  A00627     (base 16)         NEXPA System
+                               #105, YBS bldg,227-1 Yongdap-Dong
+                               Seongdong-Gu
+                               Seoul ASI/KR/KS013/SEOUL
+                               KOREA, REPUBLIC OF
+
   A0-07-98   (hex)             Samsung Electronics
   A00798     (base 16)         Samsung Electronics
                                #94-1, Imsoo-Dong
@@ -107419,6 +107536,13 @@
                                Lawrenceville GA 30044
                                UNITED STATES
 
+  A4-A4-D3   (hex)             Bluebank Communication Technology Co.Ltd
+  A4A4D3     (base 16)         Bluebank Communication Technology Co.Ltd
+                               No.13-2.Jiang Ying Road,
+                               Nan An District
+                               Chongqing 401336
+                               CHINA
+
   A4-A8-0F   (hex)             Shenzhen Coship Electronics Co., Ltd.
   A4A80F     (base 16)         Shenzhen Coship Electronics Co., Ltd.
                                Rainbow Bldg., North, Hi-Tech Industrial Park, Nanshan District,
@@ -107803,6 +107927,13 @@
                                Wei Fang Shan Dong 261205
                                CHINA
 
+  A8-32-9A   (hex)             Digicom Futuristic Technologies Ltd.
+  A8329A     (base 16)         Digicom Futuristic Technologies Ltd.
+                               406 Mirror Tower, Modi Road, TST
+                               Kowlon
+                               000086
+                               HONG KONG
+
   A8-39-44   (hex)             Actiontec Electronics, Inc
   A83944     (base 16)         Actiontec Electronics, Inc
                                760 North Mary Ave
@@ -107987,6 +108118,12 @@
                                Shenzhen Guang Dong 518057
                                CHINA
 
+  A8-8E-24   (hex)             Apple
+  A88E24     (base 16)         Apple
+                               1 Infinite Loop
+                               Cupertino CA 95014
+                               UNITED STATES
+
   A8-92-2C   (hex)             LG Electronics
   A8922C     (base 16)         LG Electronics
                                60-39 , Kasan-dong, Gumcheon-gu
@@ -109602,6 +109739,12 @@
                                Irvine CA 92614
                                UNITED STATES
 
+  B4-0A-C6   (hex)             DEXON Systems Ltd.
+  B40AC6     (base 16)         DEXON Systems Ltd.
+                               Baross u. 165
+                               Budaors Pest H-2040
+                               HUNGARY
+
   B4-0B-44   (hex)             Smartisan Technology Co., Ltd.
   B40B44     (base 16)         Smartisan Technology Co., Ltd.
                                7/F, Motorola Bldg., 1st Wangjing East Rd,
@@ -110014,6 +110157,12 @@
                                Taoyuan City Taoyuan County 33066
                                TAIWAN, PROVINCE OF CHINA
 
+  B4-AE-6F   (hex)             Circle Reliance, Inc.
+  B4AE6F     (base 16)         Circle Reliance, Inc.
+                               921 Rose Avenue
+                               Menlo Park CA 94025
+                               UNITED STATES
+
   B4-B0-17   (hex)             Avaya, Inc
   B4B017     (base 16)         Avaya, Inc
                                211 Mount Airy Road
@@ -110609,6 +110758,13 @@
                                Shenzhen Guangdong 518040
                                CHINA
 
+  B8-99-19   (hex)             7signal Solutions, Inc
+  B89919     (base 16)         7signal Solutions, Inc
+                               526 S. Main Street
+                               Suite 601G
+                               Akron OH 44311
+                               UNITED STATES
+
   B8-9A-ED   (hex)             OceanServer Technology, Inc
   B89AED     (base 16)         OceanServer Technology, Inc
                                151 Martine St
@@ -112089,6 +112245,12 @@
                                Taipei City  106
                                TAIWAN, PROVINCE OF CHINA
 
+  C0-F2-FB   (hex)             Apple
+  C0F2FB     (base 16)         Apple
+                               1 Infinite Loop
+                               Cupertino CA 95014
+                               UNITED STATES
+
   C0-F7-9D   (hex)             Powercode
   C0F79D     (base 16)         Powercode
                                300 Industrial Dr
@@ -112305,6 +112467,12 @@
                                SAN JOSE CALIFORNIA 95134
                                UNITED STATES
 
+  C4-42-02   (hex)             Samsung Electronics Co.,Ltd
+  C44202     (base 16)         Samsung Electronics Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   C4-43-8F   (hex)             LG Electronics
   C4438F     (base 16)         LG Electronics
                                60-39, Kasan-dong, Gucheon-gu
@@ -112783,6 +112951,12 @@
                                Auckland  1041
                                NEW ZEALAND
 
+  C8-02-10   (hex)             LG Innotek
+  C80210     (base 16)         LG Innotek
+                               Jangduk-dong 978-1
+                               Gwang-ju Gwangsan-gu 506-731
+                               KOREA, REPUBLIC OF
+
   C8-02-58   (hex)             ITW GSE ApS
   C80258     (base 16)         ITW GSE ApS
                                Smedebakken 31-33
@@ -114337,6 +114511,12 @@
                                Taipei  114
                                TAIWAN, PROVINCE OF CHINA
 
+  D0-59-E4   (hex)             Samsung Electronics Co.,Ltd
+  D059E4     (base 16)         Samsung Electronics Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   D0-5A-0F   (hex)             I-BT DIGITAL CO.,LTD
   D05A0F     (base 16)         I-BT DIGITAL CO.,LTD
                                17F.-8, No.866, Zhongzheng Rd., Zhonghe Dist
@@ -117592,6 +117772,12 @@
                                Fort Wayne Indiana 46803
                                UNITED STATES
 
+  E4-5D-52   (hex)             Avaya, Inc
+  E45D52     (base 16)         Avaya, Inc
+                               211 Mount Airy Road
+                               Basking Ridge NJ 07920-2311
+                               UNITED STATES
+
   E4-64-49   (hex)             ARRIS Group, Inc.
   E46449     (base 16)         ARRIS Group, Inc.
                                3871 Lakefield Drive
@@ -118227,6 +118413,12 @@
                                Milano  20144
                                ITALY
 
+  E8-80-2E   (hex)             Apple
+  E8802E     (base 16)         Apple
+                               1 Infinite Loop
+                               Cupertino CA 95014
+                               UNITED STATES
+
   E8-80-D8   (hex)             GNTEK Electronics Co.,Ltd.
   E880D8     (base 16)         GNTEK Electronics Co.,Ltd.
                                Suzhou Industrial Park
@@ -119794,6 +119986,13 @@
                                PISCATAWAY NJ 08854
                                UNITED STATES
 
+  F4-0F-1B   (hex)             Cisco
+  F40F1B     (base 16)         Cisco
+                               170 West Tasman Drive
+                               SJCM/2
+                               San Jose CA 95134
+                               UNITED STATES
+
   F4-0F-9B   (hex)             WAVELINK
   F40F9B     (base 16)         WAVELINK
                                #701, Dongyoung Venture'stel 3rd, 202-4,
@@ -121191,6 +121390,12 @@
                                AnYang-Si, GyeongGi-Do, 431-836
                                KOREA, REPUBLIC OF
 
+  FC-19-10   (hex)             Samsung Electronics Co.,Ltd
+  FC1910     (base 16)         Samsung Electronics Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   FC-19-D0   (hex)             Cloud Vision Networks Technology Co.,Ltd.
   FC19D0     (base 16)         Cloud Vision Networks Technology Co.,Ltd.
                                F/9,Hechuan Building 2016

diff --git a/pci.ids b/pci.ids
index 2ee0cf03e08bea97486bc82f6241321818dbd98b..9572636164d42187fe9cdc5e83fc4bacb96e3980 100644 (file)
--- a/pci.ids
+++ b/pci.ids
@@ -1,8 +1,8 @@
 #
 #      List of PCI ID's
 #
-#      Version: 2014.04.19
-#      Date:    2014-04-19 03:15:01
+#      Version: 2014.04.22
+#      Date:    2014-04-22 03:15:02
 #
 #      Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
 #      PCI ID Project at http://pci-ids.ucw.cz/.
@@ -587,6 +587,7 @@
        1305  Kaveri
        1306  Kaveri
        1307  Kaveri
+       1308  Kaveri HDMI/DP Audio Controller
        1309  Kaveri [Radeon R7 Graphics]
        130a  Kaveri [Radeon R6 Graphics]
        130b  Kaveri [Radeon R4 Graphics]
@@ -1454,6 +1455,7 @@
                174b a240  Radeon R7 240 OEM
                1b0a 90d3  Radeon R7 240 OEM
        6613  Oland PRO [Radeon R7 240]
+               1682 7240  R7 240 2048 MB
        6620  Mars
        6621  Mars PRO
        6623  Mars
@@ -3626,6 +3628,15 @@
        1417  Family 15h (Models 10h-1fh) Processor Root Port
        1418  Family 15h (Models 10h-1fh) Processor Root Port
        1419  Family 15h (Models 10h-1fh) I/O Memory Management Unit
+       141a  Family 15h (Models 30h-3fh) Processor Function 0
+       141b  Family 15h (Models 30h-3fh) Processor Function 1
+       141c  Family 15h (Models 30h-3fh) Processor Function 2
+       141d  Family 15h (Models 30h-3fh) Processor Function 3
+       141e  Family 15h (Models 30h-3fh) Processor Function 4
+       141f  Family 15h (Models 30h-3fh) Processor Function 5
+       1422  Family 15h (Models 30h-3fh) Processor Root Complex
+       1423  Family 15h (Models 30h-3fh) I/O Memory Management Unit
+       1426  Family 15h (Models 30h-3fh) Processor Root Port
        1439  Family 16h Processor Functions 5:1
        1510  Family 14h Processor Root Complex
                174b 1001  PURE Fusion Mini
@@ -9479,6 +9490,7 @@
        8111  Twist3 Frame Grabber
 10ec  Realtek Semiconductor Co., Ltd.
        0139  RTL-8139/8139C/8139C+ Ethernet Controller
+       5208  RTS5208 PCI Express Card Reader
        5209  RTS5209 PCI Express Card Reader
        5227  RTS5227 PCI Express Card Reader
                17aa 220e  ThinkPad T440p
@@ -9488,7 +9500,7 @@
                103c 194e  ProBook 455 G1 Notebook
        5249  RTS5249 PCI Express Card Reader
                103c 1909  ZBook 15
-       5288  Barossa PCI Express Card Reader
+       5288  RTS5288 PCI Express Card Reader
        8029  RTL-8029(AS)
                10b8 2011  EZ-Card (SMC1208)
                10ec 8029  RTL-8029(AS)
@@ -10849,6 +10861,7 @@
                1894 0023  TVStation DVB-C plus
        7160  SAA7160
                1458 9009  E8000 DVB-T/Analog TV/FM tuner
+               1461 1455  AVerTV Hybrid Speedy PCI-E (H788)
        7162  SAA7162
                11bd 0101  Pinnacle PCTV 7010iX TV Card
        7164  SAA7164
@@ -11701,6 +11714,7 @@
        2a41  88W8366 [TopDog] 802.11n Wireless
        2a42  88W8366 [TopDog] 802.11n Wireless
        2a43  88W8366 [TopDog] 802.11n Wireless
+       2a55  88W8864 [Avastar] 802.11ac Wireless
        2b36  88W8764 [Avastar] 802.11n Wireless
        4101  OLPC Cafe Controller Secure Digital Controller
        4320  88E8001 Gigabit Ethernet Controller