summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathew King <mathewk@chromium.org>2019-10-31 12:10:44 -0600
committerPatrick Georgi <pgeorgi@google.com>2019-11-04 11:31:12 +0000
commitbe820b3911ce5983690114682a8f4af3277f50ba (patch)
tree67b7f7b0b540cffa8fd13eff41d32432d843376a
parentf91c0f993544867613b15e9bd00fdc0556378e2e (diff)
smbios: Create a type for smbios_enclosure_type
Add a name to the SMBIOS enclosure type enum and use it as the return type for smbios_mainboard_enclosure_type. BUG=b:143701965 TEST=compiles Change-Id: I816e17f0de2b0c119ddab638e57b0652f53f5b61 Signed-off-by: Mathew King <mathewk@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36516 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/arch/x86/smbios.c2
-rw-r--r--src/include/smbios.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c
index 5edf3c6e0c..261888fc7f 100644
--- a/src/arch/x86/smbios.c
+++ b/src/arch/x86/smbios.c
@@ -492,7 +492,7 @@ smbios_board_type __weak smbios_mainboard_board_type(void)
return SMBIOS_BOARD_TYPE_UNKNOWN;
}
-u8 __weak smbios_mainboard_enclosure_type(void)
+smbios_enclosure_type __weak smbios_mainboard_enclosure_type(void)
{
return CONFIG_SMBIOS_ENCLOSURE_TYPE;
}
diff --git a/src/include/smbios.h b/src/include/smbios.h
index ef1c7de72c..d230fb2e1e 100644
--- a/src/include/smbios.h
+++ b/src/include/smbios.h
@@ -65,7 +65,6 @@ const char *smbios_mainboard_bios_version(void);
const char *smbios_mainboard_asset_tag(void);
u8 smbios_mainboard_feature_flags(void);
const char *smbios_mainboard_location_in_chassis(void);
-u8 smbios_mainboard_enclosure_type(void);
#define BIOS_CHARACTERISTICS_PCI_SUPPORTED (1 << 7)
#define BIOS_CHARACTERISTICS_PC_CARD (1 << 8)
@@ -319,7 +318,7 @@ struct smbios_type2 {
u8 eos[2];
} __packed;
-enum {
+typedef enum {
SMBIOS_ENCLOSURE_OTHER = 0x01,
SMBIOS_ENCLOSURE_UNKNOWN = 0x02,
SMBIOS_ENCLOSURE_DESKTOP = 0x03,
@@ -356,7 +355,7 @@ enum {
SMBIOS_ENCLOSURE_EMBEDDED_PC = 0x22,
SMBIOS_ENCLOSURE_MINI_PC = 0x23,
SMBIOS_ENCLOSURE_STICK_PC = 0x24,
-};
+} smbios_enclosure_type;
struct smbios_type3 {
u8 type;
@@ -798,5 +797,6 @@ void smbios_fill_dimm_locator(const struct dimm_info *dimm,
struct smbios_type17 *t);
smbios_board_type smbios_mainboard_board_type(void);
+smbios_enclosure_type smbios_mainboard_enclosure_type(void);
#endif