Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jLk9R-0007a7-53 for mharc-grub-devel@gnu.org; Tue, 07 Apr 2020 05:04:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55298) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLk9P-0007Yj-7i for grub-devel@gnu.org; Tue, 07 Apr 2020 05:04:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLk9N-0005b3-U6 for grub-devel@gnu.org; Tue, 07 Apr 2020 05:04:07 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:57363 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jLk9N-0005YT-Qc for grub-devel@gnu.org; Tue, 07 Apr 2020 05:04:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586250245; 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: in-reply-to:in-reply-to:references:references; bh=qp3GUmunqVVU+R9llp4js8oQfuE63heyU5fJxgE3XNM=; b=VJ2zXRrDFgq52JZt6HPyd2hYHdUvbAVnQZzI0xQPf6EwpCedDYgpRw341B9t0jfrTvon1r SZjmpBPvSQq0ikTAJflGAsnInLqK28jlXh1s4lzGKTQGDKbMT9ErdP/rLgsFWXA5w+zchP EfHOTtEnTLGOQ8ZuxbRJUUgruRsuXAA= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-159-kry3slR0O8qN5njeqM6GPQ-1; Tue, 07 Apr 2020 05:04:03 -0400 X-MC-Unique: kry3slR0O8qN5njeqM6GPQ-1 Received: by mail-wm1-f69.google.com with SMTP id y1so330140wmj.3 for ; Tue, 07 Apr 2020 02:04:03 -0700 (PDT) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=/GHCeWzQU7IK8vdLtnEjbIv5liweuEtFCNi3KVQlYrg=; b=mpJyeBLVczgKFj6g1ihKbyK1gpQE/FVCR4tfpOGm2n5uoCdPM3I7WndZ7vaht275a5 7fwpgGGeINgmuM0h0yI/IaD5e/1Iclk0BNlywNR3W7F9SmlXXqSN7ohPxfF1QX5VY21q n7D/3M3n6OLXpl3o+/Wp2cgpZZ3ijDI5zyCgRPbTlGQkhhN53Z046F6roeHQNZ4nFKFe mXbbA30QMhKg1lYgawiovK90aFS+1i7p/Qxj9RgsWyCBnu+LNhTd+l9ukr8Q1l32CI8s viua1YU6vJ6ljMN7tLjCkFWlUm6J/InEL6G3v13KHlqk1Q7b2/mG0Y+Y+D0QlpYoyE9X MayA== X-Gm-Message-State: AGi0Pubm3L4tb5uKZ7wXiJA0SNIJAFDx7Dcz11YH6lmjPtVorszz6fyk gaLxVV9B/wO+c0Y4QRK3bdZDgnIJM4nHWW9MfaMjMTB/xU/L1E4pO30waKBBsKIZX/NhQpVKHSo dUOOWC/zbhUg= X-Received: by 2002:a5d:474b:: with SMTP id o11mr1536198wrs.4.1586250241991; Tue, 07 Apr 2020 02:04:01 -0700 (PDT) X-Google-Smtp-Source: APiQypKAq5HL8zT5dKXUJJ+kUkgX7iKl7Xffc7iEYHSuqcYqW4YTj9qKeBiTRJSoYsoZKCBBf5tnHw== X-Received: by 2002:a5d:474b:: with SMTP id o11mr1536180wrs.4.1586250241814; Tue, 07 Apr 2020 02:04:01 -0700 (PDT) Received: from minerva.home ([2a01:c50f:ab80:6700:527f:85b3:5615:ff0b]) by smtp.gmail.com with ESMTPSA id o13sm7805444wrm.74.2020.04.07.02.04.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 02:04:01 -0700 (PDT) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Hans de Goede , Daniel Kiper , Javier Martinez Canillas Subject: [PATCH v2 2/6] kern/term: Make grub_getkeystatus helper function available everywhere Date: Tue, 7 Apr 2020 11:03:47 +0200 Message-Id: <20200407090351.50921-3-javierm@redhat.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200407090351.50921-1-javierm@redhat.com> References: <20200407090351.50921-1-javierm@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Tue, 07 Apr 2020 09:04:08 -0000 From: Hans de Goede Move grub_getkeystatushelper function from grub-core/commands/keystatus.c to grub-core/kern/term.c and export it so that it can be used outside of the keystatus command code too. There's no logic change in this patch. The function definition is moved so it can be called from grub-core/kern/term.c in a subsequent patch. It will be used to determine if a SHIFT key has was held down and use that also to interrupt the countdown, without the need to press a key at the right time. Signed-off-by: Hans de Goede Signed-off-by: Javier Martinez Canillas --- Changes in v2: - Also mention in commit message that logic is unchanged after patch #2. - Explain why the helper function needs to be available for other modules. - Move patch #2 earlier in the patch-set since is a proparatory change. grub-core/commands/keystatus.c | 18 ------------------ grub-core/kern/term.c | 18 ++++++++++++++++++ include/grub/term.h | 1 + 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/grub-core/commands/keystatus.c b/grub-core/commands/keystatus.= c index 460cf4e7e50..ff3f5878163 100644 --- a/grub-core/commands/keystatus.c +++ b/grub-core/commands/keystatus.c @@ -35,24 +35,6 @@ static const struct grub_arg_option options[] =3D {0, 0, 0, 0, 0, 0} }; =20 -static int -grub_getkeystatus (void) -{ - int status =3D 0; - grub_term_input_t term; - - if (grub_term_poll_usb) - grub_term_poll_usb (0); - - FOR_ACTIVE_TERM_INPUTS(term) - { - if (term->getkeystatus) - status |=3D term->getkeystatus (term); - } - - return status; -} - static grub_err_t grub_cmd_keystatus (grub_extcmd_context_t ctxt, =09=09 int argc __attribute__ ((unused)), diff --git a/grub-core/kern/term.c b/grub-core/kern/term.c index 07720ee6746..93bd3378d18 100644 --- a/grub-core/kern/term.c +++ b/grub-core/kern/term.c @@ -120,6 +120,24 @@ grub_getkey (void) } } =20 +int +grub_getkeystatus (void) +{ + int status =3D 0; + grub_term_input_t term; + + if (grub_term_poll_usb) + grub_term_poll_usb (0); + + FOR_ACTIVE_TERM_INPUTS(term) + { + if (term->getkeystatus) + status |=3D term->getkeystatus (term); + } + + return status; +} + void grub_refresh (void) { diff --git a/include/grub/term.h b/include/grub/term.h index 8117e2a24da..c215133383f 100644 --- a/include/grub/term.h +++ b/include/grub/term.h @@ -327,6 +327,7 @@ grub_term_unregister_output (grub_term_output_t term) void grub_putcode (grub_uint32_t code, struct grub_term_output *term); int EXPORT_FUNC(grub_getkey) (void); int EXPORT_FUNC(grub_getkey_noblock) (void); +int EXPORT_FUNC(grub_getkeystatus) (void); void grub_cls (void); void EXPORT_FUNC(grub_refresh) (void); void grub_puts_terminal (const char *str, struct grub_term_output *term); --=20 2.25.1