diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2011-10-11 15:00:17 -0700 |
|---|---|---|
| committer | Bill Richardson <wfrichar@chromium.org> | 2011-10-11 15:30:11 -0700 |
| commit | 0600e41e0fd2912486832a150f75765ab6c90a2b (patch) | |
| tree | b9641ab5c0a4aa98ec4df5e047f9af0c0d8b0849 | |
| parent | 5b96f812de2c23c05fdb91b2c110baa1c802f781 (diff) | |
| download | vboot-0600e41e0fd2912486832a150f75765ab6c90a2b.tar.gz | |
new signature for optional easter egg.
BUG=none
TEST=none
Change-Id: I86743dbba3210858d817c8e6982f17df96920420
Reviewed-on: http://gerrit.chromium.org/gerrit/9889
Tested-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | firmware/include/utility.h | 4 | ||||
| -rw-r--r-- | firmware/lib/include/vboot_display.h | 3 | ||||
| -rw-r--r-- | firmware/lib/vboot_display.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/firmware/include/utility.h b/firmware/include/utility.h index e0a710cf..5a71e835 100644 --- a/firmware/include/utility.h +++ b/firmware/include/utility.h @@ -45,9 +45,9 @@ /* Optional, up to the BIOS */ #ifdef VBOOT_EASTER_EGG -#define VBEASTEREGG(A,B) VbExEasterEgg(A,B) +#define VBEASTEREGG VbExEasterEgg() #else -#define VBEASTEREGG(A,B) 0 +#define VBEASTEREGG 0 #endif /* Combine [msw] and [lsw] uint16s to a uint32_t with its [msw] and diff --git a/firmware/lib/include/vboot_display.h b/firmware/lib/include/vboot_display.h index 782fc877..57688aed 100644 --- a/firmware/lib/include/vboot_display.h +++ b/firmware/lib/include/vboot_display.h @@ -19,8 +19,5 @@ VbError_t VbDisplayDebugInfo(VbCommonParams* cparams, VbNvContext *vncptr); VbError_t VbCheckDisplayKey(VbCommonParams* cparams, uint32_t key, VbNvContext *vncptr); -/* If not VBERROR_SUCCESS, will need to refresh the display */ -VbError_t VbExEasterEgg(VbCommonParams* cparams, VbNvContext *vncptr); - #endif /* VBOOT_REFERENCE_VBOOT_DISPLAY_H_ */ diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index 92880492..c0df16b2 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -605,7 +605,7 @@ VbError_t VbCheckDisplayKey(VbCommonParams* cparams, uint32_t key, } if (0 == Memcmp(MagicBuffer, MAGIC_WORD, MAGIC_WORD_LEN)) { - if (VBEASTEREGG(cparams, vncptr)) + if (VBEASTEREGG) (void)VbDisplayScreen(cparams, disp_current_screen, 1, vncptr); } |