summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHung-Te Lin <hungte@chromium.org>2014-03-19 16:00:30 +0800
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-03-19 15:45:17 +0000
commit0038946fbea2617800ec9ffa6f95d2eea3243c3d (patch)
treed7e1eca6667e786e0c3567dc8289b856ae048f99
parent970e781bb4ce1ca96133d2b2ceac25dfdfd1d9d2 (diff)
downloadvboot-firmware-zako-5219.17.B.tar.gz
firmware: Support new firmware screen "WRONG ADAPTER".firmware-zako-5219.Bfirmware-zako-5219.17.B
Support the screen which is explicitly designed for Zako, which needs to prompt user when wrong AC adapter is connected. BUG=chrome-os-partner:25024 TEST=emerge-zako vboot_reference BRANCH=zako Change-Id: I9e522517e4fe1fc66ba5b1830aae57b3fbf32cd5 Reviewed-on: https://chromium-review.googlesource.com/190666 Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Commit-Queue: Hung-Te Lin <hungte@chromium.org>
-rw-r--r--firmware/include/bmpblk_header.h3
-rw-r--r--firmware/include/vboot_api.h2
-rw-r--r--firmware/lib/vboot_display.c3
3 files changed, 8 insertions, 0 deletions
diff --git a/firmware/include/bmpblk_header.h b/firmware/include/bmpblk_header.h
index 4889a6a8..70e480a5 100644
--- a/firmware/include/bmpblk_header.h
+++ b/firmware/include/bmpblk_header.h
@@ -93,6 +93,9 @@ typedef enum ScreenIndex {
SCREEN_DEVELOPER_TO_NORM,
SCREEN_WAIT,
SCREEN_TO_NORM_CONFIRMED,
+ SCREEN_CHARGING,
+ SCREEN_CHARGING_EMPTY,
+ SCREEN_WRONG_ADAPTER,
MAX_VALID_SCREEN_INDEX,
SCREEN_BLANK = ~0UL,
} ScreenIndex;
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h
index 92b9411d..5645e4af 100644
--- a/firmware/include/vboot_api.h
+++ b/firmware/include/vboot_api.h
@@ -644,6 +644,8 @@ enum VbScreenType_t {
VB_SCREEN_WAIT = 0x206,
/* Confirm after DEVELOPER_TO_NORM */
VB_SCREEN_TO_NORM_CONFIRMED = 0x207,
+ /* Prompt when wrong AC adpater is connected. */
+ VB_SCREEN_WRONG_ADAPTER = 0x300,
};
/**
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
index 910c60a0..c7682def 100644
--- a/firmware/lib/vboot_display.c
+++ b/firmware/lib/vboot_display.c
@@ -188,6 +188,9 @@ VbError_t VbDisplayScreenFromGBB(VbCommonParams *cparams, uint32_t screen,
case VB_SCREEN_TO_NORM_CONFIRMED:
screen_index = SCREEN_TO_NORM_CONFIRMED;
break;
+ case VB_SCREEN_WRONG_ADAPTER:
+ screen_index = SCREEN_WRONG_ADAPTER;
+ break;
case VB_SCREEN_BLANK:
case VB_SCREEN_DEVELOPER_EGG:
default: