Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2140)

Unified Diff: firmware/lib/vboot_firmware.c

Issue 6676039: Fix compiler errors on MSVC (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/vboot_reference.git@master
Patch Set: ...and fix gcc again Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « firmware/lib/tpm_bootmode.c ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: firmware/lib/vboot_firmware.c
diff --git a/firmware/lib/vboot_firmware.c b/firmware/lib/vboot_firmware.c
index 95db892c6b0e247c7453784189846207cc03e9ca..6265acc702266dbfec86da42b6cfefa79db32ce2 100644
--- a/firmware/lib/vboot_firmware.c
+++ b/firmware/lib/vboot_firmware.c
@@ -54,7 +54,7 @@ int LoadFirmware(LoadFirmwareParams* params) {
uint32_t status;
uint32_t test_err = 0;
int good_index = -1;
- int boot_fw_keyblock_flags = 0;
+ uint64_t boot_fw_keyblock_flags = 0;
int is_dev;
int index;
int i;
@@ -292,7 +292,7 @@ int LoadFirmware(LoadFirmwareParams* params) {
/* At this point, we have a good idea of how we are going to boot. Update the
* TPM with this state information.
*/
- status = SetTPMBootModeState(is_dev, 0, boot_fw_keyblock_flags);
+ status = SetTPMBootModeState(is_dev, 0, (int)boot_fw_keyblock_flags);
if (0 != status) {
VBDEBUG(("Unable to update the TPM with boot mode information.\n"));
if (status == TPM_E_MUST_REBOOT)
« no previous file with comments | « firmware/lib/tpm_bootmode.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698