Update. hwids-20150118
authorDiego Elio Pettenò <flameeyes@flameeyes.eu>
Sun, 18 Jan 2015 15:56:39 +0000 (07:56 -0800)
committerDiego Elio Pettenò <flameeyes@flameeyes.eu>
Sun, 18 Jan 2015 15:56:39 +0000 (07:56 -0800)
iab.txt
oui.txt
pci.ids
udev/60-keyboard.hwdb
udev/70-mouse.hwdb
usb.ids

diff --git a/iab.txt b/iab.txt
index 368f1c3e22c7e7999a95c0fab907d57a4d0a0d3a..e1d5d9dec3e227f6116c1963aeae752dc9112d25 100644 (file)
--- a/iab.txt
+++ b/iab.txt
@@ -1,4 +1,4 @@
-  Generated: Tue, 13 Jan 2015 15:06:13 -0500
+  Generated: Sun, 18 Jan 2015 06:00:02 -0500
 
   OUI                          Organization
   IAB Range                            Organization
diff --git a/oui.txt b/oui.txt
index c16d648f31d92c10ed6dc280c6f7b74cd994ea9e..d2e730c03095f2f39bee8708e2d6af146704289e 100644 (file)
--- a/oui.txt
+++ b/oui.txt
@@ -1,4 +1,4 @@
-  Generated: Tue, 13 Jan 2015 15:06:13 -0500\r
+  Generated: Sun, 18 Jan 2015 06:00:02 -0500\r
 \r
   OUI/MA-L                     Organization\r
   company_id                   Organization\r
 \r
   00-01-25   (hex)             YAESU MUSEN CO., LTD.\r
   000125     (base 16)         YAESU MUSEN CO., LTD.\r
-                               4-8-8, Nakameguro\r
-                               Meguro-ku,\r
-                               Tokyo, 153-8644  \r
+                               Tennozu Parkside Building\r
+                               2-5-8, Higashi-Shinagawa\r
+                               Shinagawa-ku, Tokyo 140-0002  \r
                                JAPAN\r
 \r
   00-01-26   (hex)             PAC Labs\r
                                Xiamen Fujian 361006\r
                                CHINA\r
 \r
+  1C-C5-86   (hex)             Absolute Acoustics\r
+  1CC586     (base 16)         Absolute Acoustics\r
+                               Av. Corifeu de Azevedo Marques, 1703\r
+                               Sao Paulo Sao Paulo 05581-001\r
+                               BRAZIL\r
+\r
   1C-C6-3C   (hex)             Arcadyan Technology Corporation\r
   1CC63C     (base 16)         Arcadyan Technology Corporation\r
                                4F., No.9 , Park Avenue II\r
                                Taipei  114\r
                                TAIWAN, PROVINCE OF CHINA\r
 \r
+  34-0A-22   (hex)             TOP-ACCESS ELECTRONICS CO LTD\r
+  340A22     (base 16)         TOP-ACCESS ELECTRONICS CO LTD\r
+                               Bldg 2# MinXing Industrial Park ,MinKang  rd ,MingZhi Street BaoAn District,Shenzhen ,China\r
+                               shenzhen guangdong 518131\r
+                               CHINA\r
+\r
   34-0A-FF   (hex)             Qingdao Hisense Communications Co.,Ltd\r
   340AFF     (base 16)         Qingdao Hisense Communications Co.,Ltd\r
                                218 Qian wan gang Road Economic & Technological cevelopment Zone\r
                                SAN JOSE CA 95134-1706\r
                                UNITED STATES\r
 \r
+  3C-DF-A9   (hex)             ARRIS Group, Inc.\r
+  3CDFA9     (base 16)         ARRIS Group, Inc.\r
+                               6450 Sequence Drive\r
+                               San Diego CA 92121\r
+                               UNITED STATES\r
+\r
   3C-DF-BD   (hex)             Huawei Technologies Co., Ltd\r
   3CDFBD     (base 16)         Huawei Technologies Co., Ltd\r
                                Building 17,Nangang Industrial Park,\r
                                Lund Sk 22370\r
                                SWEDEN\r
 \r
+  54-65-DE   (hex)             ARRIS Group, Inc.\r
+  5465DE     (base 16)         ARRIS Group, Inc.\r
+                               6450 Sequence Drive\r
+                               San Diego CA 92121\r
+                               UNITED STATES\r
+\r
   54-72-4F   (hex)             Apple\r
   54724F     (base 16)         Apple\r
                                1 Infinite Loop\r
                                Changsha Hunan 410205\r
                                CHINA\r
 \r
