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, 70 insertions, 70 deletions

diff --git a/src/occ_405/sensor/sensor_enum.h b/src/occ_405/sensor/sensor_enum.h
index 1e2b4d9..eb01943 100755
--- a/src/occ_405/sensor/sensor_enum.h
+++ b/src/occ_405/sensor/sensor_enum.h
@@ -76,7 +76,7 @@ enum e_gsid
     // ------------------------------------------------------
     // System Sensors
     // ------------------------------------------------------
-    PWR250US,          // System DC Power (from APSS)
+    PWRSYS,            // System DC Power (from APSS)
     PWR250USFAN,       // Fan Power (from APSS)
     PWR250USIO,        // IO Subsystem Power (from APSS)
     PWR250USSTORE,     // Storage Subsys Power (from APSS)
@@ -109,10 +109,10 @@ enum e_gsid
     // ------------------------------------------------------
     // Processor Sensors
     // ------------------------------------------------------
-    FREQA4MSP0,
+    FREQA,
     IPS4MSP0,
     MEMSP2MSP0,
-    PWR250USP0,
+    PWRPROC,
     PWR250USVDD0, // from APSS (no change)
     PWRVCSVIOVDN, // from APSS - rename from PWR250USVCS0 to show what it includes
     PWR250USMEM0,
@@ -121,7 +121,7 @@ enum e_gsid
     SP250USP0,
     TEMPPROCAVG,
     TEMPPROCTHRM,
-    UTIL4MSP0,
+    UTIL,
     TEMPNEST,
     VOLTVDDSENSE,   // chip voltage (remote sense adjusted for loadline)
     VOLTVDNSENSE,   // chip voltage (remote sense adjusted for loadline)
@@ -160,30 +160,30 @@ enum e_gsid
     FREQ250USP0C22,
     FREQ250USP0C23,
 
-    FREQA4MSP0C0,
-    FREQA4MSP0C1,
-    FREQA4MSP0C2,
-    FREQA4MSP0C3,
-    FREQA4MSP0C4,
-    FREQA4MSP0C5,
-    FREQA4MSP0C6,
-    FREQA4MSP0C7,
-    FREQA4MSP0C8,
-    FREQA4MSP0C9,
-    FREQA4MSP0C10,
-    FREQA4MSP0C11,
-    FREQA4MSP0C12,
-    FREQA4MSP0C13,
-    FREQA4MSP0C14,
-    FREQA4MSP0C15,
-    FREQA4MSP0C16,
-    FREQA4MSP0C17,
-    FREQA4MSP0C18,
-    FREQA4MSP0C19,
-    FREQA4MSP0C20,
-    FREQA4MSP0C21,
-    FREQA4MSP0C22,
-    FREQA4MSP0C23,
+    FREQAC0,
+    FREQAC1,
+    FREQAC2,
+    FREQAC3,
+    FREQAC4,
+    FREQAC5,
+    FREQAC6,
+    FREQAC7,
+    FREQAC8,
+    FREQAC9,
+    FREQAC10,
+    FREQAC11,
+    FREQAC12,
+    FREQAC13,
+    FREQAC14,
+    FREQAC15,
+    FREQAC16,
+    FREQAC17,
+    FREQAC18,
+    FREQAC19,
+    FREQAC20,
+    FREQAC21,
+    FREQAC22,
+    FREQAC23,
 
     IPS4MSP0C0,
     IPS4MSP0C1,
@@ -285,30 +285,30 @@ enum e_gsid
     TEMPPROCTHRMC22,
     TEMPPROCTHRMC23,
 
-    UTIL4MSP0C0,
-    UTIL4MSP0C1,
-    UTIL4MSP0C2,
-    UTIL4MSP0C3,
-    UTIL4MSP0C4,
-    UTIL4MSP0C5,
-    UTIL4MSP0C6,
-    UTIL4MSP0C7,
-    UTIL4MSP0C8,
-    UTIL4MSP0C9,
-    UTIL4MSP0C10,
-    UTIL4MSP0C11,
-    UTIL4MSP0C12,
-    UTIL4MSP0C13,
-    UTIL4MSP0C14,
-    UTIL4MSP0C15,
-    UTIL4MSP0C16,
-    UTIL4MSP0C17,
-    UTIL4MSP0C18,
-    UTIL4MSP0C19,
-    UTIL4MSP0C20,
-    UTIL4MSP0C21,
-    UTIL4MSP0C22,
-    UTIL4MSP0C23,
+    UTILC0,
+    UTILC1,
+    UTILC2,
+    UTILC3,
+    UTILC4,
+    UTILC5,
+    UTILC6,
+    UTILC7,
+    UTILC8,
+    UTILC9,
+    UTILC10,
+    UTILC11,
+    UTILC12,
+    UTILC13,
+    UTILC14,
+    UTILC15,
+    UTILC16,
+    UTILC17,
+    UTILC18,
+    UTILC19,
+    UTILC20,
+    UTILC21,
+    UTILC22,
+    UTILC23,
 
     NUTIL3SP0C0,
     NUTIL3SP0C1,
