SW285864: HWP updates to remove strings from fapi trace statements

CQ:SW285864
Change-Id: Id319e022448b98a7e3e4e86a69fa59ea703c40e1
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14840
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14843
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 23 insertions, 19 deletions

diff --git a/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config.C b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config.C
index cce29d178..044d00488 100644
--- a/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config.C
+++ b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: mss_eff_config.C,v 1.49 2014/12/01 18:52:15 asaetow Exp $
+// $Id: mss_eff_config.C,v 1.50 2014/12/03 19:55:07 jdsloat Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/
 //          centaur/working/procedures/ipl/fapi/mss_eff_config.C,v $
 //------------------------------------------------------------------------------
@@ -45,6 +45,7 @@
 //------------------------------------------------------------------------------
 // Version:|  Author: |  Date:  | Comment:
 //---------|----------|---------|-----------------------------------------------
+//   1.50  | asaetow  |03-DEC-14| Removed string data types that are not supported.
 //   1.49  | asaetow  |01-DEC-14| Added RDIMM SPD/VPD support for ATTR_EFF_DIMM_RCD_CNTL_WORD_0_15 to take in SPD bits69:76 thru new VPD attribute ATTR_VPD_DIMM_RCD_CNTL_WORD_0_15.
 //         |          |         | Added ATTR_VPD_DIMM_RCD_IBT and ATTR_VPD_DIMM_RCD_OUTPUT_TIMING merge, per meeting with Ken and Dan P.
 //         |          |         | NOTE: DO NOT pickup w/o getMBvpdTermData.C v1.18 or newer from Dan.C and Corey.
@@ -2308,7 +2309,6 @@ fapi::ReturnCode mss_eff_config(const fapi::Target i_target_mba)
 #ifndef FAPI_DDR4
     /* Initialize Variables */
     const fapi::Target& TARGET_MBA = i_target_mba;
-    const char * const PROCEDURE_NAME = "mss_eff_config";
     fapi::ReturnCode rc;
     fapi::Target l_target_centaur;
     // Changed l_mss_volt to p_l_mss_eff_config_data->mss_volt.
@@ -2326,7 +2326,7 @@ fapi::ReturnCode mss_eff_config(const fapi::Target i_target_mba)
     memset( p_l_spd_data, 0, sizeof(mss_eff_config_spd_data) );
     memset( p_l_atts, 0, sizeof(mss_eff_config_atts) );
 
