summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2008-02-23 22:19:14 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2008-02-23 22:19:14 +0000
commit53b084779f78bba3c007454290678d614954dd13 (patch)
tree2aea15bacf95ff99b51268196a2e3be77a1f819c
parent951a5069fcc2ef7112b1263422993d4b0491c2ab (diff)
SiSPM devices are like belkin ups; do not attach as uhid, pr#5719
-rw-r--r--sys/dev/usb/usb_quirks.c7
-rw-r--r--sys/dev/usb/usbdevs5
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 0549df57b71..ffa062bbca2 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.33 2007/11/25 22:26:55 deraadt Exp $ */
+/* $OpenBSD: usb_quirks.c,v 1.34 2008/02/23 22:19:13 deraadt 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 $ */
@@ -142,6 +142,11 @@ const struct usbd_quirk_entry {
{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2, ANY, { UQ_BAD_HID }},
+
+ /* SISPM devices */
+ { 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 }},
{ 0, 0, 0, { 0 } }
};
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 683482c25e2..2e9d802ed0e 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.336 2008/02/22 12:37:59 jsg Exp $
+$OpenBSD: usbdevs,v 1.337 2008/02/23 22:19:13 deraadt Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -1014,6 +1014,9 @@ product CYPRESS KBDHUB 0x0101 Keyboard/Hub
product CYPRESS FMRADIO 0x1002 FM Radio
product CYPRESS USBRS232 0x5500 RS232
product CYPRESS HUB2 0x6560 USB2 Hub
+product CYPRESS SISPM_OLD 0xfd10 Sispm - old version
+product CYPRESS SISPM 0xfd11 Sispm
+product CYPRESS SISPM_FLASH 0xfd12 Sispm - flash
/* Daisy Technology products */
product DAISY DMC 0x6901 PhotoClip