openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 22:21:16 +02:00
Code Issues Releases Wiki Activity

Skip DMI laptop check if DMI doesn't work

Browse Source 
Also further removes dead code from dmi.c and adds a missing newline.

Corresponding to flashrom svn r936.

Signed-off-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
This commit is contained in:
Michael Karcher
2010-03-14 17:57:52 +00:00
parent 8111e7ffa4
commit fd41670dd6
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dmi.c
View File

@ -24,21 +24,7 @@
#include "flash.h" #include "flash.h"
enum dmi_strings { const char *dmidecode_names[] = {
DMI_SYS_MANUFACTURER,
DMI_SYS_PRODUCT,
DMI_SYS_VERSION,
DMI_BB_MANUFACTURER,
DMI_BB_PRODUCT,
DMI_BB_VERSION,
DMI_ID_INVALID, /* This must always be the last entry! */
};
/*
* The short_id for baseboard starts with "m" as in mainboard to leave
* "b" available for BIOS.
*/
const char *dmidecode_names[DMI_ID_INVALID] = {
"system-manufacturer", "system-manufacturer",
"system-product-name", "system-product-name",
"system-version", "system-version",
@ -51,7 +37,7 @@ const char *dmidecode_names[DMI_ID_INVALID] = {
const char *dmidecode_command = "dmidecode"; const char *dmidecode_command = "dmidecode";
int has_dmi_support = 0; int has_dmi_support = 0;
char *dmistrings[DMI_ID_INVALID]; char *dmistrings[ARRAY_SIZE(dmidecode_names)];
/* Strings longer than 4096 in DMI are just insane. */ /* Strings longer than 4096 in DMI are just insane. */
#define DMI_MAX_ANSWER_LEN 4096 #define DMI_MAX_ANSWER_LEN 4096
@ -104,17 +90,17 @@ void dmi_init(void)
char *chassis_type; char *chassis_type;
has_dmi_support = 1; has_dmi_support = 1;
for (i = 0; i < DMI_ID_INVALID; i++) { for (i = 0; i < ARRAY_SIZE(dmidecode_names); i++) {
dmistrings[i] = get_dmi_string(dmidecode_names[i]); dmistrings[i] = get_dmi_string(dmidecode_names[i]);
if (!dmistrings[i]) { if (!dmistrings[i]) {
has_dmi_support = 0; has_dmi_support = 0;
break; return;
} }
} }
chassis_type = get_dmi_string("chassis-type"); chassis_type = get_dmi_string("chassis-type");
if (chassis_type && !strcmp(chassis_type, "Notebook")) { if (chassis_type && !strcmp(chassis_type, "Notebook")) {
printf_debug("Laptop detected via DMI"); printf_debug("Laptop detected via DMI\n");
is_laptop = 1; is_laptop = 1;
} }
free(chassis_type); free(chassis_type);
@ -175,7 +161,7 @@ int dmi_match(const char *pattern)
if (!has_dmi_support) if (!has_dmi_support)
return 0; return 0;
for (i = 0; i < DMI_ID_INVALID; i++) for (i = 0; i < ARRAY_SIZE(dmidecode_names); i++)
if (dmi_compare(dmistrings[i], pattern)) if (dmi_compare(dmistrings[i], pattern))
return 1; return 1;