From b24bb9228d7a6cd550f7626c8752c5ffde57c973 Mon Sep 17 00:00:00 2001 From: Soren Brinkmann Date: Wed, 27 May 2015 17:19:25 -0700 Subject: [PATCH] PMUFW: PM: Remove _g suffix from static variables Signed-off-by: Soren Brinkmann Acked-by: Jyotheeswar Reddy Mutthareddyvari --- lib/sw_apps/zynqmp_pmufw/src/pm_periph.c | 14 +++++++------- lib/sw_apps/zynqmp_pmufw/src/pm_sram.c | 12 ++++++------ lib/sw_apps/zynqmp_pmufw/src/pm_usb.c | 12 ++++++------ lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_periph.c b/lib/sw_apps/zynqmp_pmufw/src/pm_periph.c index 1cabe718..6aaccc5f 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_periph.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_periph.c @@ -38,7 +38,7 @@ * It is in LPD, which is never turned off, does not sit in power island, * therefore has no off state. */ -const u32 pmAonFsmStates[] = { +static const u32 pmAonFsmStates[] = { [PM_AON_SLAVE_STATE] = PM_CAP_WAKEUP | PM_CAP_ACCESS | PM_CAP_CONTEXT, }; @@ -82,13 +82,13 @@ PmSlaveTtc pmSlaveTtc0_g = { * Standard slave with no private PM properties to be controlled. * It can be powered down with the power parent. */ -const u32 pmStdStates_g[] = { +static const u32 pmStdStates[] = { [PM_STD_SLAVE_STATE_OFF] = 0U, [PM_STD_SLAVE_STATE_ON] = PM_CAP_WAKEUP | PM_CAP_ACCESS | PM_CAP_CONTEXT, }; /* Standard slave transitions (from which to which state Std slave transits) */ -const PmStateTran pmStdTransitions_g[] = { +static const PmStateTran pmStdTransitions[] = { { .fromState = PM_STD_SLAVE_STATE_ON, .toState = PM_STD_SLAVE_STATE_OFF, @@ -99,10 +99,10 @@ const PmStateTran pmStdTransitions_g[] = { }; static const PmSlaveFsm slaveStdFsm = { - .states = pmStdStates_g, - .statesCnt = ARRAY_SIZE(pmStdStates_g), - .trans = pmStdTransitions_g, - .transCnt = ARRAY_SIZE(pmStdTransitions_g), + .states = pmStdStates, + .statesCnt = ARRAY_SIZE(pmStdStates), + .trans = pmStdTransitions, + .transCnt = ARRAY_SIZE(pmStdTransitions), .actions = NULL, }; diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_sram.c b/lib/sw_apps/zynqmp_pmufw/src/pm_sram.c index 822b1a12..67e7fefa 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_sram.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_sram.c @@ -241,7 +241,7 @@ static u32 PmL2RetExit(void) return XST_SUCCESS; } -static const PmTranHandler pmSramActions_g[PM_SRAM_INST_MAX * PM_SRAM_TR_MAX] = { +static const PmTranHandler pmSramActions[PM_SRAM_INST_MAX * PM_SRAM_TR_MAX] = { [ DEFTR(PM_SRAM_OCM0, PM_SRAM_TR_ON_TO_RET) ] = PmOcm0RetEntry, [ DEFTR(PM_SRAM_OCM0, PM_SRAM_TR_RET_TO_ON) ] = PmOcm0RetExit, [ DEFTR(PM_SRAM_OCM0, PM_SRAM_TR_ON_TO_OFF) ] = XpbrPwrDnOcmBank0Handler, @@ -289,14 +289,14 @@ static const PmTranHandler pmSramActions_g[PM_SRAM_INST_MAX * PM_SRAM_TR_MAX] = }; /* Sram states */ -static const u32 pmSramStates_g[PM_SRAM_STATE_MAX] = { +static const u32 pmSramStates[PM_SRAM_STATE_MAX] = { [PM_SRAM_STATE_OFF] = 0U, [PM_SRAM_STATE_RET] = PM_CAP_CONTEXT, [PM_SRAM_STATE_ON] = PM_CAP_ACCESS | PM_CAP_CONTEXT, }; /* Sram transition table (from which to which state sram can transit) */ -static const PmStateTran pmSramTransitions_g[PM_SRAM_TR_MAX] = { +static const PmStateTran pmSramTransitions[PM_SRAM_TR_MAX] = { [PM_SRAM_TR_ON_TO_RET] = { .fromState = PM_SRAM_STATE_ON, .toState = PM_SRAM_STATE_RET, @@ -317,11 +317,11 @@ static const PmStateTran pmSramTransitions_g[PM_SRAM_TR_MAX] = { /* Sram FSM */ static const PmSlaveFsm slaveSramFsm = { - .states = pmSramStates_g, + .states = pmSramStates, .statesCnt = PM_SRAM_STATE_MAX, - .trans = pmSramTransitions_g, + .trans = pmSramTransitions, .transCnt = PM_SRAM_TR_MAX, - .actions = pmSramActions_g, + .actions = pmSramActions, }; static PmRequirement* const pmL2Reqs[] = { diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_usb.c b/lib/sw_apps/zynqmp_pmufw/src/pm_usb.c index cc3df32f..88c67c37 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_usb.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_usb.c @@ -39,7 +39,7 @@ #define DEFTR(INST, TRAN) ((INST * PM_USB_TR_MAX) + TRAN) -static const PmTranHandler pmUsbActions_g[PM_USB_INST_MAX * PM_USB_TR_MAX] = { +static const PmTranHandler pmUsbActions[PM_USB_INST_MAX * PM_USB_TR_MAX] = { [ DEFTR(PM_USB_0, PM_USB_TR_ON_TO_OFF) ] = XpbrPwrDnUsb0Handler, [ DEFTR(PM_USB_0, PM_USB_TR_OFF_TO_ON) ] = XpbrPwrUpUsb0Handler, @@ -48,13 +48,13 @@ static const PmTranHandler pmUsbActions_g[PM_USB_INST_MAX * PM_USB_TR_MAX] = { }; /* USB states */ -static const u32 pmUsbStates_g[PM_USB_STATE_MAX] = { +static const u32 pmUsbStates[PM_USB_STATE_MAX] = { [PM_USB_STATE_OFF] = PM_CAP_WAKEUP, [PM_USB_STATE_ON] = PM_CAP_WAKEUP | PM_CAP_ACCESS | PM_CAP_CONTEXT, }; /* USB transition table (from which to which state USB can transit) */ -static const PmStateTran pmUsbTransitions_g[PM_USB_TR_MAX] = { +static const PmStateTran pmUsbTransitions[PM_USB_TR_MAX] = { [PM_USB_TR_ON_TO_OFF] = { .fromState = PM_USB_STATE_ON, .toState = PM_USB_STATE_OFF, @@ -67,11 +67,11 @@ static const PmStateTran pmUsbTransitions_g[PM_USB_TR_MAX] = { /* USB FSM */ static const PmSlaveFsm slaveUsbFsm = { - .states = pmUsbStates_g, + .states = pmUsbStates, .statesCnt = PM_USB_STATE_MAX, - .trans = pmUsbTransitions_g, + .trans = pmUsbTransitions, .transCnt = PM_USB_TR_MAX, - .actions = pmUsbActions_g, + .actions = pmUsbActions, }; static PmRequirement* const pmUsb0Reqs[] = { diff --git a/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h b/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h index 8c79c136..c66ad207 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h +++ b/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h @@ -1,4 +1,4 @@ #ifndef ZYNQMP_XPFW_VERSION__H_ #define ZYNQMP_XPFW_VERSION__H_ - #define ZYNQMP_XPFW_VERSION "2015.1-swbeta2-23-g052cc0819981" + #define ZYNQMP_XPFW_VERSION "2015.1-swbeta2-24-g08fdf937b248" #endif