Edward O'Callaghan submitted this change.
dmi.c: Hide has_dmi_support global behind method
This allows has_dmi_support to be become static local
to just the scope of dmi.c
BUG=none
TEST=builds
Change-Id: Ibded9714998ea6f2e5d4e0512fa7c6b105f9638a
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/59283
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nikolai Artemiev <nartemiev@google.com>
Reviewed-by: Sam McNally <sammc@google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Thomas Heijligen <src@posteo.de>
---
M board_enable.c
M dmi.c
M programmer.h
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/board_enable.c b/board_enable.c
index 442db33..9e4ab93 100644
--- a/board_enable.c
+++ b/board_enable.c
@@ -2666,7 +2666,7 @@
#if defined(__i386__) || defined(__x86_64__)
if (board->dmi_pattern) {
- if (!has_dmi_support) {
+ if (!dmi_is_supported()) {
msg_pwarn("Warning: Can't autodetect %s %s, DMI info unavailable.\n",
board->vendor_name, board->board_name);
msg_pinfo("Please supply the board vendor and model name with the "
diff --git a/dmi.c b/dmi.c
index a7b300d..a82b494 100644
--- a/dmi.c
+++ b/dmi.c
@@ -40,7 +40,12 @@
/* Strings longer than 4096 in DMI are just insane. */
#define DMI_MAX_ANSWER_LEN 4096
-int has_dmi_support = 0;
+static bool g_has_dmi_support = false;
+
+bool dmi_is_supported(void)
+{
+ return g_has_dmi_support;
+}
static struct {
const char *const keyword;
@@ -405,7 +410,7 @@
break;
}
- has_dmi_support = 1;
+ g_has_dmi_support = true;
unsigned int i;
for (i = 0; i < ARRAY_SIZE(dmi_strings); i++) {
msg_pdbg("DMI string %s: \"%s\"\n", dmi_strings[i].keyword,
@@ -465,7 +470,7 @@
{
unsigned int i;
- if (!has_dmi_support)
+ if (!dmi_is_supported())
return 0;
for (i = 0; i < ARRAY_SIZE(dmi_strings); i++) {
diff --git a/programmer.h b/programmer.h
index 33cbcc7..0657bb1 100644
--- a/programmer.h
+++ b/programmer.h
@@ -245,8 +245,8 @@
/* dmi.c */
#if defined(__i386__) || defined(__x86_64__)
-extern int has_dmi_support;
void dmi_init(void);
+bool dmi_is_supported(void);
int dmi_match(const char *pattern);
#endif // defined(__i386__) || defined(__x86_64__)
To view, visit change 59283. To unsubscribe, or for help writing mail filters, visit settings.