* merged r20175 from linux-2.6.20 branch

* updated linux26 (2.6.19.2 -> 2.6.20)


git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20552 10447126-35f2-4685-b0cf-6dd780d3921f

base/linux26/96-usb-hid-apple-kbd-mapping.patch

@@ -1,8 +1,9 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../linux26/96-usb-hid-apple-kbd-mapping.patch
-# Copyright (C) 2004 - 2006 The T2 SDE Project
+# Filename: package/.../linux26/96-usb-hid-apple-kbd-mapping.patch
+# Copyright (C) 2007 The OpenSDE Project
+# Copyright (C) 2004 - 2007 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
 # 
@@ -12,16 +13,17 @@
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 
 The Apple USB keyboards carry symbols differing from the on-wire values sent.
 So we swap the events here simillar as in the 95-adb-mapping patch.
+Likewise, default to the normal F* keys for usability on the Linux desktop.
 
   - Rene Rebe <[email protected]>
 
---- linux-2.6.16/drivers/usb/input/hid-input.c	2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16/drivers/usb/input/hid-input.c	2006-06-09 14:24:12.000000000 +0200
-@@ -256,8 +256,27 @@
+--- linux-2.6.20/drivers/hid/hid-input.c.vanilla     2007-02-05 11:24:46.737682437 +0100
++++ linux-2.6.20/drivers/hid/hid-input.c     2007-02-05 11:24:52.770026201 +0100
+@@ -256,8 +256,20 @@
  			set_bit(EV_REP, input->evbit);
  
  			if ((usage->hid & HID_USAGE) < 256) {
@@ -39,15 +41,19 @@ So we swap the events here simillar as in the 95-adb-mapping patch.
 +					  case 125: code = 56; break;
 +					  case 100: code = 127; break;
 +					}
-+					/* ISO key exchange */
-+					if (input->id.product == 0x0215 ||
-+					    input->id.product == 0x0218)
-+					switch (code) {
-+					  case 41: code = 86; break;
-+					  case 86: code = 41; break;
-+					}
 +				}
 +				map_key_clear(code);
  			} else
  				map_key(KEY_UNKNOWN);
  
+--- linux-2.6.20/drivers/hid/hid-input.c.vanilla	2007-02-05 11:24:46.737682437 +0100
++++ linux-2.6.20/drivers/hid/hid-input.c	2007-02-05 11:24:52.770026201 +0100
+@@ -35,7 +35,7 @@
+ 
+ #include <linux/hid.h>
+ 
+-static int hid_pb_fnmode = 1;
++static int hid_pb_fnmode = 2;
+ module_param_named(pb_fnmode, hid_pb_fnmode, int, 0644);
+ MODULE_PARM_DESC(pb_fnmode,
+ 		"Mode of fn key on PowerBooks (0 = disabled, 1 = fkeyslast, 2 = fkeysfirst)");

base/linux26/linux26.desc

@@ -31,8 +31,7 @@
 
 [L] GPL
 [S] Stable
-[V] 2.6.19.2
+[V] 2.6.20
 [P] X -1---5---9 102.060
 
-[D] 4108217827 linux-2.6.19.tar.bz2 http://ftp.kernel.org/pub/linux/kernel/v2.6/
-[D] 1900964792 patch-2.6.19.2.bz2 http://ftp.kernel.org/pub/linux/kernel/v2.6/
+[D] 4190969329 linux-2.6.20.tar.bz2 http://ftp.kernel.org/pub/linux/kernel/v2.6/