Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jOfFm-0006lX-Pr for mharc-grub-devel@gnu.org; Wed, 15 Apr 2020 06:26:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43608) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfFj-0006br-Aa for grub-devel@gnu.org; Wed, 15 Apr 2020 06:26:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOfFi-0005fl-5v for grub-devel@gnu.org; Wed, 15 Apr 2020 06:26:43 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:51779 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOfFi-0005fV-2J for grub-devel@gnu.org; Wed, 15 Apr 2020 06:26:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586946401; 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=MzV/f31LYSzxiTpss7tIDb+32veWvjFBYS/8YBfePp0=; b=ddIAANECp0mYnsyHQilAFk0JMw/c8mkJnPUe8T39p4gE/zyBdCz+jAX86qjmNV+5Ie95FE YSJx4fyNSKwpPtnGq0dIDF6CVAMHn1uJhh5bASrMdo1eOzkdo1d7VV1H914pR4pJ8Qvj4x md3tafydeU4nXHsVuRbaeGguWjUopN8= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-384--_8Z2l5VPL2Oe6cNdUPVMg-1; Wed, 15 Apr 2020 06:26:40 -0400 X-MC-Unique: -_8Z2l5VPL2Oe6cNdUPVMg-1 Received: by mail-wr1-f71.google.com with SMTP id h14so10322673wrr.12 for ; Wed, 15 Apr 2020 03:26:39 -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=OViylf3+JXBuUvPHYzDT+uWkhe8qEfm1KsTvExAOXNY=; b=PHnHjmGaJ0kxu1ynSz5RJZ877OX1M+EpxXqeE7FfH0AcWquUMyvfVMzfLN7OwkmSZr mB5piJ29QzMgsM56YNAsRItlFzGjFrSTQa7NTmPvjYGH3iDMl+JKedulBHQ6KjnM6Q0l U6SQRdI6Fq6nPD5N7nvqIuGbw4qvQ7x6xIFxYjpWZANKmvcLPMfGGn8RvVuVr42MWzqz G+0zq/TIvcXYHHqLQIf1RUAlJSh5pxvzXFZ1Y1TY0Y8iajvOeWJ5BTMJh/aXm/ngmrkV +d2NN5bLdegw4rUpMvVPtWYmC3AFOe3dlr9rSkO4qWJNlE8d++iBoLIn/8VrKEBzRzPu sl1A== X-Gm-Message-State: AGi0Puay/BmVwrpGYInfbr/8X665UEnbtbK88tiHbuGMU2B3j4N/XInS W5A3Tf829vVEaUQGWOG+W1rS20f6kL33YRi4AMY+7a/e+2d6UCx7Sc/JqhGlOhN5VirBNFpRJMJ TbfXOfh/F2us= X-Received: by 2002:adf:ff89:: with SMTP id j9mr13874996wrr.245.1586946398415; Wed, 15 Apr 2020 03:26:38 -0700 (PDT) X-Google-Smtp-Source: APiQypLR6gbOmoh4oJxKM8bvJgL94k3Mgi8R8CPBmH4amxgojFi1fCnIW/xyItX+CvcFn09Z/gnyvg== X-Received: by 2002:adf:ff89:: with SMTP id j9mr13874978wrr.245.1586946398158; Wed, 15 Apr 2020 03:26:38 -0700 (PDT) Received: from minerva.redhat.com ([2a01:c50f:ab80:6700:527f:85b3:5615:ff0b]) by smtp.gmail.com with ESMTPSA id n124sm22803517wma.11.2020.04.15.03.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 03:26:37 -0700 (PDT) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Hans de Goede , Daniel Kiper , Javier Martinez Canillas Subject: [PATCH v3 2/6] kern/term: Make grub_getkeystatus helper function available everywhere Date: Wed, 15 Apr 2020 12:26:18 +0200 Message-Id: <20200415102622.1890550-3-javierm@redhat.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200415102622.1890550-1-javierm@redhat.com> References: <20200415102622.1890550-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] X-Received-From: 205.139.110.61 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: Wed, 15 Apr 2020 10:26:44 -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 Reviewed-by: Daniel Kiper --- Changes in v3: None 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