Fixes required to build P9 STOP API with skiboot

This commit contains code changes which are needed to build
P9 STOP API for skiboot/opal firmware.

Fixes are mostly around detecting skiboot environment using
__SKIBOOT__ and including files required for the build.

Fixes related to using C compiler instead of C++

Fixes related to mixed code and declaration and other compiler error/warnings

Resolves #100

Change-Id: I49b0cb5918373c0b1a0e795fded2d245bf2aa3f7
Signed-off-by: Akshay Adiga <akshay.adiga@linux.vnet.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40151
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Stuart Z. Jacobs <sjacobs@us.ibm.com>
Reviewed-by: Prem Shanker Jha <premjha2@in.ibm.com>
Reviewed-by: Juan R. Medina <jrmedina@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40155
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/import/chips/p9/procedures/utils/stopreg/p9_stop_util.C b/src/import/chips/p9/procedures/utils/stopreg/p9_stop_util.C
index 9e9874ad9..f745a1738 100755
--- a/src/import/chips/p9/procedures/utils/stopreg/p9_stop_util.C
+++ b/src/import/chips/p9/procedures/utils/stopreg/p9_stop_util.C
@@ -48,13 +48,16 @@ namespace stopImageSection
  * @param   o_fusedMode  points to fuse mode information.
  * @return  STOP_SAVE_SUCCESS if functions succeeds, error code otherwise.
  */
-StopReturnCode_t  isFusedMode( void* const i_pImage, bool* o_fusedMode )
+static StopReturnCode_t  isFusedMode( void* const i_pImage, bool* o_fusedMode )
 {
-    *o_fusedMode = false;
     StopReturnCode_t l_rc = STOP_SAVE_SUCCESS;
+    *o_fusedMode = false;
 
     do
     {
+        HomerSection_t* pHomerDesc = ( HomerSection_t* ) i_pImage;
+        HomerImgDesc_t* pHomer =  (HomerImgDesc_t*)( pHomerDesc->interrruptHandler );
+
         if( !i_pImage )
         {
             MY_ERR( "invalid pointer to HOMER image");
@@ -62,8 +65,6 @@ StopReturnCode_t  isFusedMode( void* const i_pImage, bool* o_fusedMode )
             break;
         }
 
-        HomerSection_t* pHomerDesc = ( HomerSection_t* ) i_pImage;
-        HomerImgDesc_t* pHomer =  (HomerImgDesc_t*)( pHomerDesc->interrruptHandler );
 
         if( SWIZZLE_8_BYTE(CPMR_MAGIC_NUMBER) != pHomer->cpmrMagicWord )
         {