From 57a5a13ef730c5c46d9db159ed9b7a466cc70388 Mon Sep 17 00:00:00 2001 From: Rajan Vaja Date: Wed, 27 Jan 2021 22:19:51 -0800 Subject: [PATCH] zynqmp_pmufw: Fix reset ops for assert() New compiler toolchain treats "assert" as a macro always. So rename the existing "assert" variable to "resetAssert" in the codebase. Signed-off-by: Rajan Vaja Acked-by: Ravi Patel Acked-by: Tejas Patel --- lib/sw_apps/zynqmp_pmufw/src/pm_reset.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c b/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c index c66aae4a0c..bcd8aa73db 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c @@ -1,5 +1,5 @@ /* -* Copyright (c) 2014 - 2020 Xilinx, Inc. All rights reserved. +* Copyright (c) 2014 - 2021 Xilinx, Inc. All rights reserved. * SPDX-License-Identifier: MIT */ @@ -34,7 +34,7 @@ * @pulse Function performing reset pulse operation */ typedef struct PmResetOps { - void (*const assert)(const PmReset* const rst, const u32 action); + void (*const resetAssert)(const PmReset* const rst, const u32 action); u32 (*const getStatus)(const PmReset* const s); u32 (*const pulse)(const PmReset* const rst); } PmResetOps; @@ -399,37 +399,37 @@ static u32 PmResetPulsePl(const PmReset* const rst) } static const PmResetOps pmResetOpsGeneric = { - .assert = PmResetAssertGen, + .resetAssert = PmResetAssertGen, .getStatus = PmResetGetStatusGen, .pulse = PmResetPulseGen, }; static const PmResetOps pmResetOpsGpo = { - .assert = PmResetAssertGpo, + .resetAssert = PmResetAssertGpo, .getStatus = PmResetGetStatusGpo, .pulse = PmResetPulseGpo, }; static const PmResetOps pmResetOpsRom = { - .assert = PmResetAssertRom, + .resetAssert = PmResetAssertRom, .getStatus = PmResetGetStatusRom, .pulse = PmResetPulseRom, }; static const PmResetOps pmResetOpsNoAssert = { - .assert = NULL, + .resetAssert = NULL, .getStatus = PmResetGetStatusRom, .pulse = PmResetPulseRom, }; static const PmResetOps pmResetOpsPl = { - .assert = PmResetAssertPl, + .resetAssert = PmResetAssertPl, .getStatus = PmResetGetStatusPl, .pulse = PmResetPulsePl, }; static const PmResetOps pmResetOpsGpioBankIO = { - .assert = NULL, + .resetAssert = NULL, .getStatus = PmResetGetStatusGpioBankIOs, .pulse = PmResetPulseGpioBankIOs, }; @@ -1885,8 +1885,8 @@ s32 PmResetDoAssert(const PmReset *reset, u32 action) switch (action) { case PM_RESET_ACTION_RELEASE: case PM_RESET_ACTION_ASSERT: - if (NULL != reset->ops->assert) { - reset->ops->assert(reset, action); + if (NULL != reset->ops->resetAssert) { + reset->ops->resetAssert(reset, action); } else { status = XST_INVALID_PARAM; } -- 2.17.1