From owner-p4-projects@FreeBSD.ORG  Sat Mar 27 21:09:51 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BA24B1065676; Sat, 27 Mar 2010 21:09:50 +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 7EDA5106566B
	for <perforce@FreeBSD.org>; Sat, 27 Mar 2010 21:09:50 +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 6BD328FC12
	for <perforce@FreeBSD.org>; Sat, 27 Mar 2010 21:09:50 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2RL9oEo000390
	for <perforce@FreeBSD.org>; Sat, 27 Mar 2010 21:09:50 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2RL9oCK000388
	for perforce@freebsd.org; Sat, 27 Mar 2010 21:09:50 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 27 Mar 2010 21:09:50 GMT
Message-Id: <201003272109.o2RL9oCK000388@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 176177 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 27 Mar 2010 21:09:51 -0000

http://p4web.freebsd.org/chv.cgi?CH=176177

Change 176177 by hselasky@hselasky_laptop001 on 2010/03/27 21:09:02

	USB input:
		- fix wrongly swapping of keys on Apple keyboards.
		- reported by: Steven Noonan

Affected files ...

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

Differences ...

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

@@ -896,8 +896,7 @@
 		    hid_input, 0, &sc->sc_loc_apple_fn, &flags,
 		    &temp_id)) {
 			if (flags & HIO_VARIABLE)
-				sc->sc_flags |= UKBD_FLAG_APPLE_FN |
-				    UKBD_FLAG_APPLE_SWAP;
+				sc->sc_flags |= UKBD_FLAG_APPLE_FN;
 			DPRINTFN(1, "Found Apple FN-key\n");
 			apple_keys = 1;
 			sc->sc_kbd_id = temp_id;