From patchwork Mon Apr 27 07:23:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 20067 X-Patchwork-Delegate: lenb@kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3R7YOYN003325 for ; Mon, 27 Apr 2009 07:34:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752220AbZD0HeW (ORCPT ); Mon, 27 Apr 2009 03:34:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753410AbZD0HeW (ORCPT ); Mon, 27 Apr 2009 03:34:22 -0400 Received: from iksaif.net ([88.191.73.63]:44685 "EHLO iksaif.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752220AbZD0HeV (ORCPT ); Mon, 27 Apr 2009 03:34:21 -0400 Received: from localhost.localdomain (cxr69-11-88-180-139-205.fbx.proxad.net [88.180.139.205]) (Authenticated sender: corentincj@iksaif.net) by iksaif.net (Postfix) with ESMTPA id DAF59C90028; Mon, 27 Apr 2009 09:25:39 +0200 (CEST) From: Corentin Chary To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, Corentin Chary Subject: [PATCH 6/7] asus-laptop: fix input keycode Date: Mon, 27 Apr 2009 09:23:42 +0200 Message-Id: <1240817023-5985-7-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1240817023-5985-6-git-send-email-corentincj@iksaif.net> References: <1240817023-5985-1-git-send-email-corentincj@iksaif.net> <1240817023-5985-2-git-send-email-corentincj@iksaif.net> <1240817023-5985-3-git-send-email-corentincj@iksaif.net> <1240817023-5985-4-git-send-email-corentincj@iksaif.net> <1240817023-5985-5-git-send-email-corentincj@iksaif.net> <1240817023-5985-6-git-send-email-corentincj@iksaif.net> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org KEY_STOP is now KEY_STOPCD It's the correct key to stop a media BTN_EXTRA is now KEY_SCREENLOCK: The laptop manual tells us that this key is for screenlock KEY_TV is now KEY_PROG1 So it can be reported to X server Ref: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/361505 Signed-off-by: Corentin Chary --- drivers/platform/x86/asus-laptop.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index eeafc6c..bfc1a88 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c @@ -269,16 +269,16 @@ static struct key_entry asus_keymap[] = { {KE_KEY, 0x34, KEY_SWITCHVIDEOMODE}, {KE_KEY, 0x40, KEY_PREVIOUSSONG}, {KE_KEY, 0x41, KEY_NEXTSONG}, - {KE_KEY, 0x43, KEY_STOP}, + {KE_KEY, 0x43, KEY_STOPCD}, {KE_KEY, 0x45, KEY_PLAYPAUSE}, {KE_KEY, 0x50, KEY_EMAIL}, {KE_KEY, 0x51, KEY_WWW}, - {KE_KEY, 0x5C, BTN_EXTRA}, /* Performance */ + {KE_KEY, 0x5C, KEY_SCREENLOCK}, /* Screenlock */ {KE_KEY, 0x5D, KEY_WLAN}, {KE_KEY, 0x61, KEY_SWITCHVIDEOMODE}, {KE_KEY, 0x6B, BTN_TOUCH}, /* Lock Mouse */ {KE_KEY, 0x82, KEY_CAMERA}, - {KE_KEY, 0x8A, KEY_TV}, + {KE_KEY, 0x8A, KEY_PROG1}, {KE_KEY, 0x95, KEY_MEDIA}, {KE_KEY, 0x99, KEY_PHONE}, {KE_END, 0},