From ebf3e25dbccacfae9775402f16d8c60eca4f603e Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 21 Apr 2015 15:33:14 -0400 Subject: [PATCH] Update data --- oui.txt | 127 ++++++++++++++++++++++++++++++++++++- pci.ids | 19 +++++- udev/70-pointingstick.hwdb | 99 +++++++++++++++++++++++++++++ 3 files changed, 241 insertions(+), 4 deletions(-) create mode 100644 udev/70-pointingstick.hwdb diff --git a/oui.txt b/oui.txt index 1a19b74..94f6d36 100644 --- a/oui.txt +++ b/oui.txt @@ -1,4 +1,4 @@ - Generated: Fri, 17 Apr 2015 05:00:03 -0400 + Generated: Tue, 21 Apr 2015 05:00:03 -0400 OUI/MA-L Organization company_id Organization @@ -82548,6 +82548,12 @@ Cupertino CA 95014 UNITED STATES + 08-74-02 (hex) Apple, Inc. + 087402 (base 16) Apple, Inc. + 1 Infinite Loop + Cupertino CA 95014 + UNITED STATES + 08-74-F6 (hex) Winterhalter Gastronom GmbH 0874F6 (base 16) Winterhalter Gastronom GmbH Tettnanger Straße 72 @@ -87269,6 +87275,12 @@ Beijing 100085 CHINA + 20-78-F0 (hex) Apple, Inc. + 2078F0 (base 16) Apple, Inc. + 1 Infinite Loop + Cupertino CA 95014 + UNITED STATES + 20-7C-8F (hex) Quanta Microsystems,Inc. 207C8F (base 16) Quanta Microsystems,Inc. No.5 Lane 91,Dongmei Rd. @@ -89061,6 +89073,12 @@ 28-EF-01 (hex) PRIVATE 28EF01 (base 16) + 28-F0-76 (hex) Apple + 28F076 (base 16) Apple + 1 Infinite Loop + Cupertino CA 95014 + UNITED STATES + 28-F3-58 (hex) 2C - Trifonov & Co 28F358 (base 16) 2C - Trifonov & Co 133, Tsarigradsko Shose Blvd, BIZ IZOT, @@ -93013,6 +93031,12 @@ Durban Kwa-zulu Natal 4000 SOUTH AFRICA + 40-33-1A (hex) Apple, Inc. + 40331A (base 16) Apple, Inc. + 1 Infinite Loop + Cupertino CA 95014 + UNITED STATES + 40-33-6C (hex) Godrej & Boyce Mfg. co. ltd 40336C (base 16) Godrej & Boyce Mfg. co. ltd PSS TECH CELL, 2ND FLOOR, PLANT 17, SECURITY SOLUTIONS DIVISION @@ -93920,6 +93944,13 @@ HsinChu HsinFun Shiang 304 TAIWAN, PROVINCE OF CHINA + 44-5F-8C (hex) Intercel Group Limited + 445F8C (base 16) Intercel Group Limited + Unit 6, 17/F, Vanta industrial Centre, + 21~23 Tai Lin Pai Road, Kwai Chung + New Territories, Hong Kong + CHINA + 44-61-32 (hex) ecobee inc 446132 (base 16) ecobee inc 333 Adelaide St W 6th Floor @@ -96137,6 +96168,12 @@ Santiago Region Metropolitana 8320000 CHILE + 50-7A-55 (hex) Apple, Inc. + 507A55 (base 16) Apple, Inc. + 1 Infinite Loop + Cupertino CA 95014 + UNITED STATES + 50-7D-02 (hex) BIODIT 507D02 (base 16) BIODIT Calle Gustave Eiffel 3 @@ -103580,6 +103617,13 @@ San Rafael California 94901 UNITED STATES + 74-F8-DB (hex) IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. + 74F8DB (base 16) IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. + + 445 HOES LANE + PISCATAWAY NJ 08854 + UNITED STATES + 74-FD-A0 (hex) Compupal (Group) Corporation 74FDA0 (base 16) Compupal (Group) Corporation No.1555 Jiashan Avenue @@ -103611,6 +103655,13 @@ Zabrze 41-813 POLAND + 78-0C-B8 (hex) Intel Corporate + 780CB8 (base 16) Intel Corporate + Lot 8, Jalan Hi-Tech 2/3 + Kulim Hi-Tech Park + Kulim Kedah 09000 + MALAYSIA + 78-11-85 (hex) NBS Payment Solutions Inc. 781185 (base 16) NBS Payment Solutions Inc. 703 Evans Ave @@ -104357,6 +104408,12 @@ ShenZhen GuangDong 518129 CHINA + 78-D7-5F (hex) Apple, Inc. + 78D75F (base 16) Apple, Inc. + 1 Infinite Loop + Cupertino CA 95014 + UNITED STATES + 78-D9-9F (hex) NuCom HK Ltd. 78D99F (base 16) NuCom HK Ltd. Unit B 11/F, Eton Bldg, 288 Des Voeux Rd. Central @@ -110017,6 +110074,12 @@ Bucheon-city Kyunggi-do 420-857 KOREA, REPUBLIC OF + 94-F6-A3 (hex) Apple, Inc. + 94F6A3 (base 16) Apple, Inc. + 1 Infinite Loop + Cupertino CA 95014 + UNITED STATES + 94-F7-20 (hex) Tianjin Deviser Electronics Instrument Co., Ltd 94F720 (base 16) Tianjin Deviser Electronics Instrument Co., Ltd No.40 Yibin Road,Nankai district, @@ -113395,6 +113458,12 @@ Chung-Ho City Taipei Hsien 23500 TAIWAN, PROVINCE OF CHINA + A8-74-1D (hex) PHOENIX CONTACT Electronics GmbH + A8741D (base 16) PHOENIX CONTACT Electronics GmbH + Dringenauer Str. 30 + Bad Pyrmont - D-31812 + GERMANY + A8-75-D6 (hex) FreeTek International Co., Ltd. A875D6 (base 16) FreeTek International Co., Ltd. Unit D, 15/F, Tai Ping Ind.Ctr., Blk 2 @@ -116498,6 +116567,13 @@ KUNSHAN SUZHOU 215300 CHINA + B8-89-81 (hex) Chengdu InnoThings Technology Co., Ltd. + B88981 (base 16) Chengdu InnoThings Technology Co., Ltd. + West Port Technology Enterprise Incubator Park + Southwest Airport Economic Development Zone Industrial Concentration Area, Shuangliu Xian, Chengdu + Chengdu Sichuan 610000 + CHINA + B8-89-CA (hex) ILJIN ELECTRIC Co., Ltd. B889CA (base 16) ILJIN ELECTRIC Co., Ltd. 112-83, Annyeong-dong @@ -120684,6 +120760,12 @@ Hachioji Tokyo 192-0904 JAPAN + CC-C7-60 (hex) Apple, Inc. + CCC760 (base 16) Apple, Inc. + 1 Infinite Loop + Cupertino CA 95014 + UNITED STATES + CC-C8-D7 (hex) CIAS Elettronica srl CCC8D7 (base 16) CIAS Elettronica srl Via Giovanni Durando 38 @@ -123088,6 +123170,12 @@ Yokohama City Kanagawa 224-8539 JAPAN + D8-B1-90 (hex) Cisco Systems + D8B190 (base 16) Cisco Systems + 80 West Tasman Dr. + San Jose CA 95134 + UNITED STATES + D8-B3-77 (hex) HTC Corporation D8B377 (base 16) HTC Corporation No. 23, Xinghua Rd., @@ -123583,6 +123671,13 @@ KOBE HYOGO 650-0047 JAPAN + DC-53-60 (hex) Intel Corporate + DC5360 (base 16) Intel Corporate + Lot 8, Jalan Hi-Tech Park 2/3 + Kulim Hi-Tech Park + Kulim Kedah 09000 + MALAYSIA + DC-53-7C (hex) Compal Broadband Networks, Inc. DC537C (base 16) Compal Broadband Networks, Inc. 13F., No.1, Taiyuan 1st St. @@ -123655,6 +123750,12 @@ SAN JOSE CA 95134-1706 UNITED STATES + DC-7F-A4 (hex) 2Wire + DC7FA4 (base 16) 2Wire + 1764 Automation Parkway + San JOse ca 95131 + UNITED STATES + DC-82-5B (hex) JANUS, spol. s r.o. DC825B (base 16) JANUS, spol. s r.o. Sarajevska 8 @@ -124470,6 +124571,12 @@ Oakland CA 94612 UNITED STATES + E0-AC-CB (hex) Apple, Inc. + E0ACCB (base 16) Apple, Inc. + 1 Infinite Loop + Cupertino CA 95014 + UNITED STATES + E0-AC-F1 (hex) Cisco E0ACF1 (base 16) Cisco 170 West Tasman Drive @@ -127452,6 +127559,12 @@ Sunnyvale CA 94089 UNITED STATES + F0-B2-E5 (hex) Cisco Systems + F0B2E5 (base 16) Cisco Systems + 80 West Tasman Dr. + San Jose CA 94568 + UNITED STATES + F0-B4-29 (hex) XIAOMI Electronics,CO.,LTD F0B429 (base 16) XIAOMI Electronics,CO.,LTD Xiaomi Building, No.68 Qinghe Middle Street @@ -128284,6 +128397,12 @@ Hong Kong 528133 CHINA + F4-C6-13 (hex) Alcatel-Lucent Shanghai Bell Co., Ltd + F4C613 (base 16) Alcatel-Lucent Shanghai Bell Co., Ltd + No. 389, Ningqiao Road, Pudong Jinqiao,Shanghai, P.R.China + Shanghai Shanghai 201206 + CHINA + F4-C6-D7 (hex) blackned GmbH F4C6D7 (base 16) blackned GmbH Am Hartholz 21 @@ -128800,6 +128919,12 @@ Petaluma CA 94954 UNITED STATES + F8-5B-9C (hex) SB SYSTEMS Co.,Ltd + F85B9C (base 16) SB SYSTEMS Co.,Ltd + 2F Ventureforum, 323, Pangyo-ro, Bundang-gu + Seongnam-si Gyeonngi-do 453-400 + KOREA, REPUBLIC OF + F8-5B-C9 (hex) M-Cube Spa F85BC9 (base 16) M-Cube Spa Corso Cavour 2/2d diff --git a/pci.ids b/pci.ids index 1703a7c..ca681f7 100644 --- a/pci.ids +++ b/pci.ids @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2015.04.17 -# Date: 2015-04-17 03:15:01 +# Version: 2015.04.21 +# Date: 2015-04-21 03:15:02 # # Maintained by Martin Mares and other volunteers from the # PCI ID Project at http://pci-ids.ucw.cz/. @@ -17394,6 +17394,13 @@ d200 PIXCI(R) D2X Digital Video Capture Board [custom QL5232] d300 PIXCI(R) D3X Digital Video Capture Board [custom QL5232] eb01 PIXCI(R) EB1 PCI Camera Link Video Capture Board +# Gidel Reconfigurable Computing +165c Gidel Ltd. + 5f01 ProceV_A3 + 5f11 ProceV_A7 + 5f21 ProceV_AB + 5f31 ProceV_D5 + 5f41 ProceV_D8 165d Hsing Tech. Enterprise Co., Ltd. 165f Linux Media Labs, LLC 1020 LMLM4 MPEG-4 encoder @@ -17917,7 +17924,9 @@ 0011 SIS1100-e single link 0012 SIS1100-e quad link 0015 SIS8100 [Gigabit link, MicroTCA] -1797 Techwell Inc. +# nee Techwell, Inc. +1797 Intersil Techwell + 5864 TW5864 multimedia video controller 6801 TW6802 multimedia video card 6802 TW6802 multimedia other device 6810 TW6816 multimedia video controller @@ -21450,6 +21459,8 @@ 8086 0006 Ethernet 10G 2P X710 Adapter 8086 0007 Ethernet Converged Network Adapter X710-2 8086 0008 Ethernet Converged Network Adapter X710-2 + 8086 0009 Ethernet Controller X710 for 10GbE SFP+ + 8086 000a Ethernet Controller X710 for 10GbE SFP+ 8086 000d Ethernet Controller X710 for 10GbE SFP+ 8086 4005 Ethernet Controller XL710 for 10 Gigabit SFP+ 8086 4006 Ethernet Controller X710 for 10GbE SFP+ @@ -26583,6 +26594,8 @@ bdbd Blackmagic Design a12f DeckLink Mini Monitor a130 DeckLink Mini Recorder a132 UltraStudio 4K + a136 DeckLink 4K Extreme 12G + a137 DeckLink Studio 4K a138 Decklink SDI 4K a139 Intensity Pro 4K c001 TSI Telsys diff --git a/udev/70-pointingstick.hwdb b/udev/70-pointingstick.hwdb new file mode 100644 index 0000000..8d210f9 --- /dev/null +++ b/udev/70-pointingstick.hwdb @@ -0,0 +1,99 @@ +# This file is part of systemd. +# +# Pointingstick const-accel configuration, to make different brand / model +# laptop pointingsticks have the same speed / feel, and per model adjustment +# of the IBM TrackPoint driver's sensitivity setting +# +# The lookup keys are composed in: +# 60-evdev.rules +# +# Note: The format of the "evdev:" prefix match key is a contract between the +# rules file and the hardware data, it might change in later revisions to +# support more or better matches, it is not necessarily a stable ABI. +# +# Supported hardware matches are: +# - Generic input devices match: +# evdev:input:bZZZZvYYYYpXXXXeWWWW-VVVV +# This matches on the kernel modalias of the input-device, mainly: +# ZZZZ is the bus-id (see /usr/include/linux/input.h BUS_*), YYYY, XXXX and +# WWW are the 4-digit hex uppercase vendor, product and version ID and VVVV +# is an arbitrary length input-modalias describing the device capabilities. +# +# - Input driver device name and DMI data match: +# evdev:name::dmi:bvn*:bvr*:bd*:svn:pn* +# is the name device specified by the driver, +# is the firmware-provided string from the kernel DMI modalias. +# +# To add local entries, create a new file +# /etc/udev/hwdb.d/71-pointingstick-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 pointingstick 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: +# POINTINGSTICK_CONST_ACCEL +# POINTINGSTICK_SENSITIVITY +# +######################################### +# POINTINGSTICK_CONST_ACCEL # +######################################### +# +# Trackpoint const accel settings are specified as +# POINTINGSTICK_CONST_ACCEL= +# +# Where is a floating point number, using a '.' seperator, specifying +# by how much to multiply deltas generated by the pointingstick to get +# normalized deltas. +# +######################################### +# POINTINGSTICK_SENSITIVITY # +######################################### +# +# TPPS/2 IBM TrackPoint driver sensitivity sysfs setting +# POINTINGSTICK_SENSITIVITY= +# +# Where is a number between 0 and 255, note this property +# only applies to TPPS/2 IBM TrackPoint devices, see +# drivers/input/mouse/trackpoint.c in the Linux kernel sources. +# + +# +# Sort by by brand, model + +######################################### +# Dell +######################################### + +# Latitude D620 +evdev:name:*DualPoint Stick:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeD620*:pvr* + POINTINGSTICK_CONST_ACCEL=0.5 + +# Latitude E6400 +evdev:name:*DualPoint Stick:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeE6400*:pvr* + POINTINGSTICK_CONST_ACCEL=1.5 + +######################################### +# Lenovo +######################################### + +# Lenovo Thinkpad X200s / X201s +# Note these come with 2 revisions of keyboard, with the trackpoints having a +# different sensitivity in the different revisions. 1.25 is a bit slow for the +# least sensitive revision, but it is better to be a bit slow than too fast. +evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX20?s:* + POINTINGSTICK_SENSITIVITY=200 + POINTINGSTICK_CONST_ACCEL=1.25 + +# Lenovo Thinkpad T440s +evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadT440s:* + POINTINGSTICK_SENSITIVITY=200 + POINTINGSTICK_CONST_ACCEL=1.0 -- 2.25.1