diff options
| author | Simon Glass <sjg@chromium.org> | 2013-08-12 15:12:47 -0600 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-08-24 09:37:48 -0700 |
| commit | 981cb2acdc2f26ae27732a4e590c326787936381 (patch) | |
| tree | 1a6bf6aa9a2ac8f81bedcf59e44a2bc215c2c2fb /firmware/lib/vboot_audio.c | |
| parent | 798cc91de11d5a78e379c67731dcafaf2aae01e1 (diff) | |
| download | vboot-981cb2acdc2f26ae27732a4e590c326787936381.tar.gz | |
Enable vboot for sandbox and improve debugging/format strings
Some functions of vboot are disabled for sandbox because sandbox could not
support them. This has changed, so remove the sandbox #ifdefs in the code.
Some printf() strings cause warnings on sandbox - mostly that uin64_t is
not 'long long' on a 64-bit machine. The existing format strings in U-Boot
do not seem to take account of this, so add casts to remove the warnings.
Also add a few more debug strings to make it easier to see what is happening
in the vboot flow.
BUG=chrome-os-partner:21115
BRANCH=pit
TEST=manual
crosfw -b sandbox -V
See there are no warnings.
Change-Id: I86f90a693e4bd23fcacf6d48297dd32229348dd4
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/65621
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'firmware/lib/vboot_audio.c')
| -rw-r--r-- | firmware/lib/vboot_audio.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/firmware/lib/vboot_audio.c b/firmware/lib/vboot_audio.c index 8f96b68e..5414f325 100644 --- a/firmware/lib/vboot_audio.c +++ b/firmware/lib/vboot_audio.c @@ -221,7 +221,8 @@ VbAudioContext *VbAudioOpen(VbCommonParams *cparams) VbExSleepMs(10); b = VbExGetTimer(); ticks_per_msec = (b - a) / 10ULL ; - VBDEBUG(("VbAudioOpen() - ticks_per_msec is %llu\n", ticks_per_msec)); + VBDEBUG(("VbAudioOpen() - ticks_per_msec is %" PRIu64 "\n", + ticks_per_msec)); /* Initialize */ Memset(audio, 0, sizeof(*audio)); @@ -260,10 +261,6 @@ int VbAudioLooping(VbAudioContext *audio) uint16_t msec = 0; int looping = 1; -#if defined(CONFIG_SANDBOX) - return 0; -#endif - now = VbExGetTimer(); while (audio->next_note < audio->note_count && now >= audio->play_until) { |