1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
88 lines
2.4 KiB
Diff
88 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Wed, 6 Jun 2018 16:47:11 +0200
|
|
Subject: [PATCH] Make grub_getkeystatus helper funtion available everywhere
|
|
|
|
Move the grub_getkeystatus helper 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.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
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[] =
|
|
{0, 0, 0, 0, 0, 0}
|
|
};
|
|
|
|
-static int
|
|
-grub_getkeystatus (void)
|
|
-{
|
|
- int status = 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 |= term->getkeystatus (term);
|
|
- }
|
|
-
|
|
- return status;
|
|
-}
|
|
-
|
|
static grub_err_t
|
|
grub_cmd_keystatus (grub_extcmd_context_t ctxt,
|
|
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)
|
|
}
|
|
}
|
|
|
|
+int
|
|
+grub_getkeystatus (void)
|
|
+{
|
|
+ int status = 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 |= 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);
|