From 8c03950f59c86df17eca8dfe2a8bdc7ea3e075c7 Mon Sep 17 00:00:00 2001 From: Yu-Ping Wu Date: Fri, 17 Apr 2020 11:36:20 +0800 Subject: vboot: Rename VB_AUX_FW_* to VB2_AUXFW_* For naming consistency, rename any variations of "AUX_FW" to "auxfw". BRANCH=none BUG=none TEST=make runtests Cq-Depend: chromium:2154265 Change-Id: Icf74215f5babf19228f2f362c3c29c9b14794dfc Signed-off-by: Yu-Ping Wu Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2154266 Reviewed-by: Joel Kitching --- tests/vb2_auxfw_sync_tests.c | 70 ++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'tests') diff --git a/tests/vb2_auxfw_sync_tests.c b/tests/vb2_auxfw_sync_tests.c index 104455f9..75b139be 100644 --- a/tests/vb2_auxfw_sync_tests.c +++ b/tests/vb2_auxfw_sync_tests.c @@ -50,8 +50,8 @@ static void ResetMocks(void) memset(&gbb, 0, sizeof(gbb)); auxfw_retval = VB2_SUCCESS; - auxfw_mock_severity = VB_AUX_FW_NO_UPDATE; - auxfw_update_severity = VB_AUX_FW_NO_UPDATE; + auxfw_mock_severity = VB2_AUXFW_NO_UPDATE; + auxfw_update_severity = VB2_AUXFW_NO_UPDATE; auxfw_mock_display_available = 1; auxfw_update_req = 0; auxfw_protected = 0; @@ -68,7 +68,7 @@ vb2_error_t vb2ex_auxfw_check(enum vb2_auxfw_update_severity *severity) { *severity = auxfw_mock_severity; auxfw_update_severity = auxfw_mock_severity; - if (*severity == VB_AUX_FW_SLOW_UPDATE) + if (*severity == VB2_AUXFW_SLOW_UPDATE) if (!auxfw_mock_display_available) return VB2_REQUEST_REBOOT; return VB2_SUCCESS; @@ -76,15 +76,15 @@ vb2_error_t vb2ex_auxfw_check(enum vb2_auxfw_update_severity *severity) vb2_error_t vb2ex_auxfw_update(void) { - if (auxfw_update_severity != VB_AUX_FW_NO_DEVICE && - auxfw_update_severity != VB_AUX_FW_NO_UPDATE) + if (auxfw_update_severity != VB2_AUXFW_NO_DEVICE && + auxfw_update_severity != VB2_AUXFW_NO_UPDATE) auxfw_update_req = 1; return auxfw_retval; } vb2_error_t vb2ex_auxfw_finalize(struct vb2_context *c) { - auxfw_protected = auxfw_update_severity != VB_AUX_FW_NO_DEVICE; + auxfw_protected = auxfw_update_severity != VB2_AUXFW_NO_DEVICE; return auxfw_done_retval; } @@ -102,61 +102,61 @@ static void VbSoftwareSyncTest(void) { ResetMocks(); gbb.flags |= VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC; - auxfw_mock_severity = VB_AUX_FW_FAST_UPDATE; + auxfw_mock_severity = VB2_AUXFW_FAST_UPDATE; test_auxsync(VB2_REQUEST_REBOOT_EC_TO_RO, 0, "VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC" - " does not disable auxiliary FW update request"); - TEST_EQ(auxfw_update_req, 1, " aux fw update requested"); - TEST_EQ(auxfw_protected, 0, " aux fw protected"); + " does not disable auxfw update request"); + TEST_EQ(auxfw_update_req, 1, " auxfw update requested"); + TEST_EQ(auxfw_protected, 0, " auxfw protected"); ResetMocks(); gbb.flags |= VB2_GBB_FLAG_DISABLE_AUXFW_SOFTWARE_SYNC; - auxfw_mock_severity = VB_AUX_FW_FAST_UPDATE; + auxfw_mock_severity = VB2_AUXFW_FAST_UPDATE; test_auxsync(VB2_SUCCESS, 0, "VB2_GBB_FLAG_DISABLE_AUXFW_SOFTWARE_SYNC" - " disables auxiliary FW update request"); - TEST_EQ(auxfw_update_req, 0, " aux fw update disabled"); - TEST_EQ(auxfw_protected, 1, " aux fw protected"); + " disables auxfw update request"); + TEST_EQ(auxfw_update_req, 0, " auxfw update disabled"); + TEST_EQ(auxfw_protected, 1, " auxfw protected"); ResetMocks(); - auxfw_mock_severity = VB_AUX_FW_NO_DEVICE; + auxfw_mock_severity = VB2_AUXFW_NO_DEVICE; test_auxsync(VB2_SUCCESS, 0, - "No auxiliary FW update needed"); - TEST_EQ(auxfw_update_req, 0, " no aux fw update requested"); - TEST_EQ(auxfw_protected, 0, " no aux fw protected"); + "No auxfw update needed"); + TEST_EQ(auxfw_update_req, 0, " no auxfw update requested"); + TEST_EQ(auxfw_protected, 0, " no auxfw protected"); ResetMocks(); - auxfw_mock_severity = VB_AUX_FW_NO_UPDATE; + auxfw_mock_severity = VB2_AUXFW_NO_UPDATE; test_auxsync(VB2_SUCCESS, 0, - "No auxiliary FW update needed"); - TEST_EQ(auxfw_update_req, 0, " no aux fw update requested"); - TEST_EQ(auxfw_protected, 1, " aux fw protected"); + "No auxfw update needed"); + TEST_EQ(auxfw_update_req, 0, " no auxfw update requested"); + TEST_EQ(auxfw_protected, 1, " auxfw protected"); ResetMocks(); - auxfw_mock_severity = VB_AUX_FW_FAST_UPDATE; + auxfw_mock_severity = VB2_AUXFW_FAST_UPDATE; test_auxsync(VB2_REQUEST_REBOOT_EC_TO_RO, 0, - "Fast auxiliary FW update needed"); - TEST_EQ(auxfw_update_req, 1, " aux fw update requested"); - TEST_EQ(auxfw_protected, 0, " aux fw protected"); + "Fast auxfw update needed"); + TEST_EQ(auxfw_update_req, 1, " auxfw update requested"); + TEST_EQ(auxfw_protected, 0, " auxfw protected"); ResetMocks(); - auxfw_mock_severity = VB_AUX_FW_SLOW_UPDATE; + auxfw_mock_severity = VB2_AUXFW_SLOW_UPDATE; auxfw_mock_display_available = 0; test_auxsync(VB2_REQUEST_REBOOT, 0, - "Slow auxiliary FW update needed - reboot for display"); + "Slow auxfw update needed - reboot for display"); ResetMocks(); - auxfw_mock_severity = VB_AUX_FW_SLOW_UPDATE; + auxfw_mock_severity = VB2_AUXFW_SLOW_UPDATE; test_auxsync(VB2_REQUEST_REBOOT_EC_TO_RO, 0, - "Slow auxiliary FW update needed"); - TEST_EQ(auxfw_update_req, 1, " aux fw update requested"); - TEST_EQ(auxfw_protected, 0, " aux fw protected"); + "Slow auxfw update needed"); + TEST_EQ(auxfw_update_req, 1, " auxfw update requested"); + TEST_EQ(auxfw_protected, 0, " auxfw protected"); ResetMocks(); - auxfw_mock_severity = VB_AUX_FW_FAST_UPDATE; + auxfw_mock_severity = VB2_AUXFW_FAST_UPDATE; auxfw_retval = VB2_ERROR_UNKNOWN; - test_auxsync(VB2_ERROR_UNKNOWN, VB2_RECOVERY_AUX_FW_UPDATE, - "Error updating AUX firmware"); + test_auxsync(VB2_ERROR_UNKNOWN, VB2_RECOVERY_AUXFW_UPDATE, + "Error updating auxfw"); } int main(void) -- cgit v1.2.1