diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2017-10-18 11:48:37 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-10-24 17:33:41 -0400 |
| commit | 5060d077aa6fb4f6f917758e530c92ebbce1fff3 (patch) | |
| tree | 6f5f59d0cb1cfc00ab12029dfa846c5b85f9eb21 /src/include | |
| parent | e2637863657ed0c52cb4c00347997ad2cb7bca5f (diff) | |
| download | talos-hostboot-5060d077aa6fb4f6f917758e530c92ebbce1fff3.tar.gz talos-hostboot-5060d077aa6fb4f6f917758e530c92ebbce1fff3.zip | |
Make CONSOLE calls a NOOP in HBRT instead of compile fail
Change allows CONSOLE::displayf calls to be present in the
code without requiring explicit HOSTBOOT_RUNTIME checks.
Change-Id: I431a6977a1b9d40b8365028458270dabae2f6dc0
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48568
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: ILYA SMIRNOV <ismirno@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/usr/console/consoleif.H | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/include/usr/console/consoleif.H b/src/include/usr/console/consoleif.H index 7ae92ed7a..497252ded 100644 --- a/src/include/usr/console/consoleif.H +++ b/src/include/usr/console/consoleif.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2015 */ +/* Contributors Listed Below - COPYRIGHT 2014,2017 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -36,7 +36,7 @@ namespace CONSOLE * * @param[in] - String to display. */ -#ifdef CONFIG_CONSOLE +#if (defined(CONFIG_CONSOLE) && !defined(__HOSTBOOT_RUNTIME)) extern void display(const char*); #else inline void display(const char*) {}; @@ -47,7 +47,7 @@ namespace CONSOLE * @param[in] - Header (or NULL). * @param[in] - Format string. */ -#ifdef CONFIG_CONSOLE +#if (defined(CONFIG_CONSOLE) && !defined(__HOSTBOOT_RUNTIME)) extern void displayf(const char*, const char*, ...); #else inline void displayf(const char*, const char*, ...) {}; @@ -59,7 +59,7 @@ namespace CONSOLE * @param[in] - Format string. * @param[in] - va_list of arguments. */ -#ifdef CONFIG_CONSOLE +#if (defined(CONFIG_CONSOLE) && !defined(__HOSTBOOT_RUNTIME)) extern void vdisplayf(const char*, const char*, va_list); #else inline void vdisplayf(const char*, const char*, va_list) {}; @@ -68,7 +68,7 @@ namespace CONSOLE /** @brief Wait for console buffers to be flushed to device. */ -#ifdef CONFIG_CONSOLE +#if (defined(CONFIG_CONSOLE) && !defined(__HOSTBOOT_RUNTIME)) extern void flush(); #else inline void flush() {}; @@ -76,4 +76,5 @@ namespace CONSOLE }; + #endif |
