OCC: Non-GPU Sensors to main memory: Phase 1

Performed the following sensor renames required by this RTC story:
  FREQA4MSP0Cy -> FREQACy
  UTIL4MSP0Cy  -> UTILCy
  PWR250US     -> PWRSYS
  PWR250USP0   -> PWRPROC

Also renamed the following related symbols:
  * Associated sensor_t field names in the amec_sys_t data structure
  * Mini-sensor field names
  * Parent sensors that contain a vector iterating over renamed sensors

Change-Id: I1e9e17661e5730ed6309fc7617c61bd973d2e44f
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39772
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/occ_405/amec/amec_sensors_power.c b/src/occ_405/amec/amec_sensors_power.c
index 1950510..f110ce4 100755
--- a/src/occ_405/amec/amec_sensors_power.c
+++ b/src/occ_405/amec/amec_sensors_power.c
@@ -248,7 +248,7 @@ void amec_update_apss_sensors(void)
         uint32_t l_vdd = ADC_CONVERTED_VALUE(G_sysConfigData.apss_adc_map.vdd[l_proc]);
         uint32_t l_vcs_vio_vpcie = ADC_CONVERTED_VALUE(G_sysConfigData.apss_adc_map.vcs_vio_vpcie[l_proc]);
         temp32 = ((l_vcs_vio_vpcie + l_vdd) * l_bulk_voltage)/ADCMULT_TO_UNITS;
-        sensor_update(AMECSENSOR_PTR(PWR250USP0), (uint16_t) temp32);
+        sensor_update(AMECSENSOR_PTR(PWRPROC), (uint16_t) temp32);
 
         // Save off the combined power from all modules
         for (l_idx=0; l_idx < MAX_NUM_CHIP_MODULES; l_idx++)
@@ -348,7 +348,7 @@ void amec_update_apss_sensors(void)
         {
             temp32 = ((l_bulk_current_sum * l_bulk_voltage)+ADCMULT_ROUND)/ADCMULT_TO_UNITS;
         }
-        sensor_update(AMECSENSOR_PTR(PWR250US), (uint16_t)temp32);
+        sensor_update(AMECSENSOR_PTR(PWRSYS), (uint16_t)temp32);
 
         // Calculate average frequency of all OCCs.
         uint32_t    l_allOccAvgFreqOver250us = 0;
@@ -360,7 +360,7 @@ void amec_update_apss_sensors(void)
         {
             if (G_sysConfigData.is_occ_present & (1<< l_occCount))
             {
-                l_allOccAvgFreqOver250us += G_dcom_slv_outbox_rx[l_occCount].freqa4msp0;
+                l_allOccAvgFreqOver250us += G_dcom_slv_outbox_rx[l_occCount].freqa;
                 l_presentOCCs++;
             }
         }