+  54-B8-0A   (hex)             D-Link International\r
+  54B80A     (base 16)         D-Link International\r
+                               1 Internal Business Park, #03-12,\r
+                               The Synergy\r
+                               609917\r
+                               SINGAPORE\r
+\r
   54-BE-F7   (hex)             PEGATRON CORPORATION\r
   54BEF7     (base 16)         PEGATRON CORPORATION\r
                                No. 76, Ligong St., Beitou\r
                                San Ramon CA 94583\r
                                UNITED STATES\r
 \r
+  58-04-CB   (hex)             Tianjin Huisun Technology Co.,Ltd.\r
+  5804CB     (base 16)         Tianjin Huisun Technology Co.,Ltd.\r
+                               4/f, Building 3, No 1 Haitai Huake Street (outside Ring Road)\r
+                                Huayuan New Technology Industrial Park,\r
+                               Tianjin 300384\r
+                               CHINA\r
+\r
   58-05-28   (hex)             LABRIS NETWORKS\r
   580528     (base 16)         LABRIS NETWORKS\r
                                Silikon Blok 1 NK 24 Teknokent\r
   58-6E-D6   (hex)             PRIVATE\r
   586ED6     (base 16)          \r
 \r
+  58-70-C6   (hex)             Shanghai Xiaoyi Technology Co., Ltd.\r
+  5870C6     (base 16)         Shanghai Xiaoyi Technology Co., Ltd.\r
+                               Shanghai Zhangjiang hi-tech park of Pudong New Area\r
+                               Chenhui Road No. 88,Building No. 1,Room 303\r
+                               Shanghai Shanghai 200120\r
+                               CHINA\r
+\r
   58-75-21   (hex)             CJSC RTSoft\r
   587521     (base 16)         CJSC RTSoft\r
                                Nikitinskaya str., 3\r
                                Shenzhen Guangdong 518057\r
                                CHINA\r
 \r
+  64-6A-52   (hex)             Avaya, Inc\r
+  646A52     (base 16)         Avaya, Inc\r
+                               211 Mount Airy Road\r
+                               Basking Ridge NJ 07920-2311\r
+                               UNITED STATES\r
+\r
   64-6C-B2   (hex)             Samsung Electronics Co.,Ltd\r
   646CB2     (base 16)         Samsung Electronics Co.,Ltd\r
                                #94-1, Imsoo-Dong\r
                                Singapore 609917\r
                                SINGAPORE\r
 \r
+  6C-1E-70   (hex)             Guangzhou YBDS IT Co.,Ltd\r
+  6C1E70     (base 16)         Guangzhou YBDS IT Co.,Ltd\r
+                               Room 318,3/F,970 Kang Wang Bei Lu,Liwan District,Guangzhou,PRC\r
+                               Guangzhou City Guangdong Province 510170\r
+                               CHINA\r
+\r
   6C-20-56   (hex)             Cisco\r
   6C2056     (base 16)         Cisco\r
                                170 West Tasman Drive\r
                                Shenzhen Guangdong 518055\r
                                CHINA\r
 \r
+  78-5F-4C   (hex)             Argox Information Co., Ltd.\r
+  785F4C     (base 16)         Argox Information Co., Ltd.\r
+                               7F, No.126, Lane 235, Baoqiao Rd., Xindian Dist.\r
+                               New Taipei City Taipei 231\r
+                               TAIWAN, PROVINCE OF CHINA\r
+\r
   78-61-7C   (hex)             MITSUMI ELECTRIC CO.,LTD\r
   78617C     (base 16)         MITSUMI ELECTRIC CO.,LTD\r
                                Tsurumaki\r
                                Taipei  100\r
                                TAIWAN, PROVINCE OF CHINA\r
 \r
+  7C-F8-54   (hex)             Samsung Electronics\r
+  7CF854     (base 16)         Samsung Electronics\r
+                               415, Maetan-3dong, Yeongtong-gu, Suwon-City Gyeonggi-do 443-742\r
+                               Suwon  443-742\r
+                               KOREA, REPUBLIC OF\r
+\r
   7C-FA-DF   (hex)             Apple\r
   7CFADF     (base 16)         Apple\r
                                1 Infinite Loop\r
                                Dallas TX 75243\r
                                UNITED STATES\r
 \r