diff --git a/src/occ_405/sensor/sensor_info.c b/src/occ_405/sensor/sensor_info.c
index 998eb3d..6ad923d 100755
--- a/src/occ_405/sensor/sensor_info.c
+++ b/src/occ_405/sensor/sensor_info.c
@@ -268,7 +268,7 @@ const sensor_info_t G_sensor_info[]   =
   SENSOR_INFO_T_ENTRY(      RTLtickdur,  "us\0",    AMEC_SENSOR_TYPE_TIME,  AMEC_SENSOR_LOC_OCC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
 
   /* ==SystemSensors==      NameString  Units                      Type              Location             Number                Freq      ScaleFactor   */
-  SENSOR_INFO_T_ENTRY(        PWR250US,   "W\0",   AMEC_SENSOR_TYPE_POWER,  AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(          PWRSYS,   "W\0",   AMEC_SENSOR_TYPE_POWER,  AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(     PWR250USFAN,   "W\0",   AMEC_SENSOR_TYPE_POWER,  AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(      PWR250USIO,   "W\0",   AMEC_SENSOR_TYPE_POWER,  AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(   PWR250USSTORE,   "W\0",   AMEC_SENSOR_TYPE_POWER,  AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
@@ -298,10 +298,10 @@ const sensor_info_t G_sensor_info[]   =
   SENSOR_INFO_T_ENTRY(       TODclock2,  "day\0",   AMEC_SENSOR_TYPE_TIME,  AMEC_SENSOR_LOC_ALL, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP( 795364,-6)  ),
 
   /* ==ProcSensors==        NameString  Units                      Type              Location             Number                Freq      ScaleFactor   */
-  SENSOR_INFO_T_ENTRY(      FREQA4MSP0, "MHz\0",    AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(           FREQA, "MHz\0",    AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(        IPS4MSP0, "MIP\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(      MEMSP2MSP0,   "%\0",    AMEC_SENSOR_TYPE_TIME, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENSOR_INFO_T_ENTRY(      PWR250USP0,   "W\0",   AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(         PWRPROC,   "W\0",   AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(    PWR250USVDD0,   "W\0",   AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(    PWRVCSVIOVDN,   "W\0",   AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(    PWR250USMEM0,   "W\0",   AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
@@ -310,7 +310,7 @@ const sensor_info_t G_sensor_info[]   =
   SENSOR_INFO_T_ENTRY(       SP250USP0,   "%\0",    AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(     TEMPPROCAVG,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(    TEMPPROCTHRM,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENSOR_INFO_T_ENTRY(       UTIL4MSP0,   "%\0",    AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1,-2)  ),
+  SENSOR_INFO_T_ENTRY(            UTIL,   "%\0",    AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1,-2)  ),
   SENSOR_INFO_T_ENTRY(        TEMPNEST,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(    VOLTVDDSENSE,  "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, -1)  ),
   SENSOR_INFO_T_ENTRY(    VOLTVDNSENSE,  "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, -1)  ),
@@ -330,12 +330,12 @@ const sensor_info_t G_sensor_info[]   =
 
   /* ==CoreSensors==        NameString  Units                      Type              Location             Number                Freq      ScaleFactor   */
   SENS_CORE_ENTRY_SET(     FREQ250USP0C, "MHz\0",    AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
-  SENS_CORE_ENTRY_SET(      FREQA4MSP0C, "MHz\0",    AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENS_CORE_ENTRY_SET(           FREQAC, "MHz\0",    AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENS_CORE_ENTRY_SET(        IPS4MSP0C, "MIP\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENS_CORE_ENTRY_SET(     NOTBZE4MSP0C, "cyc\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENS_CORE_ENTRY_SET(     NOTFIN4MSP0C, "cyc\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENS_CORE_ENTRY_SET(    TEMPPROCTHRMC,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENS_CORE_ENTRY_SET(       UTIL4MSP0C,   "%\0",    AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1,-2)  ),
+  SENS_CORE_ENTRY_SET(            UTILC,   "%\0",    AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_4MS_IN_HZ,   AMEFP(  1,-2)  ),
   SENS_CORE_ENTRY_SET(       NUTIL3SP0C,   "%\0",    AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,    AMEEFP_3S_IN_HZ,   AMEFP(  1,-2)  ),
   SENS_CORE_ENTRY_SET(       MSTL2MSP0C, "cpi\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENS_CORE_ENTRY_SET(        CMT2MSP0C,   "%\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
diff --git a/src/occ_405/sensor/sensor_table.c b/src/occ_405/sensor/sensor_table.c
index 6503395..7d243ee 100755
--- a/src/occ_405/sensor/sensor_table.c
+++ b/src/occ_405/sensor/sensor_table.c
@@ -314,7 +314,7 @@ const sensor_ptr_t G_amec_sensor_list[] =
   // ------------------------------------------------------
   // System Sensors
   // ------------------------------------------------------
-  SENSOR_PTR( PWR250US,             &g_amec_sys.sys.pwr250us),
+  SENSOR_PTR( PWRSYS,               &g_amec_sys.sys.pwrsys),
   SENSOR_PTR( PWR250USFAN,          &g_amec_sys.fan.pwr250usfan),
   SENSOR_PTR( PWR250USIO,           &g_amec_sys.io.pwr250usio),
   SENSOR_PTR( PWR250USSTORE,        &g_amec_sys.storage.pwr250usstore),
@@ -347,10 +347,10 @@ const sensor_ptr_t G_amec_sensor_list[] =
   // ------------------------------------------------------
   // Processor Sensors
   // ------------------------------------------------------
-  SENSOR_PTR( FREQA4MSP0,           &g_amec_sys.proc[0].freqa4ms),
+  SENSOR_PTR( FREQA,                &g_amec_sys.proc[0].freqa),
   SENSOR_PTR( IPS4MSP0,             &g_amec_sys.proc[0].ips4ms),
   SENSOR_PTR( MEMSP2MSP0,           &g_amec_sys.proc[0].memsp2ms),
-  SENSOR_PTR( PWR250USP0,           &g_amec_sys.proc[0].pwr250us),
+  SENSOR_PTR( PWRPROC,              &g_amec_sys.proc[0].pwrproc),
   SENSOR_PTR( PWR250USVDD0,         &g_amec_sys.proc[0].pwr250usvdd),
   SENSOR_PTR( PWRVCSVIOVDN,         &g_amec_sys.proc[0].pwrvcsviovdn),
   SENSOR_PTR( PWR250USMEM0,         &g_amec_sys.proc[0].pwr250usmem),
@@ -359,7 +359,7 @@ const sensor_ptr_t G_amec_sensor_list[] =
   SENSOR_PTR( SP250USP0,            &g_amec_sys.proc[0].sp250us),
   SENSOR_PTR( TEMPPROCAVG,          &g_amec_sys.proc[0].tempprocavg),
   SENSOR_PTR( TEMPPROCTHRM,         &g_amec_sys.proc[0].tempprocthermal),
-  SENSOR_PTR( UTIL4MSP0,            &g_amec_sys.proc[0].util4ms),
+  SENSOR_PTR( UTIL,                 &g_amec_sys.proc[0].util),
   SENSOR_PTR( TEMPNEST,             &g_amec_sys.proc[0].tempnest),
   SENSOR_PTR( VOLTVDDSENSE,         &g_amec_sys.fw.voltvddsense),
   SENSOR_PTR( VOLTVDNSENSE,         &g_amec_sys.fw.voltvdnsense),
@@ -375,12 +375,12 @@ const sensor_ptr_t G_amec_sensor_list[] =
   // Core Sensors (24 of each)
   // ------------------------------------------------------
   CORE_SENSOR_PTRS( FREQ250USP0C ,  &g_amec_sys.proc[0].core, freq250us),
-  CORE_SENSOR_PTRS( FREQA4MSP0C ,   &g_amec_sys.proc[0].core, freqa4ms),
+  CORE_SENSOR_PTRS( FREQAC ,        &g_amec_sys.proc[0].core, freqa),
   CORE_SENSOR_PTRS( IPS4MSP0C ,     &g_amec_sys.proc[0].core, ips4ms),
   CORE_SENSOR_PTRS( NOTBZE4MSP0C ,  &g_amec_sys.proc[0].core, mcpifd4ms),
   CORE_SENSOR_PTRS( NOTFIN4MSP0C ,  &g_amec_sys.proc[0].core, mcpifi4ms),
   CORE_SENSOR_PTRS( TEMPPROCTHRMC , &g_amec_sys.proc[0].core, tempprocthermal),
-  CORE_SENSOR_PTRS( UTIL4MSP0C ,    &g_amec_sys.proc[0].core, util4ms),
+  CORE_SENSOR_PTRS( UTILC ,         &g_amec_sys.proc[0].core, util),
   CORE_SENSOR_PTRS( NUTIL3SP0C ,    &g_amec_sys.proc[0].core, nutil3s),
   CORE_SENSOR_PTRS( MSTL2MSP0C ,    &g_amec_sys.proc[0].core, mstl2ms),
   CORE_SENSOR_PTRS( CMT2MSP0C ,     &g_amec_sys.proc[0].core, cmt2ms),
@@ -488,7 +488,7 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
   // ------------------------------------------------------
   // System Sensors
   // ------------------------------------------------------
-  MINI_SENSOR_PTR(       PWR250US,  NULL),
+  MINI_SENSOR_PTR(         PWRSYS,  NULL),
   MINI_SENSOR_PTR(    PWR250USFAN,  NULL),
   MINI_SENSOR_PTR(     PWR250USIO,  NULL),
   MINI_SENSOR_PTR(  PWR250USSTORE,  NULL),
@@ -504,10 +504,10 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
   // ------------------------------------------------------
   // Processor Sensors
   // ------------------------------------------------------
-  MINI_SENSOR_PTR(     FREQA4MSP0,  &G_dcom_slv_outbox_tx.freqa4msp0),
+  MINI_SENSOR_PTR(          FREQA,  &G_dcom_slv_outbox_tx.freqa),
   MINI_SENSOR_PTR(       IPS4MSP0,  &G_dcom_slv_outbox_tx.ips4msp0),
   MINI_SENSOR_PTR(     MEMSP2MSP0,  NULL),
-  MINI_SENSOR_PTR(     PWR250USP0,  &G_dcom_slv_outbox_tx.pwr250usp0),
+  MINI_SENSOR_PTR(        PWRPROC,  &G_dcom_slv_outbox_tx.pwrproc),
   MINI_SENSOR_PTR(   PWR250USVDD0,  NULL),
   MINI_SENSOR_PTR(   PWRVCSVIOVDN,  NULL),
   MINI_SENSOR_PTR(   PWR250USMEM0,  &G_dcom_slv_outbox_tx.pwr250usmemp0),
@@ -516,7 +516,7 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
   MINI_SENSOR_PTR(      SP250USP0,  NULL),
   MINI_SENSOR_PTR(    TEMPPROCAVG,  &G_dcom_slv_outbox_tx.tempprocavg),
   MINI_SENSOR_PTR(   TEMPPROCTHRM,  &G_dcom_slv_outbox_tx.tempprocthermal),
-  MINI_SENSOR_PTR(      UTIL4MSP0,  &G_dcom_slv_outbox_tx.util4msp0),
+  MINI_SENSOR_PTR(           UTIL,  &G_dcom_slv_outbox_tx.util),
   MINI_SENSOR_PTR(       TEMPNEST,  NULL),
   MINI_SENSOR_PTR(   VOLTVDDSENSE,  NULL),
   MINI_SENSOR_PTR(   VOLTVDNSENSE,  NULL),
@@ -532,12 +532,12 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
   // Core Sensors (24 of each)
   // ------------------------------------------------------
   CORE_MINI_SENSOR_PTRS_NULL(  FREQ250USP0C ),
-  CORE_MINI_SENSOR_PTRS_NULL(   FREQA4MSP0C ),
+  CORE_MINI_SENSOR_PTRS_NULL(        FREQAC ),
   CORE_MINI_SENSOR_PTRS(          IPS4MSP0C, &G_dcom_slv_outbox_tx.ips4msp0cy    ),
   CORE_MINI_SENSOR_PTRS(       NOTBZE4MSP0C, &G_dcom_slv_outbox_tx.mcpifd4msp0cy ),
   CORE_MINI_SENSOR_PTRS(       NOTFIN4MSP0C, &G_dcom_slv_outbox_tx.mcpifi4msp0cy ),
   CORE_MINI_SENSOR_PTRS_NULL( TEMPPROCTHRMC ),
-  CORE_MINI_SENSOR_PTRS(         UTIL4MSP0C, &G_dcom_slv_outbox_tx.util4msp0cy   ),
+  CORE_MINI_SENSOR_PTRS(              UTILC, &G_dcom_slv_outbox_tx.utilcy        ),
   CORE_MINI_SENSOR_PTRS(         NUTIL3SP0C, &G_dcom_slv_outbox_tx.nutil3sp0cy   ),
   CORE_MINI_SENSOR_PTRS_NULL(    MSTL2MSP0C ),
   CORE_MINI_SENSOR_PTRS_NULL(     CMT2MSP0C ),