usb/171721: commit references a PR

[dfilter service]

The following reply was made to PR usb/171721; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: usb/171721: commit references a PR
Date: Mon, 17 Sep 2012 19:06:47 +0000 (UTC)

 Author: hselasky
 Date: Mon Sep 17 19:06:35 2012
 New Revision: 240615
 URL: http://svn.freebsd.org/changeset/base/240615
 
 Log:
   Add UQ_UMS_IGNORE quirk.
   Wrap two long lines.
   Some minor spelling correction.
   
   PR:	usb/171721
 
 Modified:
   head/share/man/man4/usb_quirk.4
   head/sys/dev/usb/input/ums.c
   head/sys/dev/usb/quirk/usb_quirk.c
   head/sys/dev/usb/quirk/usb_quirk.h
 
 Modified: head/share/man/man4/usb_quirk.4
 ==============================================================================
 --- head/share/man/man4/usb_quirk.4	Mon Sep 17 16:39:32 2012	(r240614)
 +++ head/share/man/man4/usb_quirk.4	Mon Sep 17 19:06:35 2012	(r240615)
 @@ -66,6 +66,8 @@ device should be ignored by hid class
  device should be ignored by kbd class
  .It UQ_KBD_BOOTPROTO
  device should set the boot protocol
 +.It UQ_UMS_IGNORE
 +device should be ignored by ums class
  .It UQ_MS_BAD_CLASS
  doesn't identify properly
  .It UQ_MS_LEADING_BYTE
 
 Modified: head/sys/dev/usb/input/ums.c
 ==============================================================================
 --- head/sys/dev/usb/input/ums.c	Mon Sep 17 16:39:32 2012	(r240614)
 +++ head/sys/dev/usb/input/ums.c	Mon Sep 17 19:06:35 2012	(r240615)
 @@ -381,6 +381,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: head/sys/dev/usb/quirk/usb_quirk.c
 ==============================================================================
 --- head/sys/dev/usb/quirk/usb_quirk.c	Mon Sep 17 16:39:32 2012	(r240614)
 +++ head/sys/dev/usb/quirk/usb_quirk.c	Mon Sep 17 19:06:35 2012	(r240615)
 @@ -494,6 +494,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: head/sys/dev/usb/quirk/usb_quirk.h
 ==============================================================================
 --- head/sys/dev/usb/quirk/usb_quirk.h	Mon Sep 17 16:39:32 2012	(r240614)
 +++ head/sys/dev/usb/quirk/usb_quirk.h	Mon Sep 17 19:06:35 2012	(r240615)
 @@ -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 at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"