rename tried_fwb constants

Change-Id: Ib8018bfe29eed50766c699d832efe4f1afcabb1a

BUG=none
TEST=make && make runtests

Review URL: http://codereview.chromium.org/6597015

4 files changed, 9 insertions, 9 deletions

diff --git a/firmware/include/vboot_nvstorage.h b/firmware/include/vboot_nvstorage.h
index 4b92e7f8..f70cf521 100644
--- a/firmware/include/vboot_nvstorage.h
+++ b/firmware/include/vboot_nvstorage.h
@@ -49,7 +49,7 @@ typedef enum VbNvParam {
   VBNV_KERNEL_FIELD,
   /* Firmware checked RW slot B before slot A on the current boot because
    * VBNV_TRY_B_COUNT was non-zero at that time.  0=no; 1=yes. */
-  VBNV_FW_USED_TRY_B,
+  VBNV_TRIED_FIRMWARE_B,
   /* Firmware verified the kernel key block signature using the key stored
    * in the firmware.  0=no, just used the key block hash; 1=yes, used the
    * key block signature. */
diff --git a/firmware/lib/vboot_nvstorage.c b/firmware/lib/vboot_nvstorage.c
index ec6e55de..d9158041 100644
--- a/firmware/lib/vboot_nvstorage.c
+++ b/firmware/lib/vboot_nvstorage.c
@@ -27,7 +27,7 @@
 #define LOCALIZATION_OFFSET          3
 
 #define FIRMWARE_FLAGS_OFFSET        5
-#define FIRMWARE_FW_USED_TRY_B          0x80
+#define FIRMWARE_TRIED_FIRMWARE_B       0x80
 #define FIRMWARE_FW_VERIFIED_KERNEL_KEY 0x40
 
 #define KERNEL_FIELD_OFFSET         11
@@ -125,8 +125,8 @@ int VbNvGet(VbNvContext* context, VbNvParam param, uint32_t* dest) {
                | (raw[KERNEL_FIELD_OFFSET + 3] << 24));
       return 0;
 
-    case VBNV_FW_USED_TRY_B:
-      *dest = (raw[FIRMWARE_FLAGS_OFFSET] & FIRMWARE_FW_USED_TRY_B ? 1 : 0);
+    case VBNV_TRIED_FIRMWARE_B:
+      *dest = (raw[FIRMWARE_FLAGS_OFFSET] & FIRMWARE_TRIED_FIRMWARE_B ? 1 : 0);
       return 0;
 
     case VBNV_FW_VERIFIED_KERNEL_KEY:
@@ -201,11 +201,11 @@ int VbNvSet(VbNvContext* context, VbNvParam param, uint32_t value) {
       raw[KERNEL_FIELD_OFFSET + 3] = (uint8_t)(value >> 24);
       break;
 
-    case VBNV_FW_USED_TRY_B:
+    case VBNV_TRIED_FIRMWARE_B:
       if (value)
-        raw[FIRMWARE_FLAGS_OFFSET] |= FIRMWARE_FW_USED_TRY_B;
+        raw[FIRMWARE_FLAGS_OFFSET] |= FIRMWARE_TRIED_FIRMWARE_B;
       else
-        raw[FIRMWARE_FLAGS_OFFSET] &= ~FIRMWARE_FW_USED_TRY_B;
+        raw[FIRMWARE_FLAGS_OFFSET] &= ~FIRMWARE_TRIED_FIRMWARE_B;
       break;
 
     case VBNV_FW_VERIFIED_KERNEL_KEY:
diff --git a/host/lib/crossystem.c b/host/lib/crossystem.c
index da9d80b5..9fe1febb 100644
--- a/host/lib/crossystem.c
+++ b/host/lib/crossystem.c
@@ -486,7 +486,7 @@ int VbGetSystemPropertyInt(const char* name) {
   }
   /* NV storage values with no defaults for older BIOS. */
   else if (!strcasecmp(name,"tried_fwb")) {
-    value = VbGetNvStorage(VBNV_FW_USED_TRY_B);
+    value = VbGetNvStorage(VBNV_TRIED_FIRMWARE_B);
   }
   /* NV storage values.  If unable to get from NV storage, fall back to the
    * CMOS reboot field used by older BIOS. */
diff --git a/tests/vboot_nvstorage_test.c b/tests/vboot_nvstorage_test.c
index b3753713..40fa6890 100644
--- a/tests/vboot_nvstorage_test.c
+++ b/tests/vboot_nvstorage_test.c
@@ -29,7 +29,7 @@ static VbNvField nvfields[] = {
   {VBNV_RECOVERY_REQUEST, 0, 0x42, 0xED, "recovery request"},
   {VBNV_LOCALIZATION_INDEX, 0, 0x69, 0xB0, "localization index"},
   {VBNV_KERNEL_FIELD, 0, 0x12345678, 0xFEDCBA98, "kernel field"},
-  {VBNV_FW_USED_TRY_B, 0, 1, 0, "firmware used try B"},
+  {VBNV_TRIED_FIRMWARE_B, 0, 1, 0, "tried firmware B"},
   {VBNV_FW_VERIFIED_KERNEL_KEY, 0, 1, 0, "firmware verified kernel key"},
   {0, 0, 0, 0, NULL}
 };