From 24f24f8d6aa91f186bb22c1b1ae364fa84a30556 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sun, 18 Jan 2015 07:56:39 -0800 Subject: [PATCH] Update. --- iab.txt | 2 +- oui.txt | 146 ++++++++++++++++++++++++++++++++++++++++-- pci.ids | 22 +++++-- udev/60-keyboard.hwdb | 6 +- udev/70-mouse.hwdb | 45 +++++++++---- usb.ids | 5 +- 6 files changed, 199 insertions(+), 27 deletions(-) diff --git a/iab.txt b/iab.txt index 368f1c3..e1d5d9d 100644 --- 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 c16d648..d2e730c 100644 --- a/oui.txt +++ b/oui.txt @@ -1,4 +1,4 @@ - Generated: Tue, 13 Jan 2015 15:06:13 -0500 + Generated: Sun, 18 Jan 2015 06:00:02 -0500 OUI/MA-L Organization company_id Organization @@ -1860,9 +1860,9 @@ 00-01-25 (hex) YAESU MUSEN CO., LTD. 000125 (base 16) YAESU MUSEN CO., LTD. - 4-8-8, Nakameguro - Meguro-ku, - Tokyo, 153-8644 + Tennozu Parkside Building + 2-5-8, Higashi-Shinagawa + Shinagawa-ku, Tokyo 140-0002 JAPAN 00-01-26 (hex) PAC Labs @@ -86550,6 +86550,12 @@ Xiamen Fujian 361006 CHINA + 1C-C5-86 (hex) Absolute Acoustics + 1CC586 (base 16) Absolute Acoustics + Av. Corifeu de Azevedo Marques, 1703 + Sao Paulo Sao Paulo 05581-001 + BRAZIL + 1C-C6-3C (hex) Arcadyan Technology Corporation 1CC63C (base 16) Arcadyan Technology Corporation 4F., No.9 , Park Avenue II @@ -90187,6 +90193,12 @@ Taipei 114 TAIWAN, PROVINCE OF CHINA + 34-0A-22 (hex) TOP-ACCESS ELECTRONICS CO LTD + 340A22 (base 16) TOP-ACCESS ELECTRONICS CO LTD + Bldg 2# MinXing Industrial Park ，MinKang rd ,MingZhi Street BaoAn District,Shenzhen ,China + shenzhen guangdong 518131 + CHINA + 34-0A-FF (hex) Qingdao Hisense Communications Co.,Ltd 340AFF (base 16) Qingdao Hisense Communications Co.,Ltd 218 Qian wan gang Road Economic & Technological cevelopment Zone @@ -92315,6 +92327,12 @@ SAN JOSE CA 95134-1706 UNITED STATES + 3C-DF-A9 (hex) ARRIS Group, Inc. + 3CDFA9 (base 16) ARRIS Group, Inc. + 6450 Sequence Drive + San Diego CA 92121 + UNITED STATES + 3C-DF-BD (hex) Huawei Technologies Co., Ltd 3CDFBD (base 16) Huawei Technologies Co., Ltd Building 17,Nangang Industrial Park, @@ -96143,6 +96161,12 @@ Lund Sk 22370 SWEDEN + 54-65-DE (hex) ARRIS Group, Inc. + 5465DE (base 16) ARRIS Group, Inc. + 6450 Sequence Drive + San Diego CA 92121 + UNITED STATES + 54-72-4F (hex) Apple 54724F (base 16) Apple 1 Infinite Loop @@ -96355,6 +96379,13 @@ Changsha Hunan 410205 CHINA + 54-B8-0A (hex) D-Link International + 54B80A (base 16) D-Link International + 1 Internal Business Park, #03-12, + The Synergy + 609917 + SINGAPORE + 54-BE-F7 (hex) PEGATRON CORPORATION 54BEF7 (base 16) PEGATRON CORPORATION No. 76, Ligong St., Beitou @@ -96531,6 +96562,13 @@ San Ramon CA 94583 UNITED STATES + 58-04-CB (hex) Tianjin Huisun Technology Co.,Ltd. + 5804CB (base 16) Tianjin Huisun Technology Co.,Ltd. + 4/f, Building 3, No 1 Haitai Huake Street (outside Ring Road) + Huayuan New Technology Industrial Park, + Tianjin 300384 + CHINA + 58-05-28 (hex) LABRIS NETWORKS 580528 (base 16) LABRIS NETWORKS Silikon Blok 1 NK 24 Teknokent @@ -96829,6 +96867,13 @@ 58-6E-D6 (hex) PRIVATE 586ED6 (base 16) + 58-70-C6 (hex) Shanghai Xiaoyi Technology Co., Ltd. + 5870C6 (base 16) Shanghai Xiaoyi Technology Co., Ltd. + Shanghai Zhangjiang hi-tech park of Pudong New Area + Chenhui Road No. 88,Building No. 1,Room 303 + Shanghai Shanghai 200120 + CHINA + 58-75-21 (hex) CJSC RTSoft 587521 (base 16) CJSC RTSoft Nikitinskaya str., 3 @@ -99118,6 +99163,12 @@ Shenzhen Guangdong 518057 CHINA + 64-6A-52 (hex) Avaya, Inc + 646A52 (base 16) Avaya, Inc + 211 Mount Airy Road + Basking Ridge NJ 07920-2311 + UNITED STATES + 64-6C-B2 (hex) Samsung Electronics Co.,Ltd 646CB2 (base 16) Samsung Electronics Co.,Ltd #94-1, Imsoo-Dong @@ -100435,6 +100486,12 @@ Singapore 609917 SINGAPORE + 6C-1E-70 (hex) Guangzhou YBDS IT Co.,Ltd + 6C1E70 (base 16) Guangzhou YBDS IT Co.,Ltd + Room 318,3/F,970 Kang Wang Bei Lu,Liwan District,Guangzhou,PRC + Guangzhou City Guangdong Province 510170 + CHINA + 6C-20-56 (hex) Cisco 6C2056 (base 16) Cisco 170 West Tasman Drive @@ -103019,6 +103076,12 @@ Shenzhen Guangdong 518055 CHINA + 78-5F-4C (hex) Argox Information Co., Ltd. + 785F4C (base 16) Argox Information Co., Ltd. + 7F, No.126, Lane 235, Baoqiao Rd., Xindian Dist. + New Taipei City Taipei 231 + TAIWAN, PROVINCE OF CHINA + 78-61-7C (hex) MITSUMI ELECTRIC CO.,LTD 78617C (base 16) MITSUMI ELECTRIC CO.,LTD Tsurumaki @@ -104403,6 +104466,12 @@ Taipei 100 TAIWAN, PROVINCE OF CHINA + 7C-F8-54 (hex) Samsung Electronics + 7CF854 (base 16) Samsung Electronics + 415, Maetan-3dong, Yeongtong-gu, Suwon-City Gyeonggi-do 443-742 + Suwon 443-742 + KOREA, REPUBLIC OF + 7C-FA-DF (hex) Apple 7CFADF (base 16) Apple 1 Infinite Loop @@ -106053,6 +106122,12 @@ Dallas TX 75243 UNITED STATES + 88-33-BE (hex) Ivenix, Inc. + 8833BE (base 16) Ivenix, Inc. + 21 Water Street + Amesbury MA 01913 + UNITED STATES + 88-35-4C (hex) Transics 88354C (base 16) Transics p/a Ter Waarde 91 @@ -107258,6 +107333,12 @@ Melbourne Victoria 3000 AUSTRALIA + 8C-F2-28 (hex) SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD. + 8CF228 (base 16) SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD. + Mid-Fourth Flr.,Building 28,Cui Xi Fourth Road,Ke Yuan West,Nanshan + Shenzhen Guangdong 518057 + CHINA + 8C-F8-13 (hex) ORANGE POLSKA 8CF813 (base 16) ORANGE POLSKA AL.JEROZOLIMSKIE 160 @@ -113309,6 +113390,12 @@ Taipei 23585 TAIWAN, PROVINCE OF CHINA + B0-08-BF (hex) Vital Connect, Inc. + B008BF (base 16) Vital Connect, Inc. + 900 E HAMILTON AVE STE 500 + CAMPBELL CA 95008-0667 + UNITED STATES + B0-09-D3 (hex) Avizia B009D3 (base 16) Avizia 12018 Sunrise Valley Drive @@ -117504,6 +117591,12 @@ Plano Texas 75093 UNITED STATES + C4-9A-02 (hex) LG Electronics (Mobile Communicaitons) + C49A02 (base 16) LG Electronics (Mobile Communicaitons) + 60-39, Kasan-dong, Kumchon-gu + Seoul 153-801 + KOREA, REPUBLIC OF + C4-A8-1D (hex) D-Link International C4A81D (base 16) D-Link International 1 Internal Business Park, #03-12 @@ -117874,6 +117967,12 @@ Denkendorf BW D-73770 GERMANY + C8-3F-B4 (hex) ARRIS Group, Inc. + C83FB4 (base 16) ARRIS Group, Inc. + 6450 Sequence Drive + San Diego CA 92121 + UNITED STATES + C8-45-29 (hex) IMK Networks Co.,Ltd C84529 (base 16) IMK Networks Co.,Ltd 201-Ho jungribjunja, 16-3bunji, @@ -118317,6 +118416,13 @@ Cupertino CA 95014 UNITED STATES + C8-E1-30 (hex) Milkyway Group Ltd + C8E130 (base 16) Milkyway Group Ltd + RM 405 Tung Ming Building + 40-42 Des Voeux Road Central + Hong Kong Hong Kong 999077 + HONG KONG + C8-E1-A7 (hex) Vertu Corporation Limited C8E1A7 (base 16) Vertu Corporation Limited Beacon Hill Road @@ -120660,6 +120766,12 @@ SAN JOSE CA 95134-1706 UNITED STATES + D4-D7-A9 (hex) Shanghai Kaixiang Info Tech LTD + D4D7A9 (base 16) Shanghai Kaixiang Info Tech LTD + A401, NO.509 Caobao Road, Shanghai, PRC + Shanghai Shanghai 200233 + CHINA + D4-D8-98 (hex) Korea CNO Tech Co., Ltd D4D898 (base 16) Korea CNO Tech Co., Ltd #240-1,Uigok-Ri @@ -121274,6 +121386,13 @@ Cupertino CA 95014 UNITED STATES + D8-AD-DD (hex) Sonavation, Inc. + D8ADDD (base 16) Sonavation, Inc. + 3970 RCA Blvd. + Suite 7003 + Palm Beach Gardens Florida 33410 + UNITED STATES + D8-AE-90 (hex) Itibia Technologies D8AE90 (base 16) Itibia Technologies 5 Clausen Ct @@ -122685,6 +122804,12 @@ Cupertino CA 95014 UNITED STATES + E0-B7-0A (hex) ARRIS Group, Inc. + E0B70A (base 16) ARRIS Group, Inc. + 6450 Sequence Drive + San Diego CA 92121 + UNITED STATES + E0-B7-B1 (hex) Pace plc E0B7B1 (base 16) Pace plc Victoria Road @@ -123886,6 +124011,19 @@ Tempe AZ 85283 UNITED STATES + E8-61-BE (hex) Melec Inc. + E861BE (base 16) Melec Inc. + 516-10 Higashiasakawamachi + Hachioji Tokyo 193-0834 + JAPAN + + E8-66-C4 (hex) Datawise Systems + E866C4 (base 16) Datawise Systems + 111 N. Market St. + Suite 400 + San Jose California 95113 + UNITED STATES + E8-6C-DA (hex) Supercomputers and Neurocomputers Research Center E86CDA (base 16) Supercomputers and Neurocomputers Research Center 2, Chekhov st diff --git a/pci.ids b/pci.ids index 8186950..7e80d6a 100644 --- 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 and other volunteers from the # PCI ID Project at http://pci-ids.ucw.cz/. @@ -9437,6 +9437,8 @@ 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 @@ -10019,20 +10021,26 @@ 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 @@ -17672,6 +17680,7 @@ 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 @@ -21163,6 +21172,11 @@ 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 diff --git a/udev/60-keyboard.hwdb b/udev/60-keyboard.hwdb index af0917e..56fbbb1 100644 --- a/udev/60-keyboard.hwdb +++ b/udev/60-keyboard.hwdb @@ -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 diff --git a/udev/70-mouse.hwdb b/udev/70-mouse.hwdb index a7e9eb2..e23e4f6 100644 --- a/udev/70-mouse.hwdb +++ b/udev/70-mouse.hwdb @@ -28,6 +28,29 @@ # 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=[@] # @@ -64,20 +87,15 @@ # 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= +# +# 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 355849a..92db0a8 100644 --- 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 -- 2.25.1