summaryrefslogtreecommitdiff
path: root/include/bootretry.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-04-10 20:01:31 -0600
committerTom Rini <trini@ti.com>2014-05-29 17:49:00 -0400
commitb26440f1fa243396000536028ea00e5e185b6b6a (patch)
tree5a49215c1ccf6fcb80d4abc476f04df39556b6d0 /include/bootretry.h
parent0098e179e1afacb3cf595c67a98b8739dc7edcde (diff)
downloadu-boot-imx-b26440f1fa243396000536028ea00e5e185b6b6a.zip
u-boot-imx-b26440f1fa243396000536028ea00e5e185b6b6a.tar.gz
u-boot-imx-b26440f1fa243396000536028ea00e5e185b6b6a.tar.bz2
Rename bootretry functions and remove #ifdefs
Add a bootretry_ prefix to these two functions, and remove the need for the #ifdef around everything (it moves to the Makefile). Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/bootretry.h')
-rw-r--r--include/bootretry.h38
1 files changed, 33 insertions, 5 deletions
diff --git a/include/bootretry.h b/include/bootretry.h
index 025c29d..2ecd7a4 100644
--- a/include/bootretry.h
+++ b/include/bootretry.h
@@ -5,8 +5,8 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef __bootretry_h
-#define __bootretry_h
+#ifndef __BOOTRETRY_H
+#define __BOOTRETRY_H
#ifdef CONFIG_BOOT_RETRY_TIME
/**
@@ -18,14 +18,42 @@
* @return 0 if a key is received in time, -ETIMEDOUT if not
*/
int bootretry_tstc_timeout(void);
+
+/**
+ * bootretry_init_cmd_timeout() - set up command timeout
+ *
+ * Get the required command timeout from the environment.
+ */
+void bootretry_init_cmd_timeout(void);
+
+/**
+ * bootretry_reset_cmd_timeout() - reset command timeout
+ *
+ * Reset the command timeout so that the user has a fresh start. This is
+ * typically used when input is received from the user.
+ */
+void bootretry_reset_cmd_timeout(void);
+
+/** bootretry_dont_retry() - Indicate that we should not retry the boot */
+void bootretry_dont_retry(void);
#else
static inline int bootretry_tstc_timeout(void)
{
return 0;
}
-#endif
-void init_cmd_timeout(void);
-void reset_cmd_timeout(void);
+static inline void bootretry_init_cmd_timeout(void)
+{
+}
+
+static inline void bootretry_reset_cmd_timeout(void)
+{
+}
+
+static inline void bootretry_dont_retry(void)
+{
+}
+
+#endif
#endif