+  88-33-BE   (hex)             Ivenix, Inc.\r
+  8833BE     (base 16)         Ivenix, Inc.\r
+                               21 Water Street\r
+                               Amesbury MA 01913\r
+                               UNITED STATES\r
+\r
   88-35-4C   (hex)             Transics\r
   88354C     (base 16)         Transics\r
                                p/a Ter Waarde 91\r
                                Melbourne Victoria 3000\r
                                AUSTRALIA\r
 \r
+  8C-F2-28   (hex)             SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.\r
+  8CF228     (base 16)         SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.\r
+                               Mid-Fourth Flr.,Building 28,Cui Xi Fourth Road,Ke Yuan West,Nanshan\r
+                               Shenzhen Guangdong 518057\r
+                               CHINA\r
+\r
   8C-F8-13   (hex)             ORANGE POLSKA\r
   8CF813     (base 16)         ORANGE POLSKA\r
                                AL.JEROZOLIMSKIE 160\r
                                Taipei  23585\r
                                TAIWAN, PROVINCE OF CHINA\r
 \r
+  B0-08-BF   (hex)             Vital Connect, Inc.\r
+  B008BF     (base 16)         Vital Connect, Inc.\r
+                               900 E HAMILTON AVE STE 500\r
+                               CAMPBELL CA 95008-0667\r
+                               UNITED STATES\r
+\r
   B0-09-D3   (hex)             Avizia\r
   B009D3     (base 16)         Avizia\r
                                12018 Sunrise Valley Drive\r
                                Plano Texas 75093\r
                                UNITED STATES\r
 \r
+  C4-9A-02   (hex)             LG Electronics (Mobile Communicaitons)\r
+  C49A02     (base 16)         LG Electronics (Mobile Communicaitons)\r
+                               60-39, Kasan-dong, Kumchon-gu\r
+                               Seoul 153-801\r
+                               KOREA, REPUBLIC OF\r
+\r
   C4-A8-1D   (hex)              D-Link International\r
   C4A81D     (base 16)          D-Link International\r
                                1 Internal Business Park, #03-12\r
                                Denkendorf BW D-73770\r
                                GERMANY\r
 \r
+  C8-3F-B4   (hex)             ARRIS Group, Inc.\r
+  C83FB4     (base 16)         ARRIS Group, Inc.\r
+                               6450 Sequence Drive\r
+                               San Diego CA 92121\r
+                               UNITED STATES\r
+\r
   C8-45-29   (hex)             IMK Networks Co.,Ltd\r
   C84529     (base 16)         IMK Networks Co.,Ltd\r
                                201-Ho jungribjunja, 16-3bunji,\r
                                Cupertino CA 95014\r
                                UNITED STATES\r
 \r
+  C8-E1-30   (hex)             Milkyway Group Ltd\r
+  C8E130     (base 16)         Milkyway Group Ltd\r
+                               RM 405 Tung Ming Building\r
+                               40-42 Des Voeux Road Central\r
+                               Hong Kong Hong Kong 999077\r
+                               HONG KONG\r
+\r
   C8-E1-A7   (hex)             Vertu Corporation Limited\r
   C8E1A7     (base 16)         Vertu Corporation Limited\r
                                Beacon Hill Road\r
                                SAN JOSE CA 95134-1706\r
                                UNITED STATES\r
 \r
+  D4-D7-A9   (hex)             Shanghai Kaixiang Info Tech LTD\r
+  D4D7A9     (base 16)         Shanghai Kaixiang Info Tech LTD\r
+                               A401, NO.509 Caobao Road, Shanghai, PRC\r
+                               Shanghai Shanghai 200233\r
+                               CHINA\r
+\r
   D4-D8-98   (hex)             Korea CNO Tech Co., Ltd\r
   D4D898     (base 16)         Korea CNO Tech Co., Ltd\r
                                #240-1,Uigok-Ri\r
                                Cupertino CA 95014\r
                                UNITED STATES\r
 \r
+  D8-AD-DD   (hex)             Sonavation, Inc.\r
+  D8ADDD     (base 16)         Sonavation, Inc.\r
+                               3970 RCA Blvd.\r
+                               Suite 7003\r
+                               Palm Beach Gardens Florida 33410\r
+                               UNITED STATES\r
+\r
   D8-AE-90   (hex)             Itibia Technologies\r
   D8AE90     (base 16)         Itibia Technologies\r
                                5 Clausen Ct\r
                                Cupertino CA 95014\r
                                UNITED STATES\r
 \r
