From patchwork Thu Aug 18 02:27:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Programmingkid X-Patchwork-Id: 9286723 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D9F7360839 for ; Thu, 18 Aug 2016 02:33:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8A432912E for ; Thu, 18 Aug 2016 02:33:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB4D72913F; Thu, 18 Aug 2016 02:33:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UPPERCASE_50_75 autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4A5A82912E for ; Thu, 18 Aug 2016 02:33:14 +0000 (UTC) Received: from localhost ([::1]:50373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1baD8r-0001sP-9B for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Aug 2016 22:33:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1baD4Y-0007QZ-CR for qemu-devel@nongnu.org; Wed, 17 Aug 2016 22:28:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1baD4O-0004RG-Cx for qemu-devel@nongnu.org; Wed, 17 Aug 2016 22:28:45 -0400 Received: from mail-io0-x241.google.com ([2607:f8b0:4001:c06::241]:33666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1baD4I-0004Lq-UA; Wed, 17 Aug 2016 22:28:30 -0400 Received: by mail-io0-x241.google.com with SMTP id y195so1429399iod.0; Wed, 17 Aug 2016 19:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hQhGUA65FYIri6AaErKFFEFJu4XjGlpWhJWVc05Gxd0=; b=f/lv/dzDQFRbf7GOGrkBZzf33aRbos6LIBzeC19vjXOVeN5XQC4tWGsTa3KPn6mpM5 ypjJR0dbM4kHxbI2Mj3Jx315J84hQgmjWfmgM+KsMAOp1q9y40BMvNt1r9r5AQZ+3UyP 8khlf9OdnpwhevE9+42I/Pgnzk6Enbn+FWHknwlotrUQuzdi1JEkw6DpS1g5rh2yV3tN J+hx3cdb6yXvIdY9y0Ri1ZVO1cj0XFZ/moRQkm/yK6i9OoMkbZV2EH7/2qUPj4lWZdQi 4KgCy6yR3elwU+t4UJrRFwYsrnH1Q1O1nLAj0/UHw697o8vA99DQiBKIqSYS3p3+1LV2 lx8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hQhGUA65FYIri6AaErKFFEFJu4XjGlpWhJWVc05Gxd0=; b=Korvs996aWchAq8rYd34ybrTGcqQ7nfRlZIyv8NM8zi4VWQ0ibdozdSUVjp8pGFg2I fUXAI02s5G2fWVY11p6Bpub2kLsEerwmp1OgG/+IU2gYfRxWi7J+HuSxuI1Xd055jcUf nNIohAHRBRg7VzJy1Or6Fu656vdYT7YTAalF7S6ZrfArJp+xaqW+kdGhRFAeNLPDNkYD jmcrNAfYrxwtqe7ODlR8Ymi72g4Mbt9jh/aYK9mojuo7M9Kdyvh79vYPlGsY6swT7zJf s/087w7McoSKNhDEJNMekvZOpNcIeGM6887tPUX+h7lN0sFD0eeOMdRyGfTfhqwYO9js fNQw== X-Gm-Message-State: AEkoousYhdECb9G0alQm0v4SyA/0p+jgcoxrKef3gOYdnHhJwDPoy4NwS1Gn/iyZn2MOUw== X-Received: by 10.107.140.205 with SMTP id o196mr430628iod.42.1471487310508; Wed, 17 Aug 2016 19:28:30 -0700 (PDT) Received: from localhost.localdomain (d199-74-164-53.col.wideopenwest.com. [74.199.53.164]) by smtp.gmail.com with ESMTPSA id n23sm169896ioe.18.2016.08.17.19.28.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Aug 2016 19:28:29 -0700 (PDT) From: John Arbuckle To: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au, qemu-devel@nongnu.org Date: Wed, 17 Aug 2016 22:27:49 -0400 Message-Id: <1471487270-1490-4-git-send-email-programmingkidx@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1471487270-1490-1-git-send-email-programmingkidx@gmail.com> References: <1471487270-1490-1-git-send-email-programmingkidx@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4001:c06::241 Subject: [Qemu-devel] [PATCH v5 3/4] 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: John Arbuckle Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 18c220b..12c6333 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,