Initial HWPF delivery

Update after pass-around review

Change-Id: I8f81dd7820b61607e9a98d17c81e74fface42c54
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/160
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 21 insertions, 27 deletions

diff --git a/src/usr/xscom/test/xscomtest.H b/src/usr/xscom/test/xscomtest.H
index 4627344b3..f1c7a017a 100644
--- a/src/usr/xscom/test/xscomtest.H
+++ b/src/usr/xscom/test/xscomtest.H
@@ -13,6 +13,8 @@
 #include <errl/errltypes.H>
 #include <devicefw/userif.H>
 
+extern trace_desc_t* g_trac_xscom;
+
 using namespace TARGETING;
 
 // Address and data to read/write
@@ -44,32 +46,25 @@ public:
      */
     void testXscom1(void)
     {
-
-        //@todo - Replace printk with traces
-
         TARGETING::Target* l_testTarget = MASTER_PROCESSOR_CHIP_TARGET_SENTINEL;
         size_t l_size = sizeof(uint64_t);
 
         // Loop thru table
+        errlHndl_t l_err = NULL;
         for( uint32_t l_num=0; l_num < g_xscomAddrTableSz; l_num++)
         {
              testXscomAddrData l_testEntry = g_xscomAddrTable[l_num];
 
              // Perform XSComOM read
              uint64_t l_data = 0;
-             errlHndl_t l_err = deviceRead(l_testTarget,
+             l_err = deviceRead(l_testTarget,
                                 &l_data,
                                 l_size,
                                 DEVICE_SCOM_ADDRESS(l_testEntry.addr));
              if (l_err)
              {
-                 printk("\ntestXscom1: XSCom read: deviceRead() fails (1) !\n");
-             }
-             else
-             {
-                 printk("\ntestXscom1: XSCom read (1) Address 0x%.8X, Data %llx\n\n\n",
-                          l_testEntry.addr,
-                          (long long unsigned)l_data);
+                 TS_FAIL("testXscom1: XSCom read: deviceRead() fails! Error committed.");
+                 break;
              }
 
              // Perform an XSCom write
@@ -81,15 +76,9 @@ public:
 
              if (l_err)
              {
-                 printk("\ntestXscom1: XSCom write: deviceWrite() fails!\n");
+                 TS_FAIL("testXscom1: XSCom write: deviceWrite() fails!");
                  break;
              }
-             else
-             {
-                 printk("\ntestXscom1: XSCom write Address 0x%.8X, Data %llx\n",
-                         l_testEntry.addr,
-                         (long long unsigned)l_testEntry.data);
-             }
 
              // Read back
              l_data = 0;
@@ -99,16 +88,21 @@ public:
                                 DEVICE_SCOM_ADDRESS(l_testEntry.addr));
              if (l_err)
              {
-                 printk("\ntestXscom1: XSCom read: deviceRead() fails (2) !\n");
-             }
-             else
-             {
-                 printk("\ntestXscom1: XSCom read (2) Address 0x%.8X, Data %llx\n\n\n",
-                          l_testEntry.addr,
-                          (long long unsigned)l_data);
+                 TS_FAIL("testXscom1: XSCom read back: deviceRead() fails!");
+                 break;
              }
-         }
-         return;
+        }
+
+        if (l_err)
+        {
+            TS_FAIL("testXscom1 failed!  Error committed.");
+            errlCommit(l_err);
+        }
+        else
+        {
+            TS_TRACE("testXscom1 runs successfully!");
+        }
+        return;
     }
 };