d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[usb] Add HID_IGNORE quirks for multiple UPS devices

Browse Source 
Without HID_IGNORE quirk enabled these models appear in the system as a uhid
devices while NUT (Network UPS Tool) expects them to be ugen.

PR:		131521
Submitted by:	Naoyuki Tai <ntai@smartfruit.com>, John Bayly <john.bayly@tipstrade.net>
MFC after:	1 week
This commit is contained in:
Oleksandr Tymoshenko 2019-01-18 21:00:54 +00:00
parent a91429a2be
commit 03d9c6aa55
2 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/dev/usb/quirk/usb_quirk.c
View File

@ -110,8 +110,19 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = {
USB_QUIRK(XEROX, WCM15, 0x0000, 0xffff, UQ_BROKEN_BIDIR),
/* Devices which should be ignored by uhid */
USB_QUIRK(APC, UPS, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(BELKIN, F6H375USB, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(BELKIN, F6C550AVR, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(BELKIN, F6C1250TWRK, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(BELKIN, F6C1500TWRK, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(BELKIN, F6C900UNV, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(BELKIN, F6C100UNV, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(BELKIN, F6C120UNV, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(BELKIN, F6C800UNV, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(BELKIN, F6C1100UNV, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(CYBERPOWER, BC900D, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(CYBERPOWER, 1500CAVRLCD, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(CYBERPOWER, OR2200LCDRM2U, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(DELL2, VARIOUS_UPS, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(CYPRESS, SILVERSHIELD, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(DELORME, EARTHMATE, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(DREAMLINK, DL100B, 0x0000, 0xffff, UQ_HID_IGNORE),
@ -119,8 +130,26 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = {
USB_QUIRK(ITUNERNET, USBLCD4X20, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(LIEBERT, POWERSURE_PXT, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(LIEBERT2, PSI1000, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(LIEBERT2, POWERSURE_PSA, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(MGE, UPS1, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(MGE, UPS2, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(POWERCOM, IMPERIAL_SERIES, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(POWERCOM, SMART_KING_PRO, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(POWERCOM, WOW, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(POWERCOM, VANGUARD, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(POWERCOM, BLACK_KNIGHT_PRO, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(TRIPPLITE2, AVR550U, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(TRIPPLITE2, AVR750U, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(TRIPPLITE2, ECO550UPS, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(TRIPPLITE2, T750_INTL, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(TRIPPLITE2, RT_2200_INTL, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(TRIPPLITE2, OMNI1000LCD, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(TRIPPLITE2, OMNI900LCD, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(TRIPPLITE2, SMART_2200RMXL2U, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(TRIPPLITE2, UPS_3014, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(TRIPPLITE2, SU1500RTXL2UA, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(TRIPPLITE2, SU6000RT4U, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(TRIPPLITE2, SU1500RTXL2UA_2, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(APPLE, IPHONE, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(APPLE, IPHONE_3G, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(MEGATEC, UPS, 0x0000, 0xffff, UQ_HID_IGNORE),

40
sys/dev/usb/usbdevs
View File

@ -140,6 +140,7 @@ vendor SANYO 0x0474 Sanyo Electric
vendor SEAGATE 0x0477 Seagate
vendor CONNECTIX 0x0478 Connectix
vendor SEMTECH 0x047a Semtech
vendor DELL2 0x047c Dell
vendor KENSINGTON 0x047d Kensington
vendor LUCENT 0x047e Lucent
vendor PLANTRONICS 0x047f Plantronics
@ -554,6 +555,7 @@ vendor ACDC 0x0d7e American Computer & Digital Components
vendor CMEDIA 0x0d8c CMEDIA
vendor CONCEPTRONIC 0x0d8e Conceptronic
vendor SKANHEX 0x0d96 Skanhex Technology, Inc.
vendor POWERCOM 0x0d9f PowerCOM
vendor MSI 0x0db0 Micro Star International
vendor ELCON 0x0db7 ELCON Systemtechnik
vendor UNKNOWN4 0x0dcd Unknown vendor
@ -1366,8 +1368,16 @@ product BELKIN USB2LAN 0x0121 USB to LAN
product BELKIN F5U208 0x0208 F5U208 VideoBus II
product BELKIN F5U237 0x0237 F5U237 USB 2.0 7-Port Hub
product BELKIN F5U257 0x0257 F5U257 Serial
product BELKIN F6H375USB 0x0375 F6H375-USB
product BELKIN F5U409 0x0409 F5U409 Serial
product BELKIN F6C550AVR 0x0551 F6C550-AVR UPS
product BELKIN F6C1250TWRK 0x0750 F6C1250-TW-RK
product BELKIN F6C1500TWRK 0x0751 F6C1500-TW-RK
product BELKIN F6C900UNV 0x0900 F6C900-UNV
product BELKIN F6C100UNV 0x0910 F6C100-UNV
product BELKIN F6C120UNV 0x0912 F6C120-UNV UPS
product BELKIN F6C800UNV 0x0980 F6C800-UNV
product BELKIN F6C1100UNV 0x1100 F6C1100-UNV, F6C1200-UNV
product BELKIN F5U120 0x1203 F5U120-PC Hub
product BELKIN RTL8188CU 0x1102 RTL8188CU Wireless Adapter
product BELKIN F9L1103 0x1103 F9L1103 Wireless Adapter
@ -1601,7 +1611,9 @@ product CURITEL UM150 0x3711 EVDO modem
product CURITEL UM175 0x3714 EVDO modem
/* CyberPower products */
product CYBERPOWER 1500CAVRLCD 0x0501 1500CAVRLCD
product CYBERPOWER BC900D 0x0005 900AVR/BC900D, CP1200AVR/BC1200D
product CYBERPOWER 1500CAVRLCD 0x0501 1500CAVRLCD
product CYBERPOWER OR2200LCDRM2U 0x0601 OR2200LCDRM2U
/* CyberTAN Technology products */
product CYBERTAN TG54USB 0x1666 TG54USB
@ -1653,6 +1665,7 @@ product DELL U5730 0x8180 Dell 5730 3G
product DELL U5730_2 0x8181 Dell 5730 3G
product DELL U5730_3 0x8182 Dell 5730 3G
product DELL DW700 0x9500 Dell DW700 GPS
product DELL2 VARIOUS_UPS 0xffff Various UPS Models
/* Delorme Paublishing products */
product DELORME EARTHMATE 0x0100 Earthmate GPS
@ -2401,6 +2414,8 @@ product HP 930C 0x1204 DeskJet 930c
product HP3 RTL8188CU 0x1629 RTL8188CU
product HP P2000U 0x1801 Inkjet P-2000U
product HP HS2300 0x1e1d HS2300 HSDPA (aka MC8775)
product HP T500 0x1f01 T500
product HP T750 0x1f02 T750
product HP 640C 0x2004 DeskJet 640c
product HP 4670V 0x3005 ScanJet 4670v
product HP P1100 0x3102 Photosmart P1100
@ -2777,6 +2792,7 @@ product LEXMARK S2450 0x0009 Optra S 2450
/* Liebert products */
product LIEBERT POWERSURE_PXT 0xffff PowerSure Personal XT
product LIEBERT2 POWERSURE_PSA 0x0001 PowerSure PSA UPS
product LIEBERT2 PSI1000 0x0004 UPS PSI 1000 FW:08
/* Link Instruments Inc. products */
@ -3702,6 +3718,13 @@ product PLOYTEC SPL_CRIMSON_1 0xc150 SPL Crimson Revision 1
product PLX TESTBOARD 0x9060 test board
product PLX CA42 0xac70 CA-42
/* PowerCOM products */
product POWERCOM IMPERIAL_SERIES 0x00a2 IMPERIAL Series
product POWERCOM SMART_KING_PRO 0x00a3 Smart KING Pro
product POWERCOM WOW 0x00a4 WOW
product POWERCOM VANGUARD 0x00a5 Vanguard
product POWERCOM BLACK_KNIGHT_PRO 0x00a6 Black Knight Pro
/* PNY products */
product PNY ATTACHE2 0x0010 USB 2.0 Flash Drive
@ -4642,7 +4665,20 @@ product TRENDNET RTL8188CU 0x648b RTL8188CU
product TRENDNET TEW805UB 0x805b TEW-805UB
/* Tripp-Lite products */
product TRIPPLITE U209 0x2008 Serial
product TRIPPLITE U209 0x2008 Serial
product TRIPPLITE2 OMNIVS1000 0x0001 OMNIVS1000, SMART550USB
product TRIPPLITE2 AVR550U 0x1003 AVR550U
product TRIPPLITE2 AVR750U 0x1007 AVR750U
product TRIPPLITE2 ECO550UPS 0x1008 ECO550UPS
product TRIPPLITE2 T750_INTL 0x1f06 T750 INTL
product TRIPPLITE2 RT_2200_INTL 0x1f0a R/T 2200 INTL
product TRIPPLITE2 OMNI1000LCD 0x2005 OMNI1000LCD
product TRIPPLITE2 OMNI900LCD 0x2007 OMNI900LCD
product TRIPPLITE2 SMART_2200RMXL2U 0x3012 smart2200RMXL2U
product TRIPPLITE2 UPS_3014 0x3014 Unknown UPS
product TRIPPLITE2 SU1500RTXL2UA 0x4001 SmartOnline SU1500RTXL2UA
product TRIPPLITE2 SU6000RT4U 0x4002 SmartOnline SU6000RT4U
product TRIPPLITE2 SU1500RTXL2UA_2 0x4003 SmartOnline SU1500RTXL2UA
/* Trumpion products */
product TRUMPION T33520 0x1001 T33520 USB Flash Card Controller