From owner-p4-projects@FreeBSD.ORG  Sun May 17 11:54:00 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3383A1065675; Sun, 17 May 2009 11:54:00 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E7D6A1065670
	for <perforce@FreeBSD.org>; Sun, 17 May 2009 11:53:59 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D4DA48FC14
	for <perforce@FreeBSD.org>; Sun, 17 May 2009 11:53:59 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4HBrxUa008415
	for <perforce@FreeBSD.org>; Sun, 17 May 2009 11:53:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4HBrxCe008413
	for perforce@freebsd.org; Sun, 17 May 2009 11:53:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 17 May 2009 11:53:59 GMT
Message-Id: <200905171153.n4HBrxCe008413@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 162203 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 May 2009 11:54:01 -0000

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

Change 162203 by hselasky@hselasky_laptop001 on 2009/05/17 11:53:19

	
	USB input:
	  - be more verbose

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#9 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#9 (text+ko) ====

@@ -743,6 +743,8 @@
 	err = usb2_req_get_hid_desc(uaa->device, NULL, &hid_ptr,
 	    &hid_len, M_TEMP, uaa->info.bIfaceIndex);
 	if (err == 0) {
+		uint8_t temp_id;
+
 		/* investigate if this is an Apple Keyboard */
 		if (hid_locate(hid_ptr, hid_len,
 		    HID_USAGE2(HUP_CONSUMER, HUG_APPLE_EJECT),
@@ -754,10 +756,13 @@
 			if (hid_locate(hid_ptr, hid_len,
 			    HID_USAGE2(0xFFFF, 0x0003),
 			    hid_input, 0, &sc->sc_loc_apple_fn, &flags,
-			    &sc->sc_kbd_id)) {
+			    &temp_id)) {
 				if (flags & HIO_VARIABLE)
 					sc->sc_flags |= UKBD_FLAG_APPLE_FN |
 					    UKBD_FLAG_APPLE_SWAP;
+				if (temp_id != sc->sc_kbd_id) {
+					DPRINTF("HID IDs mismatch\n");
+				}
 			}
 		} else {
 			/*