diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2011-12-20 15:05:03 -0800 |
|---|---|---|
| committer | Stefan Reinauer <reinauer@chromium.org> | 2011-12-20 16:23:54 -0800 |
| commit | 9e27318a990f7c89b8bcecef48736589b0417fc5 (patch) | |
| tree | acf312e00730b70ff3af36a3531d920f662ed309 | |
| parent | 556aa0c7893a4a73f7b2fbfcc43f4ad1924c85d6 (diff) | |
| download | vboot-9e27318a990f7c89b8bcecef48736589b0417fc5.tar.gz | |
Display debug info on all screens for testing.
THIS IS A TEMPORARY WORKAROUND TO MAKE THE RECOVERY
REASON AVAILABLE ON SYSTEMS WITH NON-WORKING USB
KEYBOARDS. TO BE REMOVED AS SOON AS ALL USB FIXES
WENT IN.
BUG=none
TEST=none
Change-Id: I3d8611de5ba8e9ff5765303a02caed4fd2035ff3
Reviewed-on: https://gerrit.chromium.org/gerrit/13269
Tested-by: Stefan Reinauer <reinauer@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | firmware/lib/vboot_display.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index 120f7be6..11429306 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -357,11 +357,18 @@ VbError_t VbDisplayScreen(VbCommonParams* cparams, uint32_t screen, int force, disp_current_screen = screen; /* Look in the GBB first */ - if (VBERROR_SUCCESS == VbDisplayScreenFromGBB(cparams, screen, vncptr)) + if (VBERROR_SUCCESS == VbDisplayScreenFromGBB(cparams, screen, vncptr)) { + if (VB_SCREEN_BLANK != screen) + VbDisplayDebugInfo(cparams, vncptr); return VBERROR_SUCCESS; + } /* If the screen wasn't in the GBB bitmaps, fall back to a default screen. */ - return VbExDisplayScreen(screen); + retval = VbExDisplayScreen(screen); + if (VB_SCREEN_BLANK != screen) + VbDisplayDebugInfo(cparams, vncptr); + return retval; + } @@ -480,7 +487,7 @@ VbError_t VbDisplayDebugInfo(VbCommonParams* cparams, VbNvContext *vncptr) { uint32_t i; /* Redisplay the current screen, to overwrite any previous debug output */ - VbDisplayScreen(cparams, disp_current_screen, 1, vncptr); + // VbDisplayScreen(cparams, disp_current_screen, 1, vncptr); /* Add hardware ID */ used += Strncat(buf + used, "HWID: ", DEBUG_INFO_SIZE - used); |