Author: hselasky
Date: Mon Oct 29 08:16:31 2012
New Revision: 242303
URL: http://svn.freebsd.org/changeset/base/242303
Log:
MFC r240615:
Add UQ_UMS_IGNORE quirk.
Wrap two long lines.
Some minor spelling correction.
This fixes build of 8-stable.
PR: usb/171721
Modified:
stable/8/sys/dev/usb/input/ums.c
stable/8/sys/dev/usb/quirk/usb_quirk.c
stable/8/sys/dev/usb/quirk/usb_quirk.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/usb/ (props changed)
Modified: stable/8/sys/dev/usb/input/ums.c
==============================================================================
--- stable/8/sys/dev/usb/input/ums.c Mon Oct 29 07:06:23 2012
(r242302)
+++ stable/8/sys/dev/usb/input/ums.c Mon Oct 29 08:16:31 2012
(r242303)
@@ -378,6 +378,9 @@ ums_probe(device_t dev)
if (uaa->info.bInterfaceClass != UICLASS_HID)
return (ENXIO);
+ if (usb_test_quirk(uaa, UQ_UMS_IGNORE))
+ return (ENXIO);
+
if ((uaa->info.bInterfaceSubClass == UISUBCLASS_BOOT) &&
(uaa->info.bInterfaceProtocol == UIPROTO_MOUSE))
return (BUS_PROBE_DEFAULT);
Modified: stable/8/sys/dev/usb/quirk/usb_quirk.c
==============================================================================
--- stable/8/sys/dev/usb/quirk/usb_quirk.c Mon Oct 29 07:06:23 2012
(r242302)
+++ stable/8/sys/dev/usb/quirk/usb_quirk.c Mon Oct 29 08:16:31 2012
(r242303)
@@ -484,6 +484,7 @@ static const char *usb_quirk_str[USB_QUI
[UQ_HID_IGNORE] = "UQ_HID_IGNORE",
[UQ_KBD_IGNORE] = "UQ_KBD_IGNORE",
[UQ_KBD_BOOTPROTO] = "UQ_KBD_BOOTPROTO",
+ [UQ_UMS_IGNORE] = "UQ_UMS_IGNORE",
[UQ_MS_BAD_CLASS] = "UQ_MS_BAD_CLASS",
[UQ_MS_LEADING_BYTE] = "UQ_MS_LEADING_BYTE",
[UQ_MS_REVZ] = "UQ_MS_REVZ",
Modified: stable/8/sys/dev/usb/quirk/usb_quirk.h
==============================================================================
--- stable/8/sys/dev/usb/quirk/usb_quirk.h Mon Oct 29 07:06:23 2012
(r242302)
+++ stable/8/sys/dev/usb/quirk/usb_quirk.h Mon Oct 29 08:16:31 2012
(r242303)
@@ -29,7 +29,7 @@
enum {
/*
- * Keep in sync with theusb_quirk_str usb_quirk.c, and with the
+ * Keep in sync with usb_quirk_str in usb_quirk.c, and with
* share/man/man4/usb_quirk.4
*/
UQ_NONE, /* not a valid quirk */
@@ -49,6 +49,7 @@ enum {
UQ_HID_IGNORE, /* device should be ignored by hid class */
UQ_KBD_IGNORE, /* device should be ignored by kbd class */
UQ_KBD_BOOTPROTO, /* device should set the boot protocol */
+ UQ_UMS_IGNORE, /* device should be ignored by ums class */
UQ_MS_BAD_CLASS, /* doesn't identify properly */
UQ_MS_LEADING_BYTE, /* mouse sends an unknown leading byte */
UQ_MS_REVZ, /* mouse has Z-axis reversed */
@@ -64,7 +65,10 @@ enum {
UQ_CFG_INDEX_0, /* select configuration index 0 by default */
UQ_ASSUME_CM_OVER_DATA, /* assume cm over data feature */
- /* USB Mass Storage Quirks. See "storage/umass.c" for a detailed
description. */
+ /*
+ * USB Mass Storage Quirks. See "storage/umass.c" for a
+ * detailed description.
+ */
UQ_MSC_NO_TEST_UNIT_READY, /* send start/stop instead of TUR */
UQ_MSC_NO_RS_CLEAR_UA, /* does not reset Unit Att. */
UQ_MSC_NO_START_STOP, /* does not support start/stop */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
