From patchwork Thu Nov 15 12:32:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 10684265 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D74B513BF for ; Thu, 15 Nov 2018 12:35:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C77AA2C575 for ; Thu, 15 Nov 2018 12:35:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBC512C5AE; Thu, 15 Nov 2018 12:35:35 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 7095A2C575 for ; Thu, 15 Nov 2018 12:35:35 +0000 (UTC) Received: from localhost ([::1]:38405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNGru-00074P-5D for patchwork-qemu-devel@patchwork.kernel.org; Thu, 15 Nov 2018 07:35:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNGov-0004p7-IQ for qemu-devel@nongnu.org; Thu, 15 Nov 2018 07:32:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNGor-000616-Ij for qemu-devel@nongnu.org; Thu, 15 Nov 2018 07:32:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37860) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gNGop-0005zt-II for qemu-devel@nongnu.org; Thu, 15 Nov 2018 07:32:25 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F0A92307DAB0; Thu, 15 Nov 2018 12:32:21 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.36.118.1]) by smtp.corp.redhat.com (Postfix) with ESMTP id 757B75C26E; Thu, 15 Nov 2018 12:32:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A3A8F3101C2; Thu, 15 Nov 2018 13:32:18 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 15 Nov 2018 13:32:15 +0100 Message-Id: <20181115123218.25387-2-kraxel@redhat.com> In-Reply-To: <20181115123218.25387-1-kraxel@redhat.com> References: <20181115123218.25387-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 15 Nov 2018 12:32:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/4] keymaps: remove modifiers include 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: Li Qiang , Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP "common" is the only file using it, so we can just include it directly. Signed-off-by: Gerd Hoffmann --- pc-bios/keymaps/common | 19 ++++++++++++++++++- pc-bios/keymaps/modifiers | 18 ------------------ 2 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 pc-bios/keymaps/modifiers diff --git a/pc-bios/keymaps/common b/pc-bios/keymaps/common index adc56c77d2..aa844c82ed 100644 --- a/pc-bios/keymaps/common +++ b/pc-bios/keymaps/common @@ -1,4 +1,21 @@ -include modifiers +Shift_R 0x36 +Shift_L 0x2a + +Alt_R 0xb8 +Mode_switch 0xb8 +ISO_Level3_Shift 0xb8 +Alt_L 0x38 + +Control_R 0x9d +Control_L 0x1d + +# Translate Super to Windows keys. +# This is hardcoded. See documentation for details. +Super_R 0xdc +Super_L 0xdb + +# Translate Menu to the Windows Application key. +Menu 0xdd # # Top row diff --git a/pc-bios/keymaps/modifiers b/pc-bios/keymaps/modifiers deleted file mode 100644 index d73b7a6637..0000000000 --- a/pc-bios/keymaps/modifiers +++ /dev/null @@ -1,18 +0,0 @@ -Shift_R 0x36 -Shift_L 0x2a - -Alt_R 0xb8 -Mode_switch 0xb8 -ISO_Level3_Shift 0xb8 -Alt_L 0x38 - -Control_R 0x9d -Control_L 0x1d - -# Translate Super to Windows keys. -# This is hardcoded. See documentation for details. -Super_R 0xdc -Super_L 0xdb - -# Translate Menu to the Windows Application key. -Menu 0xdd