From owner-p4-projects@FreeBSD.ORG  Sun Jun 17 17:27:59 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 2E51D16A469; Sun, 17 Jun 2007 17:27:59 +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 DB11D16A468
	for <perforce@FreeBSD.org>; Sun, 17 Jun 2007 17:27:58 +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 CB6F613C44B
	for <perforce@FreeBSD.org>; Sun, 17 Jun 2007 17:27:58 +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 l5HHRwk0095725
	for <perforce@FreeBSD.org>; Sun, 17 Jun 2007 17:27:58 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5HHRw3d095716
	for perforce@freebsd.org; Sun, 17 Jun 2007 17:27:58 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Sun, 17 Jun 2007 17:27:58 GMT
Message-Id: <200706171727.l5HHRw3d095716@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 121860 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: Sun, 17 Jun 2007 17:27:59 -0000

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

Change 121860 by rpaulo@rpaulo_epsilon on 2007/06/17 17:27:03

	Add a new quirk: UQ_MS_IGNORE. Devices that need to be ignored
	by ums(4) (for example, if they need a specific driver) should
	use this quirk.
	
	This is the case of Apple's Internal trackpad found on
	MacBooks/PowerBooks.

Affected files ...

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

Differences ...

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

@@ -179,6 +179,9 @@
 	if (err)
 		return (UMATCH_NONE);
 
+	if (usbd_get_quirks(uaa->device)->uq_flags & UQ_MS_IGNORE)
+		return (UMATCH_NONE);
+
 	if (hid_is_collection(desc, size,
 			      HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE)))
 		ret = UMATCH_IFACECLASS;

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

@@ -135,7 +135,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 } },
+	ANY, { UQ_KBD_FNKEY | UQ_MS_IGNORE } },
  { 0, 0, 0, { 0 } }
 };
 

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

@@ -58,6 +58,7 @@
 #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 */
 					
 };