Enable Slave DTS calculation and sensor update.

Change-Id: I0feb572e650322326ce9a6c7b2affd9e58cd6b8d
RTC:140183
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22303
Reviewed-by: Wael Elessawy <welessa@us.ibm.com>
Tested-by: Wael Elessawy <welessa@us.ibm.com>

3 files changed, 23 insertions, 23 deletions

diff --git a/src/occ_405/sensor/sensor_enum.h b/src/occ_405/sensor/sensor_enum.h
index ec2fd9e..bbd46f1 100755
--- a/src/occ_405/sensor/sensor_enum.h
+++ b/src/occ_405/sensor/sensor_enum.h
@@ -122,8 +122,8 @@ enum e_gsid
     SLEEPCNT2MSP0,
     WINKCNT2MSP0,
     SP250USP0,
-    TEMP2MSP0,
-    TEMP2MSP0PEAK,
+    TEMP4MSP0,
+    TEMP4MSP0PEAK,
     UTIL2MSP0,
     VRFAN250USPROC,
     VRHOT250USPROC,
@@ -206,18 +206,18 @@ enum e_gsid
     SPURR2MSP0C10,
     SPURR2MSP0C11,
 
-    TEMP2MSP0C0,
-    TEMP2MSP0C1,
-    TEMP2MSP0C2,
-    TEMP2MSP0C3,
-    TEMP2MSP0C4,
-    TEMP2MSP0C5,
-    TEMP2MSP0C6,
-    TEMP2MSP0C7,
-    TEMP2MSP0C8,
-    TEMP2MSP0C9,
-    TEMP2MSP0C10,
-    TEMP2MSP0C11,
+    TEMP4MSP0C0,
+    TEMP4MSP0C1,
+    TEMP4MSP0C2,
+    TEMP4MSP0C3,
+    TEMP4MSP0C4,
+    TEMP4MSP0C5,
+    TEMP4MSP0C6,
+    TEMP4MSP0C7,
+    TEMP4MSP0C8,
+    TEMP4MSP0C9,
+    TEMP4MSP0C10,
+    TEMP4MSP0C11,
 
     UTIL2MSP0C0,
     UTIL2MSP0C1,