+  E0-B7-0A   (hex)             ARRIS Group, Inc.\r
+  E0B70A     (base 16)         ARRIS Group, Inc.\r
+                               6450 Sequence Drive\r
+                               San Diego CA 92121\r
+                               UNITED STATES\r
+\r
   E0-B7-B1   (hex)             Pace plc\r
   E0B7B1     (base 16)         Pace plc\r
                                Victoria Road\r
                                Tempe AZ 85283\r
                                UNITED STATES\r
 \r
+  E8-61-BE   (hex)             Melec Inc.\r
+  E861BE     (base 16)         Melec Inc.\r
+                               516-10 Higashiasakawamachi\r
+                               Hachioji Tokyo 193-0834\r
+                               JAPAN\r
+\r
+  E8-66-C4   (hex)             Datawise Systems\r
+  E866C4     (base 16)         Datawise Systems\r
+                               111 N. Market St.\r
+                               Suite 400\r
+                               San Jose California 95113\r
+                               UNITED STATES\r
+\r
   E8-6C-DA   (hex)             Supercomputers and Neurocomputers Research Center\r
   E86CDA     (base 16)         Supercomputers and Neurocomputers Research Center\r
                                2, Chekhov st\r
diff --git a/pci.ids b/pci.ids
index 818695079dc8e89aea9a2d892552c142c6af14a0..7e80d6ab6714e465fea4a175d7cf53b3f2603fab 100644 (file)
--- a/pci.ids
+++ b/pci.ids
@@ -1,8 +1,8 @@
 #
 #      List of PCI ID's
 #
-#      Version: 2015.01.05
-#      Date:    2015-01-05 03:15:01
+#      Version: 2015.01.18
+#      Date:    2015-01-18 03:15:01
 #
 #      Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
 #      PCI ID Project at http://pci-ids.ucw.cz/.
        0e0b  GK106 HDMI Audio Controller
        0e0c  GF114 HDMI Audio Controller
        0e0f  GK208 HDMI/DP Audio Controller
+       0e12  TegraK1 PCIe x4 Bridge
+       0e13  TegraK1 PCIe x1 Bridge
        0e1a  GK110 HDMI Audio
        0e1b  GK107 HDMI Audio Controller
                103c 197b  ZBook 15
                17aa 3697  GeForce 840A
                17aa 3699  GeForce 840A
                17aa 369c  GeForce 840A
+       1346  GM108M [GeForce 930M]
+       1347  GM108M [GeForce 940M]
        1380  GM107 [GeForce GTX 750 Ti]
        1381  GM107 [GeForce GTX 750]
        1382  GM107 [GeForce GTX 745]
-       1389  GM107GL [GRID M3]
+       1389  GM107GL [GRID M30]
        1390  GM107M [GeForce 845M]
        1391  GM107M [GeForce GTX 850M]
                17aa 3697  GeForce GTX 850A
                17aa a125  GeForce GTX 850A
        1392  GM107M [GeForce GTX 860M]
        1393  GM107M [GeForce 840M]
+       1398  GM107M [GeForce 845M]
+       139a  GM107M [GeForce GTX 950M]
+       139b  GM107M [GeForce GTX 960M]
        13b3  GM107GLM [Quadro K2200M]
        13ba  GM107GL [Quadro K2200]
        13bb  GM107GL [Quadro K620]
-       13bd  GM107GL [Tesla M40]
+       13bc  GM107GL [Quadro K1200]
+       13bd  GM107GL [GRID M40]
        13c0  GM204 [GeForce GTX 980]
                1043 8504  GTX980-4GD5
        13c1  GM204
        0010  PCIe Counter Timer
        0011  SIS1100-e single link
        0012  SIS1100-e quad link
+       0015  SIS8100 [Gigabit link, MicroTCA]
 1797  Techwell Inc.
        6801  TW6802 multimedia video card
        6802  TW6802 multimedia other device
        15a1  Ethernet Connection (2) I218-V
        15a2  Ethernet Connection (3) I218-LM
        15a3  Ethernet Connection (3) I218-V
+       15a8  Ethernet Connection X552 Virtual Function
+       15aa  Ethernet Connection X552 10 GbE Backplane
+       15ab  Ethernet Connection X552 10 GbE Backplane
+       15ac  Ethernet Connection X552 10 GbE SFP+
+       15ad  Ethernet Connection X552/X557-AT 10GBASE-T
        15b7  Ethernet Connection (2) I219-LM
        15b8  Ethernet Connection (2) I219-V
        1600  Broadwell-U Host Bridge -OPI
