Additional fapi2 hw_access support

Moved function implementations into .C file
Cleaned up cfam target check

Change-Id: Ib25e6cdb336688eb23e2cfef7f3756781839753f
RTC: 143118
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/867
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 62 insertions, 1 deletions

diff --git a/src/usr/fapi2/test/fapi2HwpTest.C b/src/usr/fapi2/test/fapi2HwpTest.C
index d8fb23c0c..35ce9bdc5 100644
--- a/src/usr/fapi2/test/fapi2HwpTest.C
+++ b/src/usr/fapi2/test/fapi2HwpTest.C
@@ -28,6 +28,7 @@
 #include <fapi2.H>
 #include <hwpf_fapi2_reasoncodes.H>
 #include <fapi2TestUtils.H>
+#include <p9_hwtests.H>
 
 namespace fapi2
 {
@@ -150,6 +151,66 @@ errlHndl_t fapi2HwpTest()
           TS_FAIL("Error occured in p9_sample_procedure_proc !!");
         }
         numTests++;
+        FAPI_INVOKE_HWP(l_errl, p9_scomtest_getscom_fail, fapi2_procTarget);
+        if(l_errl != NULL)
+        {
+            delete l_errl; // delete expected error log
+        }
+        else
+        {
+            TS_FAIL("No error from p9_scomtest_getscom_fail !!");
+            numFails++;
+        }
+        numTests++;
+        FAPI_INVOKE_HWP(l_errl, p9_scomtest_putscom_fail, fapi2_procTarget);
+        if(l_errl != NULL)
+        {
+            delete l_errl; // delete expected error log
+        }
+        else
+        {
+            TS_FAIL("No error from p9_scomtest_putscom_fail !!");
+            numFails++;
+        }
+        numTests++;
+        FAPI_INVOKE_HWP(l_errl, p9_cfamtest_putcfam_fail, fapi2_procTarget);
+        if(l_errl != NULL)
+        {
+            delete l_errl; // delete expected error log
+        }
+        else
+        {
+            TS_FAIL("No error from p9_cfamtest_putcfam_fail !!");
+            numFails++;
+        }
+        numTests++;
+        FAPI_INVOKE_HWP(l_errl, p9_cfamtest_getcfam_fail, fapi2_procTarget);
+        if(l_errl != NULL)
+        {
+            delete l_errl; // delete expected error log
+        }
+        else
+        {
+            TS_FAIL("No error from p9_cfamtest_getcfam_fail !!");
+            numFails++;
+        }
+        numTests++;
+        FAPI_INVOKE_HWP(l_errl, p9_scomtest_getscom_pass, fapi2_procTarget);
+        if(l_errl)
+        {
+            TS_FAIL("Error from p9_scomtest_getscom_pass !!");
+            numFails++;
+        }
+        numTests++;
+        FAPI_INVOKE_HWP(l_errl, p9_scomtest_putscom_pass, fapi2_procTarget);
+        if(l_errl)
+        {
+            TS_FAIL("Error from p9_scomtest_putscom_pass !!");
+            numFails++;
+        }
+
+
+        numTests++;
         FAPI_INVOKE_HWP(l_errl, p9_sample_procedure_eq, fapi2_eqTarget, scratchWriteValue);
         if(l_errl != NULL)
         {
@@ -274,4 +335,4 @@ errlHndl_t fapi2HwpTest()
     return l_errl;
 }
 
-}
\ No newline at end of file
+}