From owner-p4-projects@FreeBSD.ORG  Wed Jun 27 12:44:20 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CF22E16A46D; Wed, 27 Jun 2007 12:44:19 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 964CC16A421
	for <perforce@FreeBSD.org>; Wed, 27 Jun 2007 12:44:19 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 87A9B13C44C
	for <perforce@FreeBSD.org>; Wed, 27 Jun 2007 12:44:19 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RCiJO3027867
	for <perforce@FreeBSD.org>; Wed, 27 Jun 2007 12:44:19 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RCiJuJ027864
	for perforce@freebsd.org; Wed, 27 Jun 2007 12:44:19 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Wed, 27 Jun 2007 12:44:19 GMT
Message-Id: <200706271244.l5RCiJuJ027864@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 122395 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jun 2007 12:44:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=122395

Change 122395 by rpaulo@rpaulo_epsilon on 2007/06/27 12:44:09

	Remove the UQ_MS_IGNORE quirk. The atp driver only needs to return
	a proper value in the attach routine to win the device against
	ums(4).

Affected files ...

.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#11 edit
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.c#5 edit
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.h#5 edit

Differences ...

==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#11 (text+ko) ====

@@ -188,9 +188,6 @@
 	void *desc;
 	usbd_status err;
 
-	if (usbd_get_quirks(uaa->device)->uq_flags & UQ_MS_IGNORE)
-		return (UMATCH_NONE);
-
 	if (!uaa->iface)
 		return (UMATCH_NONE);
 	id = usbd_get_interface_descriptor(uaa->iface);

==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.c#5 (text+ko) ====

@@ -102,7 +102,7 @@
 	ANY, { UQ_KBD_IGNORE }},
  /* Devices that need special handling of the Fn key */
  { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_INTKBTP,
-	ANY, { UQ_KBD_FNKEY | UQ_MS_IGNORE } },
+	ANY, { UQ_KBD_FNKEY } },
  { 0, 0, 0, { 0 } }
 };
 

==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.h#5 (text+ko) ====

@@ -56,7 +56,6 @@
 #define UQ_HID_IGNORE	0x8000	/* device should be ignored by hid class */
 #define UQ_KBD_IGNORE  0x18000	/* device should be ignored by both kbd and hid class */
 #define UQ_KBD_FNKEY	0x40000	/* device needs special handling for the Fn key */
-#define UQ_MS_IGNORE	0x20000 /* device should be ignored by ums */
 };
 
 extern const struct usbd_quirks usbd_no_quirk;