From patchwork Fri May 20 22:42:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Programmingkid X-Patchwork-Id: 624668 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rBNpg5ksZz9t5x for ; Sat, 21 May 2016 09:06:19 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Q8b0t/3t; dkim-atps=neutral Received: from localhost ([::1]:37811 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3tUn-0000PC-I2 for incoming@patchwork.ozlabs.org; Fri, 20 May 2016 19:06:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3t7b-0003fN-Iz for qemu-devel@nongnu.org; Fri, 20 May 2016 18:42:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3t7W-0005Bx-5M for qemu-devel@nongnu.org; Fri, 20 May 2016 18:42:18 -0400 Received: from mail-io0-x242.google.com ([2607:f8b0:4001:c06::242]:33732) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3t7V-0005Bi-Un for qemu-devel@nongnu.org; Fri, 20 May 2016 18:42:14 -0400 Received: by mail-io0-x242.google.com with SMTP id x35so23043997ioi.0 for ; Fri, 20 May 2016 15:42:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:content-transfer-encoding:subject:date:message-id:cc:to :mime-version; bh=Uhg9chB12FGfWVxQbxZrUgFEqJM2j7wrJ/2cG8g3dTY=; b=Q8b0t/3tDWU8+CjJbNffn/gXQ8VEDAeblBlv5etU/X1JZaY0dpxgslqTJu2cMZa0/V WNxdeMVrFHid/PD6LL7MpDsiM7NIiMSHYsODqrr2lUujtBmm3o3+LFo2+jvMeEep8sbo W9fZYChMZiG4ceBKsljOa4Zv5TS+wSavMf6aFE1n4vXNNUwHZos+Bva+uTvw0rYNlgES kyHRJPLlhUIfqG6kUMiqEQn7+x2FoTT6H63wqMgOHpDY6bubFXTa4KComUg7idEcFE9v FH3TvfkthzivDjIP0xt7gTEwlyLA87vYU0lC24Rzt0g0vRSh5EmisBV4+8mpc0sURcck QYoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:content-transfer-encoding:subject:date :message-id:cc:to:mime-version; bh=Uhg9chB12FGfWVxQbxZrUgFEqJM2j7wrJ/2cG8g3dTY=; b=eKn8SNN8bV2ZUgVfPZBxuFWMwWPK55JSc2wF9JQFUo7faHoYQcr8HL8RDu+eXiI6U5 0gOEmcCchj3hF/J1KRopFkb1886TaPRvwI0Er8H9/kleBTwSU42cBm7Kv/1shLPdEM02 GKuDWqQyoY+6COlsq35CJspAE0l0cpY6N93XDyCgSUb/c7B+nQLi+3nwoSWJd8nep1e+ V5JDXRZmXr1+v6WrfNwLVNRnjTW0r7Mps61bLnnrdZsPjg1yfBSZGlrI2nbrMiVdvMIs chXPu3L12ZfdTcg7aMW6AqPKq4WuOZATcSQnMNnAwIRrbhoLqKkWgSxYEbPi2TKKKdWV ceMQ== X-Gm-Message-State: AOPr4FVXHJsmU8lALvsdoq1UAFoR1Zxi8K5cg8/RqJoNPNb4ZvQOXWmyHwvuJuUvlgLG8w== X-Received: by 10.107.47.158 with SMTP id v30mr5727022iov.8.1463784133461; Fri, 20 May 2016 15:42:13 -0700 (PDT) Received: from [192.168.0.5] (d199-74-164-53.col.wideopenwest.com. [74.199.53.164]) by smtp.gmail.com with ESMTPSA id 11sm6456271ioe.25.2016.05.20.15.42.12 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 May 2016 15:42:12 -0700 (PDT) From: Programmingkid Date: Fri, 20 May 2016 18:42:11 -0400 Message-Id: To: Peter Maydell Mime-Version: 1.0 (Apple Message framework v1084) X-Mailer: Apple Mail (2.1084) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4001:c06::242 Subject: [Qemu-devel] [PATCH v4 3/5] adb.c: correct several key assignments X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel qemu-devel Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The original pc_to_adb_keycode mapping did have several keys that were incorrectly mapped. This patch fixes these mappings. Signed-off-by: John Arbuckle --- v4 changes: Removed NO_KEY related code. Kept all the "= 0" code near the end of the qcode_to_adb_keycode. hw/input/adb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/input/adb.c b/hw/input/adb.c index bbf0f44..5ca7b4a 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -196,7 +196,7 @@ int qcode_to_adb_keycode[] = { [Q_KEY_CODE_SHIFT_R] = ADB_KEY_RIGHT_SHIFT, [Q_KEY_CODE_ALT] = ADB_KEY_LEFT_OPTION, [Q_KEY_CODE_ALT_R] = ADB_KEY_RIGHT_OPTION, - [Q_KEY_CODE_ALTGR] = 0, + [Q_KEY_CODE_ALTGR] = ADB_KEY_RIGHT_OPTION, [Q_KEY_CODE_CTRL] = ADB_KEY_LEFT_CONTROL, [Q_KEY_CODE_CTRL_R] = ADB_KEY_RIGHT_CONTROL, [Q_KEY_CODE_META_L] = ADB_KEY_COMMAND, @@ -269,13 +269,13 @@ int qcode_to_adb_keycode[] = { [Q_KEY_CODE_F10] = ADB_KEY_F10, [Q_KEY_CODE_F11] = ADB_KEY_F11, [Q_KEY_CODE_F12] = ADB_KEY_F12, - [Q_KEY_CODE_PRINT] = 0, - [Q_KEY_CODE_SYSRQ] = 0, + [Q_KEY_CODE_PRINT] = ADB_KEY_F13, + [Q_KEY_CODE_SYSRQ] = ADB_KEY_F13, [Q_KEY_CODE_SCROLL_LOCK] = ADB_KEY_F14, - [Q_KEY_CODE_PAUSE] = 0, + [Q_KEY_CODE_PAUSE] = ADB_KEY_F15, [Q_KEY_CODE_NUM_LOCK] = ADB_KEY_KP_CLEAR, - [Q_KEY_CODE_KP_EQUALS] = 0, + [Q_KEY_CODE_KP_EQUALS] = ADB_KEY_KP_EQUAL, [Q_KEY_CODE_KP_DIVIDE] = ADB_KEY_KP_DIVIDE, [Q_KEY_CODE_KP_MULTIPLY] = ADB_KEY_KP_MULTIPLY, [Q_KEY_CODE_KP_SUBTRACT] = ADB_KEY_KP_SUBTRACT, @@ -298,7 +298,7 @@ int qcode_to_adb_keycode[] = { [Q_KEY_CODE_LEFT] = ADB_KEY_LEFT, [Q_KEY_CODE_RIGHT] = ADB_KEY_RIGHT, - [Q_KEY_CODE_HELP] = 0, + [Q_KEY_CODE_HELP] = ADB_KEY_HELP, [Q_KEY_CODE_INSERT] = ADB_KEY_HELP, [Q_KEY_CODE_DELETE] = ADB_KEY_FORWARD_DELETE, [Q_KEY_CODE_HOME] = ADB_KEY_HOME,