diff --git a/src/occ_405/sensor/sensor_info.c b/src/occ_405/sensor/sensor_info.c
index 89d7578..b94bd30 100755
--- a/src/occ_405/sensor/sensor_info.c
+++ b/src/occ_405/sensor/sensor_info.c
@@ -227,8 +227,8 @@ const sensor_info_t G_sensor_info[]   =
   SENSOR_INFO_T_ENTRY(   SLEEPCNT2MSP0,   "#\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(    WINKCNT2MSP0,   "#\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   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(       TEMP2MSP0,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENSOR_INFO_T_ENTRY(   TEMP2MSP0PEAK,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(       TEMP4MSP0,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(   TEMP4MSP0PEAK,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(       UTIL2MSP0,   "%\0",    AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1,-2)  ),
   SENSOR_INFO_T_ENTRY(  VRFAN250USPROC, "pin\0",    AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(  VRHOT250USPROC, "pin\0",    AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
@@ -246,7 +246,7 @@ const sensor_info_t G_sensor_info[]   =
   SENS_CORE_ENTRY_SET(   NOTBZE2MSP0C , "cyc\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENS_CORE_ENTRY_SET(   NOTFIN2MSP0C , "cyc\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENS_CORE_ENTRY_SET(    SPURR2MSP0C ,   "%\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENS_CORE_ENTRY_SET(     TEMP2MSP0C ,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENS_CORE_ENTRY_SET(     TEMP4MSP0C ,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENS_CORE_ENTRY_SET(     UTIL2MSP0C ,   "%\0",    AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_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)  ),
diff --git a/src/occ_405/sensor/sensor_table.c b/src/occ_405/sensor/sensor_table.c
index 86786e0..8df70d0 100755
--- a/src/occ_405/sensor/sensor_table.c
+++ b/src/occ_405/sensor/sensor_table.c
@@ -276,8 +276,8 @@ const sensor_ptr_t G_amec_sensor_list[] =
   SENSOR_PTR( SLEEPCNT2MSP0,        &g_amec_sys.proc[0].sleepcnt2ms),
   SENSOR_PTR( WINKCNT2MSP0,         &g_amec_sys.proc[0].winkcnt2ms),
   SENSOR_PTR( SP250USP0,            &g_amec_sys.proc[0].sp250us),
-  SENSOR_PTR( TEMP2MSP0,            &g_amec_sys.proc[0].temp2ms),
-  SENSOR_PTR( TEMP2MSP0PEAK,        &g_amec_sys.proc[0].temp2mspeak),
+  SENSOR_PTR( TEMP4MSP0,            &g_amec_sys.proc[0].temp4ms),
+  SENSOR_PTR( TEMP4MSP0PEAK,        &g_amec_sys.proc[0].temp4mspeak),
   SENSOR_PTR( UTIL2MSP0,            &g_amec_sys.proc[0].util2ms),
   SENSOR_PTR( VRFAN250USPROC,       &g_amec_sys.sys.vrfan250usproc),
   SENSOR_PTR( VRHOT250USPROC,       &g_amec_sys.sys.vrhot250usproc),
@@ -291,7 +291,7 @@ const sensor_ptr_t G_amec_sensor_list[] =
   CORE_SENSOR_PTRS( NOTBZE2MSP0C ,  &g_amec_sys.proc[0].core, mcpifd2ms),
   CORE_SENSOR_PTRS( NOTFIN2MSP0C ,  &g_amec_sys.proc[0].core, mcpifi2ms),
   CORE_SENSOR_PTRS( SPURR2MSP0C ,   &g_amec_sys.proc[0].core, spurr2ms),
-  CORE_SENSOR_PTRS( TEMP2MSP0C ,    &g_amec_sys.proc[0].core, temp2ms),
+  CORE_SENSOR_PTRS( TEMP4MSP0C ,    &g_amec_sys.proc[0].core, temp4ms),
   CORE_SENSOR_PTRS( UTIL2MSP0C ,    &g_amec_sys.proc[0].core, util2ms),
   CORE_SENSOR_PTRS( NUTIL3SP0C ,    &g_amec_sys.proc[0].core, nutil3s),
   CORE_SENSOR_PTRS( MSTL2MSP0C ,    &g_amec_sys.proc[0].core, mstl2ms),
@@ -428,8 +428,8 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
   MINI_SENSOR_PTR(  SLEEPCNT2MSP0,  &G_dcom_slv_outbox_tx.sleepcnt2msp0),
   MINI_SENSOR_PTR(   WINKCNT2MSP0,  &G_dcom_slv_outbox_tx.winkcnt2msp0),
   MINI_SENSOR_PTR(      SP250USP0,  NULL),
-  MINI_SENSOR_PTR(      TEMP2MSP0,  &G_dcom_slv_outbox_tx.temp2msp0),
-  MINI_SENSOR_PTR(  TEMP2MSP0PEAK,  &G_dcom_slv_outbox_tx.temp2msp0peak),
+  MINI_SENSOR_PTR(      TEMP4MSP0,  &G_dcom_slv_outbox_tx.temp4msp0),
+  MINI_SENSOR_PTR(  TEMP4MSP0PEAK,  &G_dcom_slv_outbox_tx.temp4msp0peak),
   MINI_SENSOR_PTR(      UTIL2MSP0,  &G_dcom_slv_outbox_tx.util2msp0),
   MINI_SENSOR_PTR( VRFAN250USPROC,  &G_dcom_slv_outbox_tx.vrfan250usproc),
   MINI_SENSOR_PTR( VRHOT250USPROC,  NULL),
@@ -443,7 +443,7 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
   CORE_MINI_SENSOR_PTRS(       NOTBZE2MSP0C, &G_dcom_slv_outbox_tx.mcpifd2msp0cy ),
   CORE_MINI_SENSOR_PTRS(       NOTFIN2MSP0C, &G_dcom_slv_outbox_tx.mcpifi2msp0cy ),
   CORE_MINI_SENSOR_PTRS_NULL(   SPURR2MSP0C ),
-  CORE_MINI_SENSOR_PTRS_NULL(    TEMP2MSP0C ),
+  CORE_MINI_SENSOR_PTRS_NULL(    TEMP4MSP0C ),
   CORE_MINI_SENSOR_PTRS(         UTIL2MSP0C, &G_dcom_slv_outbox_tx.util2msp0cy   ),
   CORE_MINI_SENSOR_PTRS(         NUTIL3SP0C, &G_dcom_slv_outbox_tx.nutil3sp0cy   ),
   CORE_MINI_SENSOR_PTRS_NULL(    MSTL2MSP0C ),