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>

3 files changed, 7 insertions, 7 deletions

diff --git a/src/occ_405/cmdh/cmdh_fsp_cmds.c b/src/occ_405/cmdh/cmdh_fsp_cmds.c
index 226f5f6..021fd7b 100755
--- a/src/occ_405/cmdh/cmdh_fsp_cmds.c
+++ b/src/occ_405/cmdh/cmdh_fsp_cmds.c
@@ -372,8 +372,8 @@ ERRL_RC cmdh_poll_v20(cmdh_fsp_rsp_t * o_rsp_ptr)
     {
         if(CORE_PRESENT(k))
         {
-            l_freqSensorList[l_sensorHeader.count].id = G_amec_sensor_list[FREQA4MSP0C0 + k]->ipmi_sid;
-            l_freqSensorList[l_sensorHeader.count].value = G_amec_sensor_list[FREQA4MSP0C0 + k]->sample;
+            l_freqSensorList[l_sensorHeader.count].id = G_amec_sensor_list[FREQAC0 + k]->ipmi_sid;
+            l_freqSensorList[l_sensorHeader.count].value = G_amec_sensor_list[FREQAC0 + k]->sample;
             l_sensorHeader.count++;
         }
     }
@@ -452,7 +452,7 @@ ERRL_RC cmdh_poll_v20(cmdh_fsp_rsp_t * o_rsp_ptr)
 
         cmdh_poll_pcaps_sensor_t l_pcapData;
         l_pcapData.current = g_amec->pcap.active_node_pcap;
-        l_pcapData.system = G_amec_sensor_list[PWR250US]->sample;
+        l_pcapData.system = G_amec_sensor_list[PWRSYS]->sample;
         l_pcapData.n = G_sysConfigData.pcap.oversub_pcap;
         l_pcapData.max = G_sysConfigData.pcap.max_pcap;
         l_pcapData.min = G_sysConfigData.pcap.hard_min_pcap;
diff --git a/src/occ_405/cmdh/cmdh_fsp_cmds_datacnfg.c b/src/occ_405/cmdh/cmdh_fsp_cmds_datacnfg.c
index 9ad0421..7fe19d2 100755
--- a/src/occ_405/cmdh/cmdh_fsp_cmds_datacnfg.c
+++ b/src/occ_405/cmdh/cmdh_fsp_cmds_datacnfg.c
@@ -1467,9 +1467,9 @@ errlHndl_t data_store_sys_config(const cmdh_fsp_cmd_t * i_cmd_ptr,
             for (l_coreIndex = 0; l_coreIndex < MAX_CORES; l_coreIndex++)
             {
                 AMECSENSOR_PTR(TEMPPROCTHRMC0 + l_coreIndex)->ipmi_sid = l_cmd_ptr->sys_config.core_sid[(l_coreIndex * 2)];
-                AMECSENSOR_PTR(FREQA4MSP0C0 + l_coreIndex)->ipmi_sid = l_cmd_ptr->sys_config.core_sid[(l_coreIndex * 2) + 1];
+                AMECSENSOR_PTR(FREQAC0 + l_coreIndex)->ipmi_sid = l_cmd_ptr->sys_config.core_sid[(l_coreIndex * 2) + 1];
                 CNFG_DBG("data_store_sys_config: Core[%d] TempSID[0x%08X] FreqSID[0x%08X]", l_coreIndex,
-                         AMECSENSOR_PTR(TEMPPROCTHRMC0 + l_coreIndex)->ipmi_sid, AMECSENSOR_PTR(FREQA4MSP0C0 + l_coreIndex)->ipmi_sid);
+                         AMECSENSOR_PTR(TEMPPROCTHRMC0 + l_coreIndex)->ipmi_sid, AMECSENSOR_PTR(FREQAC0 + l_coreIndex)->ipmi_sid);
             }
         }
 
diff --git a/src/occ_405/cmdh/cmdh_snapshot.c b/src/occ_405/cmdh/cmdh_snapshot.c
index 165cfbc..68139b6 100755
--- a/src/occ_405/cmdh/cmdh_snapshot.c
+++ b/src/occ_405/cmdh/cmdh_snapshot.c
@@ -351,8 +351,8 @@ void cmdh_snapshot_callback(void * arg)
     static uint32_t L_prev_pwr_update_tag = 0;  // Holds the previous power sensor update tag.
 
     uint32_t        l_pwr_accum         =
-        (uint32_t)AMECSENSOR_PTR(PWR250US)->accumulator;
-    uint32_t        l_pwr_update_tag    = AMECSENSOR_PTR(PWR250US)->update_tag;
+        (uint32_t)AMECSENSOR_PTR(PWRSYS)->accumulator;
+    uint32_t        l_pwr_update_tag    = AMECSENSOR_PTR(PWRSYS)->update_tag;
     uint32_t        l_avg_pwr           = 0;
     uint32_t        l_min_pwr           = g_pwr250us_over30sec.min;
     uint32_t        l_max_pwr           = g_pwr250us_over30sec.max;