HWPF: Ensure all fapi functions start with fapi

Change-Id: I817d1c630dc0d10d456274841a2c4d75fc5e4692
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/342
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>

2 files changed, 23 insertions, 27 deletions

diff --git a/src/include/usr/hwpf/fapi/fapiHwAccess.H b/src/include/usr/hwpf/fapi/fapiHwAccess.H
index 3dee4b174..1fe502a6d 100644
--- a/src/include/usr/hwpf/fapi/fapiHwAccess.H
+++ b/src/include/usr/hwpf/fapi/fapiHwAccess.H
@@ -37,6 +37,7 @@
  *                          mjjones     06/02/2011  Scom addresses should be uint64_t
  *                                                  use ecmdDataBufferBase
  *                          mjjones     06/30/2011  Updated comment
+ *                          mjjones     09/14/2011  Prepended fapi to functions
  *
  */
 
@@ -76,9 +77,9 @@ extern "C"
  *                    address
  * @return ReturnCode. Zero on success, else platform specified error
  */
-fapi::ReturnCode GetScom(const fapi::Target& i_target,
-                         const uint64_t i_address,
-                         ecmdDataBufferBase & o_data);
+fapi::ReturnCode fapiGetScom(const fapi::Target& i_target,
+                             const uint64_t i_address,
+                             ecmdDataBufferBase & o_data);
 
 /**
  * @brief Writes a SCOM register on a Chip
@@ -88,9 +89,9 @@ fapi::ReturnCode GetScom(const fapi::Target& i_target,
  *                   address
  * @return ReturnCode. Zero on success, else platform specified error
  */
-fapi::ReturnCode PutScom(const fapi::Target& i_target,
-                         const uint64_t i_address,
-                         ecmdDataBufferBase & i_data);
+fapi::ReturnCode fapiPutScom(const fapi::Target& i_target,
+                             const uint64_t i_address,
+                             ecmdDataBufferBase & i_data);
 
 /**
  * @brief Writes a SCOM register under mask to a chip
@@ -101,10 +102,10 @@ fapi::ReturnCode PutScom(const fapi::Target& i_target,
  *                   write)
  * @return ReturnCode. Zero on success, else platform specified error
  */
-fapi::ReturnCode PutScomUnderMask(const fapi::Target& i_target,
-                                  const uint64_t i_address,
-                                  ecmdDataBufferBase & i_data,
-                                  ecmdDataBufferBase & i_mask);
+fapi::ReturnCode fapiPutScomUnderMask(const fapi::Target& i_target,
+                                      const uint64_t i_address,
+                                      ecmdDataBufferBase & i_data,
+                                      ecmdDataBufferBase & i_mask);
 
 
 /**
@@ -115,9 +116,9 @@ fapi::ReturnCode PutScomUnderMask(const fapi::Target& i_target,
  *                    address
  * @return ReturnCode. Zero on success, else platform specified error
  */
-fapi::ReturnCode GetCfamRegister(const fapi::Target& i_target,
-                                 const uint32_t i_address,
-                                 ecmdDataBufferBase & o_data);
+fapi::ReturnCode fapiGetCfamRegister(const fapi::Target& i_target,
+                                     const uint32_t i_address,
+                                     ecmdDataBufferBase & o_data);
 
 /**
  * @brief Writes a CFAM register to a chip
@@ -127,9 +128,9 @@ fapi::ReturnCode GetCfamRegister(const fapi::Target& i_target,
  *                   address
  * @return ReturnCode. Zero on success, else platform specified error
  */
-fapi::ReturnCode PutCfamRegister(const fapi::Target& i_target,
-                                 const uint32_t i_address,
-                                 ecmdDataBufferBase & i_data);
+fapi::ReturnCode fapiPutCfamRegister(const fapi::Target& i_target,
+                                     const uint32_t i_address,
+                                     ecmdDataBufferBase & i_data);
 
 /**
  * @brief Read-modify-write a CFAM register on a chip
@@ -139,10 +140,10 @@ fapi::ReturnCode PutCfamRegister(const fapi::Target& i_target,
  * @param[in] i_modifyMode The modify mode (or/and/xor)
  * @return ReturnCode. Zero on success, else platform specified error
  */
-fapi::ReturnCode ModifyCfamRegister(const fapi::Target& i_target,
-                                    const uint32_t i_address,
-                                    ecmdDataBufferBase & i_data,
-                                    const fapi::ChipOpModifyMode i_modifyMode);
+fapi::ReturnCode fapiModifyCfamRegister(const fapi::Target& i_target,
+                                        const uint32_t i_address,
+                                        ecmdDataBufferBase & i_data,
+                                        const fapi::ChipOpModifyMode i_modifyMode);
 
 
 } // extern "C"
diff --git a/src/include/usr/hwpf/fapi/fapiUtil.H b/src/include/usr/hwpf/fapi/fapiUtil.H
index b8224483d..0a7ced618 100644
--- a/src/include/usr/hwpf/fapi/fapiUtil.H
+++ b/src/include/usr/hwpf/fapi/fapiUtil.H
@@ -35,6 +35,7 @@
  *                          mjjones     06/30/2011  Removed #include
  *                          mjjones     07/05/2011  Removed rogue tab
  *                          camvanng    09/06/2011  Added fapiLogError
+ *                          mjjones     09/14/2011  Prepended fapi to delay
  *
  */
 
@@ -56,7 +57,6 @@ namespace fapi
  */
 void fapiAssert(bool i_expression);
 
-
 /**
  * @brief Delay this thread. Hostboot will use the nanoseconds parameter
  * and make a syscall to nanosleep. While in the syscall, the hostboot
@@ -83,8 +83,7 @@ void fapiAssert(bool i_expression);
  * 
  * @return ReturnCode. Zero on success, else platform specified error.
  */
- fapi::ReturnCode delay( uint64_t i_nanoSeconds, uint64_t i_simCycles );
-
+fapi::ReturnCode fapiDelay(uint64_t i_nanoSeconds, uint64_t i_simCycles);
 
 /**
  * @brief Log an error.
@@ -110,7 +109,6 @@ void fapiAssert(bool i_expression);
  */
 void fapiLogError(ReturnCode & io_rc);
 
-
 /**  @brief This function answers the question, is scand tracing turned on?
  *   The implementation of this function is specific to the platform.
  *
@@ -118,8 +116,6 @@ void fapiLogError(ReturnCode & io_rc);
  */
 bool platIsScanTraceEnabled();
 
-
-
 /**  @brief Alter the state of scand tracing.
  *   The implementation of this function is specific to the platform.
  *
@@ -128,7 +124,6 @@ bool platIsScanTraceEnabled();
  */
 void platSetScanTrace( bool i_enable );
 
-
 }
 
 #endif // FAPIUTIL_H_