-    FAPI_INF("STARTING %s on %s \n", PROCEDURE_NAME,
+    FAPI_INF("STARTING mss_eff_config on %s \n",
             i_target_mba.toEcmdString());
 
     do
@@ -2476,7 +2476,7 @@ fapi::ReturnCode mss_eff_config(const fapi::Target i_target_mba)
 
 
 
-        FAPI_INF("%s on %s COMPLETE\n", PROCEDURE_NAME,
+        FAPI_INF("mss_eff_config on %s COMPLETE\n",
                 i_target_mba.toEcmdString());
 
     } while(0);
diff --git a/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_throttle_to_power.C b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_throttle_to_power.C
index 22d61742c..382cc23ee 100644
--- a/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_throttle_to_power.C
+++ b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_throttle_to_power.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: mss_throttle_to_power.C,v 1.17 2014/10/16 13:42:02 pardeik Exp $
+// $Id: mss_throttle_to_power.C,v 1.18 2014/11/06 21:07:04 pardeik Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/
 //          centaur/working/procedures/ipl/fapi/mss_throttle_to_power.C,v $
 //------------------------------------------------------------------------------
@@ -49,6 +49,8 @@
 //------------------------------------------------------------------------------
 // Version:|  Author: |  Date:  | Comment:
 //---------|----------|---------|-----------------------------------------------
+//   1.18  | pardeik  |06-NOV-14| removed string in trace statement
+//         |          |         | changed FAPI_IMP to FAPI_INF
 //   1.17  | pardeik  |16-OCT-14| removed l_dimm_power_array_integer to fix
 //         |          |         |  cronus 64bit compile error
 //   1.16  | pardeik  |15-OCT-14| remove attr writing for ATTR_MSS_DIMM_MAXPOWER
@@ -129,9 +131,7 @@ extern "C" {
     {
 	fapi::ReturnCode rc = fapi::FAPI_RC_SUCCESS;
 
-	const char* procedure_name = "mss_throttle_to_power";
-
-	FAPI_IMP("*** Running %s ***", procedure_name);
+	FAPI_INF("*** Running mss_throttle_to_power ***");
 
 	uint32_t throttle_n_per_mba;
 	uint32_t throttle_n_per_chip;
@@ -172,7 +172,7 @@ extern "C" {
 	    return rc;
 	}
 
-	FAPI_IMP("*** %s COMPLETE ***", procedure_name);
+	FAPI_INF("*** mss_throttle_to_power COMPLETE ***");
 	return rc;
 
     }
@@ -206,9 +206,7 @@ extern "C" {
     {
 	fapi::ReturnCode rc = fapi::FAPI_RC_SUCCESS;
 
-	const char* procedure_name = "mss_throttle_to_power_calc";
-
-	FAPI_IMP("*** Running %s ***", procedure_name);
+	FAPI_INF("*** Running mss_throttle_to_power_calc ***");
 
 	const uint8_t MAX_NUM_PORTS = 2;
 	const uint8_t MAX_NUM_DIMMS = 2;
@@ -469,7 +467,7 @@ extern "C" {
 	    return rc;
 	}
 
-	FAPI_IMP("*** %s COMPLETE ***", procedure_name);
+	FAPI_INF("*** mss_throttle_to_power_calc COMPLETE ***");
 	return rc;
     }
 
diff --git a/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_util_to_throttle.C b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_util_to_throttle.C
index 93b0d1dea..7b6102c43 100755
--- a/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_util_to_throttle.C
+++ b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_util_to_throttle.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,10 +22,14 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: mss_util_to_throttle.C,v 1.6 2014/02/11 15:52:42 pardeik Exp $
+// $Id: mss_util_to_throttle.C,v 1.7 2014/11/06 21:07:06 pardeik Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/
 //          centaur/working/procedures/ipl/fapi/mss_util_to_throttle.C,v $
 //------------------------------------------------------------------------------
+// *! (C) Copyright International Business Machines Corp. 2011
+// *! All Rights Reserved -- Property of IBM
+// *! ***  ***
+//------------------------------------------------------------------------------
 // *! TITLE       : mss_util_to_throttle
 // *! DESCRIPTION : see additional comments below
 // *! OWNER NAME  : Michael Pardeik   Email: pardeik@us.ibm.com
@@ -46,6 +50,8 @@
 //------------------------------------------------------------------------------
 // Version:|  Author: |  Date:  | Comment:
 //---------|----------|---------|-----------------------------------------------
+//  1.7    | pardeik  |06-NOV-14| removed string in trace statement
+//         |          |         | changed FAPI_IMP to FAPI_INF
 //  1.6    | pardeik  |11-FEB-14| RAS review fix:  change %% to percent
 //  1.5    | pardeik  |13-JAN-14| Fixed calculation to not include x2 factor for
 //         |          |         |  other MBA for custom DIMMs
@@ -85,7 +91,7 @@ extern "C" {
     {
 	fapi::ReturnCode rc = fapi::FAPI_RC_SUCCESS;
 
-	FAPI_IMP("*** Running mss_util_to_throttle ***");
+	FAPI_INF("*** Running mss_util_to_throttle ***");
 
 	uint32_t throttle_d;
 	uint8_t data_bus_util;
@@ -122,7 +128,7 @@ extern "C" {
 	    return rc;
 	}
 
-	FAPI_IMP("*** mss_util_to_throttle COMPLETE ***");
+	FAPI_INF("*** mss_util_to_throttle COMPLETE ***");
 	return rc;
 
     }