diff options
author | Mathew King <mathewk@chromium.org> | 2019-03-18 16:13:26 -0600 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-26 04:43:05 -0700 |
commit | 4cab32fbf65910513e2e6cbda1d283d6afce59a5 (patch) | |
tree | 40768006398966fa4e44464240c8a4db72d8f16e /firmware/lib/vboot_ui.c | |
parent | c4daa6e936a5dc2dad28bb1e07af995c05b37a99 (diff) | |
download | vboot-4cab32fbf65910513e2e6cbda1d283d6afce59a5.tar.gz |
Arrow keys change language on vendor data uis
BUG=b:127843397
TEST=Tested set and confirm screens on local arcada device
BRANCH=none
Change-Id: Ifafba3fd32a79131cf1d2059ef2147c074f3a3b6
Reviewed-on: https://chromium-review.googlesource.com/1529751
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Mathew King <mathewk@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'firmware/lib/vboot_ui.c')
-rw-r--r-- | firmware/lib/vboot_ui.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/firmware/lib/vboot_ui.c b/firmware/lib/vboot_ui.c index 2e3bb270..65f47986 100644 --- a/firmware/lib/vboot_ui.c +++ b/firmware/lib/vboot_ui.c @@ -159,7 +159,7 @@ int VbUserConfirms(struct vb2_context *ctx, uint32_t confirm_flags) return 1; } } - VbCheckDisplayKey(ctx, key); + VbCheckDisplayKey(ctx, key, NULL); } VbExSleepMs(CONFIRM_KEY_DELAY); } @@ -215,7 +215,7 @@ VbError_t vb2_altfw_ui(struct vb2_context *ctx) break; default: VB2_DEBUG("VbBootDeveloper() - pressed key %d\n", key); - VbCheckDisplayKey(ctx, key); + VbCheckDisplayKey(ctx, key, NULL); break; } VbExSleepMs(DEV_KEY_DELAY); @@ -296,6 +296,7 @@ VbError_t vb2_enter_vendor_data_ui(struct vb2_context *ctx, char *data_value) break; default: VB2_DEBUG("Vendor Data UI - pressed key %d\n", key); + VbCheckDisplayKey(ctx, key, &data); break; } VbExSleepMs(DEV_KEY_DELAY); @@ -362,6 +363,7 @@ VbError_t vb2_vendor_data_ui(struct vb2_context *ctx) } default: VB2_DEBUG("Vendor Data UI - pressed key %d\n", key); + VbCheckDisplayKey(ctx, key, &data); break; } VbExSleepMs(DEV_KEY_DELAY); @@ -444,7 +446,7 @@ VbError_t vb2_diagnostics_ui(struct vb2_context *ctx) default: VB2_DEBUG("vb2_diagnostics_ui() - pressed key %d\n", key); - VbCheckDisplayKey(ctx, key); + VbCheckDisplayKey(ctx, key, NULL); break; } if (VbExGetTimer() - start_time_us >= 30 * VB_USEC_PER_SEC) { @@ -738,7 +740,7 @@ VbError_t vb2_developer_ui(struct vb2_context *ctx) break; default: VB2_DEBUG("VbBootDeveloper() - pressed key %d\n", key); - VbCheckDisplayKey(ctx, key); + VbCheckDisplayKey(ctx, key, NULL); break; } @@ -822,7 +824,7 @@ static VbError_t recovery_ui(struct vb2_context *ctx) VB2_DEBUG("VbBootRecovery() waiting for manual recovery\n"); while (1) { key = VbExKeyboardRead(); - VbCheckDisplayKey(ctx, key); + VbCheckDisplayKey(ctx, key, NULL); if (VbWantShutdown(ctx, key)) return VBERROR_SHUTDOWN_REQUESTED; VbExSleepMs(REC_KEY_DELAY); @@ -925,7 +927,7 @@ static VbError_t recovery_ui(struct vb2_context *ctx) vb2_nv_set(ctx, VB2_NV_DIAG_REQUEST, 1); return VBERROR_REBOOT_REQUIRED; } else { - VbCheckDisplayKey(ctx, key); + VbCheckDisplayKey(ctx, key, NULL); } if (VbWantShutdown(ctx, key)) return VBERROR_SHUTDOWN_REQUESTED; |