1
0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 07:02:34 +02:00

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>
This commit is contained in:
Edward O'Callaghan 2021-11-13 23:53:14 +11:00 committed by Edward O'Callaghan
parent 170ad8991e
commit c706e6b52c
3 changed files with 10 additions and 5 deletions

View File

@ -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 "

11
dmi.c
View File

@ -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++) {

View File

@ -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__)