Change MAX_NUM_QUADS to MAX_QUADS

Change-Id: I7c48bfdcc68b2e72a8b579bd629ee67e832cbf79
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37913
Reviewed-by: Andres A. Lugo-Reyes <aalugore@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>

3 files changed, 22 insertions, 22 deletions

diff --git a/src/occ_405/amec/amec_parm_table.c b/src/occ_405/amec/amec_parm_table.c
index 78b28ce..73291ad 100755
--- a/src/occ_405/amec/amec_parm_table.c
+++ b/src/occ_405/amec/amec_parm_table.c
@@ -155,16 +155,16 @@ amec_parm_t g_amec_parm_list[] = {
     AMEC_PARM_UINT16(PARM_VDD_STEP_FROM_START, "vdd_stp_frm_strt", &g_amec_sys.wof.vdd_step_from_start),
     AMEC_PARM_UINT16(PARM_VDN_STEP_FROM_START, "vdn_stp_frm_strt", &g_amec_sys.wof.vdn_step_from_start),
     AMEC_PARM_UINT8(PARM_QUAD_STEP_FROM_START, "quadStpFrmStrt", &g_amec_sys.wof.quad_step_from_start),
-    AMEC_PARM_UINT32_ARRAY(PARM_V_CORE, "v_core_100uV", &g_amec_sys.wof.v_core_100uV, MAX_NUM_QUADS),
+    AMEC_PARM_UINT32_ARRAY(PARM_V_CORE, "v_core_100uV", &g_amec_sys.wof.v_core_100uV, MAX_QUADS),
     AMEC_PARM_UINT32(PARM_CORE_PWR_ON, "core_pwr_on", &g_amec_sys.wof.core_pwr_on),
-    AMEC_PARM_UINT8_ARRAY(PARM_CORES_ON_PER_QUAD, "coreson_per_quad", &g_amec_sys.wof.cores_on_per_quad, MAX_NUM_QUADS),
+    AMEC_PARM_UINT8_ARRAY(PARM_CORES_ON_PER_QUAD, "coreson_per_quad", &g_amec_sys.wof.cores_on_per_quad, MAX_QUADS),
     AMEC_PARM_UINT16(PARM_WOF_DISABLED, "wof_disabled", &g_amec_sys.wof.wof_disabled),
     AMEC_PARM_UINT32(PARM_VOLT_VDD_SENSE, "voltvddsense", &g_amec_sys.wof.voltvddsense_sensor),
     AMEC_PARM_UINT16_ARRAY(PARM_TEMPPROCTHERMC, "tempprocthrmc", &g_amec_sys.wof.tempprocthrmc, MAX_NUM_CORES),
     AMEC_PARM_UINT16(PARM_TEMPNEST, "tempnest_sensor", &g_amec_sys.wof.tempnest_sensor),
-    AMEC_PARM_UINT16_ARRAY(PARM_TEMPQ, "tempq", &g_amec_sys.wof.tempq, MAX_NUM_QUADS),
+    AMEC_PARM_UINT16_ARRAY(PARM_TEMPQ, "tempq", &g_amec_sys.wof.tempq, MAX_QUADS),
     AMEC_PARM_UINT16(PARM_VOLTVDN, "voltvdn_sensor", &g_amec_sys.wof.voltvdn_sensor),
-    AMEC_PARM_UINT8_ARRAY(PARM_QUAD_X_PSTATES, "quad_x_pstates", &g_amec_sys.wof.quad_x_pstates, MAX_NUM_QUADS),
+    AMEC_PARM_UINT8_ARRAY(PARM_QUAD_X_PSTATES, "quad_x_pstates", &g_amec_sys.wof.quad_x_pstates, MAX_QUADS),
     AMEC_PARM_UINT8(PARM_IVRM_STATES, "quad_ivrm_states", &g_amec_sys.wof.quad_ivrm_states),
     AMEC_PARM_UINT32(PARM_IDC_VDD, "idc_vdd", &g_amec_sys.wof.idc_vdd),
     AMEC_PARM_UINT32(PARM_IDC_VDN, "idc_vdn", &g_amec_sys.wof.idc_vdn),
@@ -187,12 +187,12 @@ amec_parm_t g_amec_parm_list[] = {
     AMEC_PARM_UINT8(PARM_VOLTAGE_IDX, "voltage_idx", &g_amec_sys.wof.voltage_idx),
     AMEC_PARM_UINT32(PARM_ALL_CORES_OFF_ISO, "allcores_off_iso", &g_amec_sys.wof.all_cores_off_iso),
     AMEC_PARM_UINT32(PARM_ALL_CACHES_ON_ISO, "allcaches_on_iso", &g_amec_sys.wof.all_caches_on_iso),
-    AMEC_PARM_UINT16_ARRAY(PARM_QUAD_GOOD_CORES_ONLY, "quad_good_cores", &g_amec_sys.wof.quad_good_cores_only, MAX_NUM_QUADS),
-    AMEC_PARM_UINT16_ARRAY(PARM_QUAD_ON_CORES, "quad_on_cores", &g_amec_sys.wof.quad_on_cores, MAX_NUM_QUADS),
-    AMEC_PARM_UINT16_ARRAY(PARM_QUAD_BAD_OFF_CORES,"quadBadOffCores", &g_amec_sys.wof.quad_on_cores, MAX_NUM_QUADS),
+    AMEC_PARM_UINT16_ARRAY(PARM_QUAD_GOOD_CORES_ONLY, "quad_good_cores", &g_amec_sys.wof.quad_good_cores_only, MAX_QUADS),
+    AMEC_PARM_UINT16_ARRAY(PARM_QUAD_ON_CORES, "quad_on_cores", &g_amec_sys.wof.quad_on_cores, MAX_QUADS),
+    AMEC_PARM_UINT16_ARRAY(PARM_QUAD_BAD_OFF_CORES,"quadBadOffCores", &g_amec_sys.wof.quad_on_cores, MAX_QUADS),
     AMEC_PARM_UINT32(PARM_NEST_MULT, "nest_mult", &g_amec_sys.wof.nest_mult),
     AMEC_PARM_UINT32_ARRAY(PARM_CORE_MULT, "core_mult", &g_amec_sys.wof.core_mult, MAX_NUM_CORES),
-    AMEC_PARM_UINT32_ARRAY(PARM_QUAD_MULT, "quad_mult", &g_amec_sys.wof.quad_mult, MAX_NUM_QUADS),
+    AMEC_PARM_UINT32_ARRAY(PARM_QUAD_MULT, "quad_mult", &g_amec_sys.wof.quad_mult, MAX_QUADS),
     AMEC_PARM_INT16(PARM_NEST_DELTA_TEMP, "nest_delta_temp", &g_amec_sys.wof.nest_delta_temp),
     AMEC_PARM_INT16_ARRAY(PARM_CORE_DELTA_TEMP, "core_delta_temp", &g_amec_sys.wof.core_delta_temp, MAX_NUM_CORES),
     AMEC_PARM_INT16_ARRAY(PARM_QUAD_DELTA_TEMP, "quad_delta_temp", &g_amec_sys.wof.quad_delta_temp, MAX_NUM_CORES),
diff --git a/src/occ_405/wof/wof.c b/src/occ_405/wof/wof.c
index 627835c..99fd0ba 100644
--- a/src/occ_405/wof/wof.c
+++ b/src/occ_405/wof/wof.c
@@ -596,7 +596,7 @@ void read_shared_sram( void )
 
 
     // Clear out current quad pstates
-    memset(g_wof->quad_x_pstates, 0 , MAX_NUM_QUADS);
+    memset(g_wof->quad_x_pstates, 0 , MAX_QUADS);
 
     // Add the quad states to the global quad state array for easy looping.
     g_wof->quad_x_pstates[0] = (uint8_t)G_quad_state_0.fields.quad0_pstate;
@@ -625,7 +625,7 @@ void calculate_core_voltage( void )
     uint32_t l_voltage;
     uint8_t l_quad_mask;
     int l_quad_idx = 0;
-    for(; l_quad_idx < MAX_NUM_QUADS; l_quad_idx++)
+    for(; l_quad_idx < MAX_QUADS; l_quad_idx++)
     {
         // Adjust current mask. (IVRM_STATE_QUAD_MASK = 0x80)
         l_quad_mask = IVRM_STATE_QUAD_MASK >> l_quad_idx;
@@ -734,7 +734,7 @@ void calculate_core_leakage( void )
     // Divide by 6 to get just one quad
     g_wof->idc_quad =
                  G_oppb.iddq.ivdd_all_cores_off_caches_off[l_chip_v_idx] /
-                 MAX_NUM_QUADS;
+                 MAX_QUADS;
 
 
 
@@ -761,7 +761,7 @@ void calculate_core_leakage( void )
               G_oppb.iddq.ivdd_all_good_cores_off_good_caches_on[l_chip_v_idx] -
               g_wof->all_cores_off_iso;
 
-    l_quad_x_cache = g_wof->all_caches_on_iso / MAX_NUM_QUADS;
+    l_quad_x_cache = g_wof->all_caches_on_iso / MAX_QUADS;
 
     // Loop through all Quads and their respective Cores to calculate
     // leakage.
@@ -771,7 +771,7 @@ void calculate_core_leakage( void )
 
 
 
-    for(quad_idx = 0; quad_idx < MAX_NUM_QUADS; quad_idx++)
+    for(quad_idx = 0; quad_idx < MAX_QUADS; quad_idx++)
     {
         if(g_wof->quad_x_pstates[quad_idx] == QUAD_POWERED_OFF)
         {
diff --git a/src/occ_405/wof/wof.h b/src/occ_405/wof/wof.h
index 47312a8..65368dd 100644
--- a/src/occ_405/wof/wof.h
+++ b/src/occ_405/wof/wof.h
@@ -92,11 +92,11 @@ typedef struct
     // Calculated step from start for quads
     uint8_t quad_step_from_start;
     // Array to hold the core voltages per quad (in 100uV)
-    uint32_t v_core_100uV[MAX_NUM_QUADS];
+    uint32_t v_core_100uV[MAX_QUADS];
     // Bit vector to hold the power on status of all 24 cores
     uint32_t core_pwr_on;
     // Number of cores on per quad
-    uint8_t cores_on_per_quad[MAX_NUM_QUADS];
+    uint8_t cores_on_per_quad[MAX_QUADS];
     // The most recently read value in the sensor VOLTVDDSENSE
     uint32_t voltvddsense_sensor;
     // The most recently read value in the sensor TEMPPROCTHRMCy where y is core num
@@ -104,7 +104,7 @@ typedef struct
     // The most recently read value in the sensor TEMPNEST
     uint16_t tempnest_sensor;
     // The most recently read value in the sensor TEMPQx where x is the quad num
-    uint16_t tempq[MAX_NUM_QUADS];
+    uint16_t tempq[MAX_QUADS];
     // The most recently read value in the sensor CURVDD
     uint16_t curvdd_sensor;
     // The most recently read value in the sensor CURVDN
@@ -112,7 +112,7 @@ typedef struct
     // The most recently read value in the sensor VOLTVDN
     uint16_t voltvdn_sensor;
     // Array to hold the current 1-byte pstate values read from SRAM. 0xFF=off
-    uint8_t  quad_x_pstates[MAX_NUM_QUADS];
+    uint8_t  quad_x_pstates[MAX_QUADS];
     // Bit vector to hold the ivrm states of the quads. 0=BYPASS, 1=REGULATION
     uint8_t  quad_ivrm_states;
     // Contains the estimated core leakage based on temp, voltage, and vpd-leak
@@ -156,17 +156,17 @@ typedef struct
     // Contains the final calculated value of ALL_CACHES_ON_ISO
     uint32_t all_caches_on_iso;
     // Contains good_cores_only (per_quad)
-    uint16_t quad_good_cores_only[MAX_NUM_QUADS];
+    uint16_t quad_good_cores_only[MAX_QUADS];
     // Contains on_cores
-    uint16_t quad_on_cores[MAX_NUM_QUADS];
+    uint16_t quad_on_cores[MAX_QUADS];
     // Contains BAD_OFF_cores
-    uint16_t quad_bad_off_cores[MAX_NUM_QUADS];
+    uint16_t quad_bad_off_cores[MAX_QUADS];
     // Contains the multiplier(m) used in y ~=(T*m)>>10 for nest leak calc
     uint32_t nest_mult;
     // Contains the multiplier(m) used in y ~=(T*m)>>10 for core leak calc 0-23
     uint32_t core_mult[MAX_NUM_CORES];
     // Contains the multiplier(m) used in y ~=(T*m)>>10 for quad leak calc 0-5
-    uint32_t quad_mult[MAX_NUM_QUADS];
+    uint32_t quad_mult[MAX_QUADS];
     // Contains the delta temp used for nest leakage calc (see G_wof_iddq_mult_table)
     // TEMPNEST - tvpd_leak_off
     int16_t nest_delta_temp;
@@ -175,7 +175,7 @@ typedef struct
     int16_t core_delta_temp[MAX_NUM_CORES];
     // Contains the delta temp used for quad leakage calc
     // TEMPQx - tvpd_leak_cache (where x is the quad number)
-    int16_t quad_delta_temp[MAX_NUM_QUADS];
+    int16_t quad_delta_temp[MAX_QUADS];
     // tvpd leak to use when either the core is off, or the entire quad is off
     uint32_t tvpd_leak_off;
     // tvpd leak to use when the core is on