diff options
| -rw-r--r-- | board_enable.c | 2 | ||||
| -rw-r--r-- | dmi.c | 11 | ||||
| -rw-r--r-- | programmer.h | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/board_enable.c b/board_enable.c index 442db331..9e4ab93c 100644 --- a/board_enable.c +++ b/board_enable.c @@ -2666,7 +2666,7 @@ static const struct board_match *board_match_pci_ids(enum board_match_phase phas #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 " @@ -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 @@ void dmi_init(void) 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 @@ int dmi_match(const char *pattern) { 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 33cbcc79..0657bb1c 100644 --- a/programmer.h +++ b/programmer.h @@ -245,8 +245,8 @@ int cb_check_image(const uint8_t *bios, unsigned int size); /* 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__) |