diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2011-10-11 11:53:29 -0700 |
|---|---|---|
| committer | Bill Richardson <wfrichar@chromium.org> | 2011-10-11 14:12:51 -0700 |
| commit | 5b96f812de2c23c05fdb91b2c110baa1c802f781 (patch) | |
| tree | aaf8e999704d40e9502f96d700bdae0443ac2533 | |
| parent | 89c1a3b3efc0bdb0aee3641e2a62f8aee13b0d3c (diff) | |
| download | vboot-5b96f812de2c23c05fdb91b2c110baa1c802f781.tar.gz | |
Some easter eggs may need a refresh.
BUG=none
TEST=none
Change-Id: I4b8cffa63dd10261e45a5ca6233b4d5cd2471f62
Reviewed-on: http://gerrit.chromium.org/gerrit/9861
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Tested-by: Bill Richardson <wfrichar@chromium.org>
| -rw-r--r-- | firmware/include/utility.h | 2 | ||||
| -rw-r--r-- | firmware/lib/include/vboot_display.h | 3 | ||||
| -rw-r--r-- | firmware/lib/vboot_display.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/firmware/include/utility.h b/firmware/include/utility.h index 931789cb..e0a710cf 100644 --- a/firmware/include/utility.h +++ b/firmware/include/utility.h @@ -47,7 +47,7 @@ #ifdef VBOOT_EASTER_EGG #define VBEASTEREGG(A,B) VbExEasterEgg(A,B) #else -#define VBEASTEREGG(A,B) +#define VBEASTEREGG(A,B) 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 8dc22606..782fc877 100644 --- a/firmware/lib/include/vboot_display.h +++ b/firmware/lib/include/vboot_display.h @@ -19,7 +19,8 @@ VbError_t VbDisplayDebugInfo(VbCommonParams* cparams, VbNvContext *vncptr); VbError_t VbCheckDisplayKey(VbCommonParams* cparams, uint32_t key, VbNvContext *vncptr); -void VbExEasterEgg(VbCommonParams* cparams, 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 5022d20e..92880492 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -605,7 +605,8 @@ VbError_t VbCheckDisplayKey(VbCommonParams* cparams, uint32_t key, } if (0 == Memcmp(MagicBuffer, MAGIC_WORD, MAGIC_WORD_LEN)) { - VBEASTEREGG(cparams, vncptr); + if (VBEASTEREGG(cparams, vncptr)) + (void)VbDisplayScreen(cparams, disp_current_screen, 1, vncptr); } return VBERROR_SUCCESS; |