Date: Thu, 14 Oct 2010 16:20:10 GMT From: John Bayly <john.bayly@tipstrade.net> To: freebsd-usb@FreeBSD.org Subject: Re: usb/131521: Registering Belkin UPS to usb_quirks.c Message-ID: <201010141620.o9EGKAod054137@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR usb/131521; it has been noted by GNATS. From: John Bayly <john.bayly@tipstrade.net> To: bug-followup@FreeBSD.org, ntai@smartfruit.com Cc: Subject: Re: usb/131521: Registering Belkin UPS to usb_quirks.c Date: Thu, 14 Oct 2010 17:12:20 +0100 This is a multi-part message in MIME format. --------------040308070403080503030505 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Rather embarrassing: I was composing the previous mail while the kernel was compiling to make sure everything was ok, and managed to hit send. Typically there's a mistake in the patches. Please ignore the preceding two. The attached patches compile properly, and on boot my Belkin F6C120UNV is detected as /dev/ugen0 instead of /dev/uhid0 John --------------040308070403080503030505 Content-Type: text/plain; name="usb_quirks.c.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="usb_quirks.c.diff" --- /usr/src/sys/dev/usb/usb_quirks.c.orig 2010-10-14 13:28:23.000000000 +0000 +++ /usr/src/sys/dev/usb/usb_quirks.c 2010-10-14 15:02:13.000000000 +0000 @@ -96,18 +96,78 @@ /* Devices which should be ignored by uhid */ { USB_VENDOR_APC, USB_PRODUCT_APC_UPS, ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6H375USB, + ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR, ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1250TWRK, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1500TWRK, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C900UNV, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C100UNV, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C120UNV, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C800UNV, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1100UNV, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_BC900D, + ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500CAVRLCD, ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_OR2200LCDRM2U, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_DELL2, USB_PRODUCT_DELL2_VARIOUS_UPS, + ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE, ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_ITUNERNET, USB_PRODUCT_ITUNERNET_USBLCD2X20, ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_LIEBERT2, USB_PRODUCT_LIEBERT2_POWERSURE_PSA, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_LIEBERT, USB_PRODUCT_LIEBERT_VARIOUS_UPS, + ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1, ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2, ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_POWERCOM, USB_PRODUCT_POWERCOM_IMPERIAL_SERIES, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_POWERCOM, USB_PRODUCT_POWERCOM_SMART_KING_PRO, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_POWERCOM, USB_PRODUCT_POWERCOM_WOW, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_POWERCOM, USB_PRODUCT_POWERCOM_VANGUARD, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_POWERCOM, USB_PRODUCT_POWERCOM_BLACK_KNIGHT_PRO, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_AVR550U, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_AVR750U, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_ECO550UPS, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_T750_INTL, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_RT_2200_INTL, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_OMNI1000LCD, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_OMNI900LCD, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_SMART_2200RMXL2U, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_UPS_3014, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_SU1500RTXL2UA, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_SU6000RT4U, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_SU1500RTXL2ua, + ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE, ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G, --------------040308070403080503030505 Content-Type: text/plain; name="usbdevs.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="usbdevs.diff" --- /usr/src/sys/dev/usb/usbdevs.orig 2010-10-14 13:26:50.000000000 +0000 +++ /usr/src/sys/dev/usb/usbdevs 2010-10-14 15:12:54.000000000 +0000 @@ -145,6 +145,7 @@ 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 @@ -350,6 +351,7 @@ vendor BIZLINK 0x06c4 Bizlink International vendor KEYSPAN 0x06cd Keyspan / InnoSys Inc. vendor AASHIMA 0x06d6 Aashima Technology +vendor LIEBERT 0x06da Liebert vendor MULTITECH 0x06e0 MultiTech vendor ADS 0x06e1 ADS Technologies vendor ALCATELM 0x06e4 Alcatel Microelectronics @@ -459,6 +461,7 @@ vendor MINDSATWORK 0x097a Minds At Work vendor POINTCHIPS 0x09a6 PointChips vendor INTERSIL 0x09aa Intersil +vendor TRIPPLITE2 0x09ae Tripp-Lite vendor ALTIUS 0x09b3 Altius Solutions vendor ARRIS 0x09c1 Arris Interactive vendor ACTIVCARD 0x09c3 ACTIVCARD @@ -517,6 +520,7 @@ vendor ABC 0x0d8c ABC 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 NETAC 0x0dd8 Netac @@ -549,6 +553,7 @@ vendor CURITEL 0x106c Curitel Communications Inc vendor SILABS2 0x10a6 SILABS2 vendor USI 0x10ab USI +vendor LIEBERT2 0x10af Liebert vendor PLX 0x10b5 PLX vendor ASANTE 0x10bd Asante vendor SILABS 0x10c4 Silicon Labs @@ -945,8 +950,16 @@ 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 ZD1211B 0x4050 ZD1211B product BELKIN F5D5055 0x5055 F5D5055 @@ -1094,7 +1107,9 @@ product CURITEL PC5740 0x3701 Broadband Wireless 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 @@ -1122,6 +1137,7 @@ product DELL TM350 0x8103 TrueMobile 350 Bluetooth USB Adapter product DELL PRISM_GT_2 0x8104 PrismGT USB 2.0 WLAN product DELL U740 0x8135 Dell U740 CDMA +product DELL2 VARIOUS_UPS 0xffff Various UPS Models /* Delorme Paublishing products */ product DELORME EARTHMATE 0x0100 Earthmate GPS @@ -1446,6 +1462,8 @@ product HP 930C 0x1204 DeskJet 930c 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 @@ -1613,6 +1631,10 @@ /* Lexmark products */ product LEXMARK S2450 0x0009 Optra S 2450 +/* Liebert products */ +product LIEBERT VARIOUS_UPS 0xffff Various UPS models +product LIEBERT2 POWERSURE_PSA 0x0001 PowerSure PSA UPS + /* Linksys products */ product LINKSYS MAUSB2 0x0105 Camedia MAUSB-2 product LINKSYS USB10TX1 0x200c USB10TX @@ -1988,6 +2010,13 @@ /* PLX products */ product PLX TESTBOARD 0x9060 test board +/* 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 @@ -2389,7 +2418,20 @@ product TREK THUMBDRIVE_8MB 0x9988 ThumbDrive_8MB /* 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 0x4003 SmartOnline SU1500RTXL2ua /* Trumpion products */ product TRUMPION T33520 0x1001 T33520 USB Flash Card Controller --------------040308070403080503030505--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010141620.o9EGKAod054137>