summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2011-03-09 17:03:07 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2011-03-09 17:03:07 +0000
commit32b7e83c043d1af25274ebb6315836650927e82f (patch)
treefdfdd336a2d9e644b05bee22ab14fab6774d4aae /sys/dev/usb
parent150cf4ff23fa3d0cc0a0abd9e67b19083efccc2c (diff)
Knock out a bunch more UPS devices from attaching to uhid(4).
feedback/ok deraadt@
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/usb_quirks.c23
1 files changed, 20 insertions, 3 deletions
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 2036464273c..3d049b390a7 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_quirks.c,v 1.63 2010/12/02 06:39:09 jakemsr Exp $ */
+/* $OpenBSD: usb_quirks.c,v 1.64 2011/03/09 17:03:06 sthen Exp $ */
/* $NetBSD: usb_quirks.c,v 1.45 2003/05/10 17:47:14 hamajima Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
@@ -109,17 +109,34 @@ const struct usbd_quirk_entry {
{ USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY920, ANY, { UQ_BROKEN_BIDIR }},
{ USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY800, ANY, { UQ_BROKEN_BIDIR }},
- { USB_VENDOR_APC, USB_PRODUCT_APC_UPSPRO500, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_APC, USB_PRODUCT_APC_UPS, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_APC, USB_PRODUCT_APC_UPS5G, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_SPEAKERS, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C100, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C120, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C800, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C900, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1100, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1250EITWRK, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1500EITWRK, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6H375, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_OR2200, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_SISPM_OLD, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_SISPM, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_SISPM_FLASH, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_DELL2, USB_PRODUCT_DELL2_UPS, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_HP, USB_PRODUCT_HP_T750, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_HP, USB_PRODUCT_HP_T1000, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_HP, USB_PRODUCT_HP_T1500, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_HP, USB_PRODUCT_HP_RT2200, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_HP, USB_PRODUCT_HP_R1500G2, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_HP, USB_PRODUCT_HP_T750G2, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_IDOWELL, USB_PRODUCT_IDOWELL_IDOWELL, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_ITUNER, USB_PRODUCT_ITUNER_USBLCD20x2, ANY, { UQ_BAD_HID }},
- { USB_VENDOR_LIEBERT, USB_PRODUCT_LIEBERT_POWERSURE_PXT, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_LIEBERT, USB_PRODUCT_LIEBERT_UPS, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_LIEBERT2, USB_PRODUCT_LIEBERT2_PSA, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_MECANIQUE, USB_PRODUCT_MECANIQUE_WISPY, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY24I, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1, ANY, { UQ_BAD_HID }},