index af0917ee8ea4182541de09a0eed35a27d4046ee6..56fbbb1defa9128db908b2fa4487c9342d05a529 100644 (file)
@@ -800,14 +800,16 @@ keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pnGE70*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svnMicro-Star*:pn*:pvr*
  KEYBOARD_KEY_c2=ejectcd
 
-#
+# some MSI models generate ACPI/input events on the LNXVIDEO input devices,
+# plus some extra synthesized ones on atkbd as an echo of actually changing the
+# brightness; so ignore those atkbd ones, to avoid loops
 keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*U-100*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*U100*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*N033:*
  KEYBOARD_KEY_f7=reserved
  KEYBOARD_KEY_f8=reserved
 
-#
+# MSI Wind U90/U100 generates separate touchpad on/off keycodes so ignore touchpad toggle keycode
 keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pnU90/U100:*
  KEYBOARD_KEY_e4=reserved
 
index a7e9eb2ce8e055007b92b0dcaf00aed1b21be0f3..e23e4f6618284be2b8036c01ccc22fe4c5362533 100644 (file)
 # mouse:usb:v17efp6019:*
 # mouse:*:name:Lenovo Optical USB Mouse:
 #
+# To add local entries, create a new file
+#   /etc/udev/hwdb.d/71-mouse-local.hwdb
+# and add your rules there. To load the new rules execute (as root):
+#   udevadm hwdb --update
+#   udevadm trigger /dev/input/eventXX
+# where /dev/input/eventXX is the mouse in question. If in
+# doubt, simply use /dev/input/event* to reload all input rules.
+#
+# If your changes are generally applicable, open a bug report on
+#   http://bugs.freedesktop.org/enter_bug.cgi?product=systemd
+# and include your new rules, a description of the device, and the
+# output of
+#   udevadm info /dev/input/eventXX
+# (or /dev/input/event*).
+#
+# Allowed properties are:
+#    MOUSE_DPI
+#    MOUSE_WHEEL_CLICK_ANGLE
+#
+#########################################
+#               MOUSE_DPI               #
+#########################################
+#
 # DPI settings are specified as
 #    MOUSE_DPI=<dpi>[@<frequency>]
 #
 # third-party software) must not be entered into this file, use a local
 # hwdb instead.
 #
-# To add local entries, create a new file
-#   /etc/udev/hwdb.d/71-mouse-local.hwdb
-# and add your rules there. To load the new rules execute (as root):
-#   udevadm hwdb --update
-#   udevadm trigger /dev/input/eventXX
-# where /dev/input/eventXX is the mouse in question. If in
-# doubt, simply use /dev/input/event* to reload all input rules.
+#########################################
+#       MOUSE_WHEEL_CLICK_ANGLE         #
+#########################################
+#
+# The angle in degrees per mouse wheel 'click', specified as
+#     MOUSE_WHEEL_CLICK_ANGLE=<degrees>
+#
+# Most mice have a 15 degree click stop (24 clicks per full rotation).
 #
-# If your changes are generally applicable, open a bug report on
-#   http://bugs.freedesktop.org/enter_bug.cgi?product=systemd
-# and include your new rules, a description of the device, and the
-# output of
-#   udevadm info /dev/input/eventXX
-# (or /dev/input/event*).
 
 #
 # Sort by by brand, type (usb, bluetooth), DPI, frequency.
@@ -146,6 +164,7 @@ mouse:usb:v046dpc045:name:Logitech USB-PS/2 Optical Mouse:
 # Logitech Wireless Mouse M325
 mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:400a:
  MOUSE_DPI=600@166
+ MOUSE_WHEEL_CLICK_ANGLE=20
 
 # Logitech MX1000 Laser Cordless Mouse
 mouse:usb:v046dpc50e:name:Logitech USB RECEIVER:
diff --git a/usb.ids b/usb.ids
index 355849a4d84ff2fd43fd919a8a684cae3fcf03df..92db0a8dd64f8490fba767b8d764a8795cbe30c1 100644 (file)
--- a/usb.ids
+++ b/usb.ids
@@ -9,8 +9,8 @@
 #      The latest version can be obtained from
 #              http://www.linux-usb.org/usb.ids
 #
-# Version: 2015.01.07
-# Date:    2015-01-07 12:51:50
+# Version: 2015.01.12
+# Date:    2015-01-12 20:34:06
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -21,7 +21,6 @@
 #              interface  interface_name               <-- two tabs
 
 0001  Fry's Electronics
-       142b  Arbiter Systems, Inc.
        7778  Counterfeit flash drive [Kingston]
 0002  Ingram
 0003  Club Mac