From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752151AbdJYMsC (ORCPT ); Wed, 25 Oct 2017 08:48:02 -0400 Received: from mx2.suse.de ([195.135.220.15]:36163 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751833AbdJYMqb (ORCPT ); Wed, 25 Oct 2017 08:46:31 -0400 From: Max Staudt To: b.zolnierkie@samsung.com, linux-fbdev@vger.kernel.org Cc: mstaudt@suse.de, tiwai@suse.com, oneukum@suse.com, msrb@suse.com, sndirsch@suse.com, michal@markovi.net, linux-kernel@vger.kernel.org Subject: [RFC 07/14] bootsplash: Add VT keyboard hook Date: Wed, 25 Oct 2017 14:45:55 +0200 Message-Id: <20171025124602.28292-8-mstaudt@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20171025124602.28292-1-mstaudt@suse.de> References: <20171025124602.28292-1-mstaudt@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Let's disable the splash if the user presses ESC or F1-F12 on a VT. The F1-F12 check is to disable the splash on VT switches. Signed-off-by: Max Staudt Reviewed-by: Oliver Neukum --- drivers/tty/vt/keyboard.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index f4166263bb3a..177b35182b7c 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c @@ -47,6 +47,8 @@ #include +#include + extern void ctrl_alt_del(void); /* @@ -1353,6 +1355,15 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw) } #endif + /* Deactivate bootsplash on ESC or Alt+Fxx VT switch */ + if (((keycode >= KEY_F1 && keycode <= KEY_F12) || keycode == KEY_ESC) + && bootsplash_is_enabled()) { + bootsplash_disable(); + + if (keycode == KEY_ESC) + return; + } + if (kbd->kbdmode == VC_MEDIUMRAW) { /* * This is extended medium raw mode, with keys above 127 -- 2.12.3