Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kb26Q-0007JH-85 for mharc-grub-devel@gnu.org; Fri, 06 Nov 2020 08:48:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kb26O-0007In-1v for grub-devel@gnu.org; Fri, 06 Nov 2020 08:48:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46874) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kb26L-0007FF-QK for grub-devel@gnu.org; Fri, 06 Nov 2020 08:48:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604670505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ei717S668CZV1ggQ0E74jCQhR30L8XM3Q/LfNHNY19w=; b=fSC2UrqHdi01ii/cpA3asxLVZNhfCJdtw16OEJMU+89bzneSv8ozDfBkg00WtMkgMysRBQ TECKXOqPD4h/HFCjvX4FnZYymFokzeSUD6u4cQ5IcsNjJkR0uDm2A2sawy4Kmd3l1B92oI BL9l5z9jtQpcfsE/Rhs1vmS0HdFcMVg= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-269-MyqglxgvPG-Ul_J3WdQJSQ-1; Fri, 06 Nov 2020 08:48:23 -0500 X-MC-Unique: MyqglxgvPG-Ul_J3WdQJSQ-1 Received: by mail-wm1-f70.google.com with SMTP id 8so454504wmg.6 for ; Fri, 06 Nov 2020 05:48:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ei717S668CZV1ggQ0E74jCQhR30L8XM3Q/LfNHNY19w=; b=WQOSLLaexTbiEkD/oEjwxM/02kionI4YqNRehcNGaDdnMNMjtSGBELslpd5sEWCWbf ozMSZ0I/rUXDTRTOv44IFQqniZwwGpgoEdXV7WjrVOoKfjZHJMHXGl7Plb24vq3DW5fy OufNgafZzBHKctk9tljE0kSuFzBzTxtYvROdZJdPtpeRKyb4/nN7XU/907QoSIo8DTQb omZLkkmHgZLk6u1jrEmmUpZL5L/b5yzZuMR+f77nOSCTHUsgjLP55Rz6G1YhBBqFHfov ueTtpm8uXBv9FxehkzArVwGa9+1XO2Om8x1CSCD7pRz+HBVbRySnhQj8DTQsvNSESsxF llGg== X-Gm-Message-State: AOAM530t0jHgkPA9PwhdlG38aDCi+OLc0s8L69mu++RDHuNYPJo0i0M4 5CuM+cpkIdwKa1Vu9sPj1oATpzAJH/EI60MD8ZnUf4JH8HK5z3Gbhg+TF/6iOsf97QAqL+ewMHL L+zkWEBINKiw= X-Received: by 2002:adf:93e1:: with SMTP id 88mr2677008wrp.37.1604670501851; Fri, 06 Nov 2020 05:48:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJyU3EOZJuyl+f5ljXRA0idmOVw4MkEBmdwZnUU15zCj243gPJ2y2cWbrPbOnQnIqp208nXIrA== X-Received: by 2002:adf:93e1:: with SMTP id 88mr2676987wrp.37.1604670501585; Fri, 06 Nov 2020 05:48:21 -0800 (PST) Received: from minerva.redhat.com ([92.176.231.106]) by smtp.gmail.com with ESMTPSA id f23sm2280346wmb.43.2020.11.06.05.48.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 05:48:20 -0800 (PST) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: =?UTF-8?q?Renaud=20M=C3=A9trich?= , Daniel Kiper , Vladimir Serbinenko , Javier Martinez Canillas Subject: [PATCH] at_keyboard: Fix keyboards that report IBM PC AT scan codes Date: Fri, 6 Nov 2020 14:48:16 +0100 Message-Id: <20201106134816.1202249-1-javierm@redhat.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=javierm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=javierm@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/06 07:11:31 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Nov 2020 13:48:28 -0000 GRUB has support for both the IBM PC XT (Set 1) and IBM PC AT (Set 2) key scan code mappings. But the driver always hardcodes to Set 1, overwriting the mode that was queried in the grub_keyboard_controller_init() function. This breaks keyboard mapping on machines whose firmwares are not using the Set 1. For example, this is the case in Lenovo P71 and HP Elitebook 8770W laptops that report key scan codes using Set 2. Instead of hardcoding to Set 1, use the value that was queried before. Reported-by: Renaud Métrich Signed-off-by: Javier Martinez Canillas --- grub-core/term/at_keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c index 597111077bd..ed2ea0904c1 100644 --- a/grub-core/term/at_keyboard.c +++ b/grub-core/term/at_keyboard.c @@ -165,7 +165,7 @@ set_scancodes (void) } #if !USE_SCANCODE_SET - ps2_state.current_set = 1; + ps2_state.current_set = grub_keyboard_orig_set; return; #else -- 2.28.0