From bf5dd84252f205ee09de5f004126fe24946f631a Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 24 Apr 2010 17:12:52 -0400 Subject: [PATCH] linux26-rt: removed unmaintainable and probably obsolete ppc patches --- base/linux26-rt/95-adb-mapping.patch | 39 ------------ .../96-usb-hid-apple-kbd-mapping.patch | 59 ------------------- .../arch-ppc-horizon-name-clash.patch | 29 --------- 3 files changed, 127 deletions(-) delete mode 100644 base/linux26-rt/95-adb-mapping.patch delete mode 100644 base/linux26-rt/96-usb-hid-apple-kbd-mapping.patch delete mode 100644 base/linux26-rt/arch-ppc-horizon-name-clash.patch diff --git a/base/linux26-rt/95-adb-mapping.patch b/base/linux26-rt/95-adb-mapping.patch deleted file mode 100644 index 164436301..000000000 --- a/base/linux26-rt/95-adb-mapping.patch +++ /dev/null @@ -1,39 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../linux26-rt/95-adb-mapping.patch -# Copyright (C) 2007 The OpenSDE Project -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# 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. -# --- SDE-COPYRIGHT-NOTE-END --- - -Well, after fixing user-space apps here and there it became too annoying -and counter productive, since nowadays user-space expect full "i386 style", -linux mapping anyways. So let's correct the alt and altgr mapping in the -kernel in the first place. - - - Rene Rebe - ---- ./drivers/macintosh/adbhid.c.orig 2004-10-18 23:55:36.000000000 +0200 -+++ ./drivers/macintosh/adbhid.c 2004-10-19 18:58:36.972070126 +0200 -@@ -130,10 +130,10 @@ - /* 0x34 */ KEY_KPENTER, /* 96 */ - /* 0x35 */ KEY_ESC, /* 1 */ - /* 0x36 */ KEY_LEFTCTRL, /* 29 */ -- /* 0x37 */ KEY_LEFTMETA, /* 125 */ -+ /* 0x37 */ KEY_LEFTALT, /* 125 */ - /* 0x38 */ KEY_LEFTSHIFT, /* 42 */ - /* 0x39 */ KEY_CAPSLOCK, /* 58 */ -- /* 0x3a */ KEY_LEFTALT, /* 56 */ -+ /* 0x3a */ KEY_RIGHTALT, /* 56 */ - /* 0x3b */ KEY_LEFT, /* 105 */ - /* 0x3c */ KEY_RIGHT, /* 106 */ - /* 0x3d */ KEY_DOWN, /* 108 */ diff --git a/base/linux26-rt/96-usb-hid-apple-kbd-mapping.patch b/base/linux26-rt/96-usb-hid-apple-kbd-mapping.patch deleted file mode 100644 index 0d8251c87..000000000 --- a/base/linux26-rt/96-usb-hid-apple-kbd-mapping.patch +++ /dev/null @@ -1,59 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../linux26-rt/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. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# 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. -# --- 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 - ---- 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) { -- if (!hid_keyboard[usage->hid & HID_USAGE]) goto ignore; -- map_key_clear(hid_keyboard[usage->hid & HID_USAGE]); -+ unsigned char code = hid_keyboard[usage->hid & HID_USAGE]; -+ if (!code) goto ignore; -+ -+ /* Apple? */ -+ if (input->id.vendor == 0x5ac) { -+ /* alt->altgr, lmeta->alt, and no dups -+ due Linux meta bit parsing */ -+ switch (code) { -+ case 56: code = 100; break; -+ case 125: code = 56; break; -+ case 100: code = 127; 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 - --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)"); diff --git a/base/linux26-rt/arch-ppc-horizon-name-clash.patch b/base/linux26-rt/arch-ppc-horizon-name-clash.patch deleted file mode 100644 index 1b06b9946..000000000 --- a/base/linux26-rt/arch-ppc-horizon-name-clash.patch +++ /dev/null @@ -1,29 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../linux26-rt/arch-ppc-horizon-name-clash.patch -# Copyright (C) 2007 The OpenSDE Project -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# 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. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./drivers/atm/horizon.c.orig 2003-09-04 20:22:19.000000000 +0200 -+++ ./drivers/atm/horizon.c 2003-09-04 20:24:36.000000000 +0200 -@@ -481,7 +481,7 @@ - return; - } - --static inline void dump_regs (hrz_dev * dev) { -+static inline void dump_horizon_regs (hrz_dev * dev) { - #ifdef DEBUG_HORIZON - PRINTD (DBG_REGS, "CONTROL 0: %#x", rd_regl (dev, CONTROL_0_REG)); - PRINTD (DBG_REGS, "RX CONFIG: %#x", rd_regw (dev, RX_CONFIG_OFF));