summaryrefslogtreecommitdiffstats
path: root/src/occ_405/pss
diff options
context:
space:
mode:
authorWilliam Bryan <wilbryan@us.ibm.com>2017-03-23 17:00:29 -0500
committerWilliam A. Bryan <wilbryan@us.ibm.com>2017-03-27 14:46:40 -0400
commite1889e5dfcb4707ac66ab5ee0427ce97156bf4c0 (patch)
tree92f5ff97f61b858e9f2d32e6cffe01c863604e4a /src/occ_405/pss
parentaa17c1c5ada87abfb03e88bad105c1f173baa459 (diff)
downloadtalos-occ-e1889e5dfcb4707ac66ab5ee0427ce97156bf4c0.tar.gz
talos-occ-e1889e5dfcb4707ac66ab5ee0427ce97156bf4c0.zip
Fix warnings in newer GCC versions
Change-Id: If0a730a7539aa5a4dcc43725a3c4fbda570cfa46 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38411 Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com> Reviewed-by: Martha Broyles <mbroyles@us.ibm.com> Reviewed-by: Andres A. Lugo-Reyes <aalugore@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Diffstat (limited to 'src/occ_405/pss')
-rw-r--r--src/occ_405/pss/avsbus.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/src/occ_405/pss/avsbus.c b/src/occ_405/pss/avsbus.c
index c668c36..da746b9 100644
--- a/src/occ_405/pss/avsbus.c
+++ b/src/occ_405/pss/avsbus.c
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER OnChipController Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2011,2015 */
+/* Contributors Listed Below - COPYRIGHT 2011,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -237,29 +237,34 @@ void avsbus_read_start(const avsbus_type_e i_type,
avsbusData_t l_data;
// Create error array for each type (Vdd/Vdn) and command (Voltage/Current)
+ if (AVSBUS_VDD == i_type)
+ {
+ l_data = G_sysConfigData.avsbus_vdd;
+ }
+ else
+ {
+ l_data = G_sysConfigData.avsbus_vdn;
+ }
+
+#ifdef AVSDEBUG
uint8_t l_cmd_index = 0;
char l_trace_cmd = 'V';
+ char l_trace_type = 'd';
+
if (i_cmdtype == AVSBUS_CURRENT)
{
l_cmd_index = 1;
l_trace_cmd = 'C';
}
-
- char l_trace_type = 'd';
- if (AVSBUS_VDD == i_type)
+ if (AVSBUS_VDD != i_type)
{
- l_data = G_sysConfigData.avsbus_vdd;
- }
- else
- {
- l_data = G_sysConfigData.avsbus_vdn;
l_trace_type = 'n';
}
-#ifdef AVSDEBUG
static uint32_t L_trace_count[ERRORCOUNT_MAXTYPES][ERRORCOUNT_MAXCMDS] = {{0}};
uint32_t * l_trace_count = &L_trace_count[i_type][l_cmd_index];
uint32_t DEBUG_TRACE_MAX = 2;
+
if (*l_trace_count < DEBUG_TRACE_MAX)
{
TRAC_INFO("avsbus_read_start: Vd%c %c - bus[%d] rail[%d]",
OpenPOWER on IntegriCloud