PMUFW: PM: Remove _g suffix from static variables

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: Jyotheeswar Reddy Mutthareddyvari <jyothee@xilinx.com>
This commit is contained in:
Soren Brinkmann 2015-05-27 17:19:25 -07:00 committed by Nava kishore Manne
parent 34df243f1d
commit b24bb9228d
4 changed files with 20 additions and 20 deletions

View file

@ -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,
};

View file

@ -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[] = {

View file

@ -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[] = {

View file

@ -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