commit 07056feba09dc13f5817d708c363ed256a0f94ab
author Angel Pons <th3fanbus@gmail.com> Thu May 20 11:35:15 2021 +0200
committer Felix Held <felix-coreboot@felixheld.de> Wed May 26 12:26:36 2021 +0000
tree 06a45e125520da62f286d16be4833d5644dc4564
parent b2a4c27a2fa2348b5b9589a8e228cdd34feb459b

option: Decouple API from CMOS backend

Prepare to allow using other backends to store options.

Change-Id: I3f838d27bf476207c6dc8f2c1f15c3fa9ae47d87
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/54727
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

src/drivers/pc80/rtc/option.c

diff --git a/src/drivers/pc80/rtc/option.c b/src/drivers/pc80/rtc/option.c
index cc4138b..1474b57 100644
--- a/src/drivers/pc80/rtc/option.c
+++ b/src/drivers/pc80/rtc/option.c
@@ -84,7 +84,7 @@
 	return NULL;
 }
 
-enum cb_err cmos_get_uint_option(unsigned int *dest, const char *name)
+static enum cb_err cmos_get_uint_option(unsigned int *dest, const char *name)
 {
 	struct cmos_option_table *ct;
 	struct cmos_entries *ce;
@@ -113,6 +113,12 @@
 	return CB_SUCCESS;
 }
 
+unsigned int get_uint_option(const char *name, const unsigned int fallback)
+{
+	unsigned int value = 0;
+	return cmos_get_uint_option(&value, name) == CB_SUCCESS ? value : fallback;
+}
+
 static enum cb_err set_cmos_value(unsigned long bit, unsigned long length,
 				  void *vret)
 {
@@ -154,7 +160,7 @@
 	return CB_SUCCESS;
 }
 
-enum cb_err cmos_set_uint_option(const char *name, unsigned int *value)
+static enum cb_err cmos_set_uint_option(const char *name, unsigned int *value)
 {
 	struct cmos_option_table *ct;
 	struct cmos_entries *ce;
@@ -180,6 +186,11 @@
 	return CB_SUCCESS;
 }
 
+enum cb_err set_uint_option(const char *name, unsigned int value)
+{
+	return cmos_set_uint_option(name, &value);
+}
+
 int cmos_lb_cks_valid(void)
 {
 	return cmos_checksum_valid(LB_CKS_RANGE_START, LB_CKS_RANGE_END, LB_CKS_LOC);

src/include/option.h

diff --git a/src/include/option.h b/src/include/option.h
index 74a6bbb..4089378 100644
--- a/src/include/option.h
+++ b/src/include/option.h
@@ -7,25 +7,23 @@
 
 void sanitize_cmos(void);
 
-enum cb_err cmos_set_uint_option(const char *name, unsigned int *value);
-enum cb_err cmos_get_uint_option(unsigned int *dest, const char *name);
-
-static inline enum cb_err set_uint_option(const char *name, unsigned int value)
-{
-	if (CONFIG(USE_OPTION_TABLE))
-		return cmos_set_uint_option(name, &value);
-
-	return CB_CMOS_OTABLE_DISABLED;
-}
+#if !CONFIG(USE_OPTION_TABLE)
 
 static inline unsigned int get_uint_option(const char *name, const unsigned int fallback)
 {
-	if (CONFIG(USE_OPTION_TABLE)) {
-		unsigned int value = 0;
-		if (cmos_get_uint_option(&value, name) == CB_SUCCESS)
-			return value;
-	}
 	return fallback;
 }
 
+static inline enum cb_err set_uint_option(const char *name, unsigned int value)
+{
+	return CB_CMOS_OTABLE_DISABLED;
+}
+
+#else /* USE_OPTION_TABLE */
+
+unsigned int get_uint_option(const char *name, const unsigned int fallback);
+enum cb_err set_uint_option(const char *name, unsigned int value);
+
+#endif /* USE_OPTION_TABLE? */
+
 #endif /* _OPTION_H_ */