Debug Build Broken

Changed updated variables
Resolved syntactic compiler errors

Change-Id: Ibf631dc342d44712d21f7b566fcaf8007c6580c5
RTC:93634
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12019
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

7 files changed, 34 insertions, 20 deletions

diff --git a/src/include/usr/trace/interface.H b/src/include/usr/trace/interface.H
index b6748582c..74c70228f 100644
--- a/src/include/usr/trace/interface.H
+++ b/src/include/usr/trace/interface.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,2014              */
+/* Contributors Listed Below - COPYRIGHT 2011,2014                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
diff --git a/src/include/usr/trace/trace.H b/src/include/usr/trace/trace.H
index 474389b73..e5ecf8996 100644
--- a/src/include/usr/trace/trace.H
+++ b/src/include/usr/trace/trace.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,2014              */
+/* Contributors Listed Below - COPYRIGHT 2011,2014                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
diff --git a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
index 26a460463..276182631 100644
--- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
@@ -991,9 +991,13 @@ void ErrDataService::printDebugTraces( )
     if( sdc.IsDegraded() )     PRDF_DTRAC( "PRDTRACE: Performance is degraded");
 
     if( sdc.IsServiceCall() )
+    {
         PRDF_DTRAC( "PRDTRACE: SERVICE REQUIRED" );
+    }
     else
+    {
         PRDF_DTRAC( "PRDTRACE: SERVICE NOT REQUIRED" );
+    }
 
     if( sdc.IsMfgTracking() ) PRDF_DTRAC( "PRDTRACE: Track this error" );
     if( sdc.Terminate() )     PRDF_DTRAC( "PRDTRACE: BRING DOWN MACHINE" );
diff --git a/src/usr/pore/poreve/pore_model/ibuf/pore_model.c b/src/usr/pore/poreve/pore_model/ibuf/pore_model.c
index a69b087b0..18f14e0b1 100644
--- a/src/usr/pore/poreve/pore_model/ibuf/pore_model.c
+++ b/src/usr/pore/poreve/pore_model/ibuf/pore_model.c
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -2771,17 +2773,7 @@ void pore_dump(pore_model_t p)
 		"    SCR2/D1:      %016llx IBUF012: %08llx.%08llx.%08llx\n"
 		"    DBG0:         %016llx DBG1:         %016llx\n"
 		"    PC_STACK0:    %016llx PC_STACK1:    %016llx\n"
-		"    PC_STACK2:    %016llx ID_FLAGS:     %016llx\n"
-		"    DATA0:        %016llx MEM_RELOC:	 %016llx\n"
-		"    I2C_E0:       %016llx I2C_E1:	 %016llx\n"
-		"    I2C_E2:       %016llx PC:		 %016llx\n"
-		"  Internal State\n"
-		"    branchTaken/broken:       %lld/%lld\n"
-		"    pore_interrupt_request:   %lld\n"
-		"    oci_fetchBufValid/Cursor: %lld/%lld\n"
-		"    oci_fetchBuf:             %016llx\n"
-		"-------------------------------------"
-		"-------------------------------------\n",
+		"    PC_STACK2:    %016llx ID_FLAGS:     %016llx\n",
 		(long long)p->status.val,	(long long)p->control.val,
 		(long long)p->reset.val,	(long long)p->error_mask.val,
 		(long long)p->prv_base[0].val,	(long long)p->prv_base[1].val,
@@ -2793,7 +2785,19 @@ void pore_dump(pore_model_t p)
 		(long long)p->ibuf_01.ibuf1,	(long long)p->ibuf_2.ibuf2,
 		(long long)p->dbg0.val,		(long long)p->dbg1.val,
 		(long long)p->pc_stack[0].val,	(long long)p->pc_stack[1].val,
-		(long long)p->pc_stack[2].val,	(long long)p->id_flags.val,
+		(long long)p->pc_stack[2].val,	(long long)p->id_flags.val);
+
+    aprintf(""
+		"    DATA0:        %016llx MEM_RELOC:	 %016llx\n"
+		"    I2C_E0:       %016llx I2C_E1:	 %016llx\n"
+		"    I2C_E2:       %016llx PC:		 %016llx\n"
+		"  Internal State\n"
+		"    branchTaken/broken:       %lld/%lld\n"
+		"    pore_interrupt_request:   %lld\n"
+		"    oci_fetchBufValid/Cursor: %lld/%lld\n"
+		"    oci_fetchBuf:             %016llx\n"
+		"-------------------------------------"
+		"-------------------------------------\n",
 		(long long)p->data0,		(long long)p->memory_reloc.val,
 		(long long)p->i2c_e_param[0].val,
 		(long long)p->i2c_e_param[1].val,
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C
index 1d78e8287..6a4aaec68 100644
--- a/src/usr/sbe/sbe_update.C
+++ b/src/usr/sbe/sbe_update.C
@@ -1371,7 +1371,7 @@ namespace SBE
 
             TRACDBIN(g_trac_sbe, "getSbeInfoState-spA",
                      &(io_sbeState.seeprom_0_ver),
-                     sizeof(sbeVersion_t));
+                     sizeof(sbeSeepromVersionInfo_t));
 
             /*******************************************/
             /*  Get SEEPROM B SBE Version Information  */
@@ -1392,7 +1392,7 @@ namespace SBE
 
             TRACDBIN(g_trac_sbe, "getSbeInfoState-spB",
                      &(io_sbeState.seeprom_1_ver),
-                    sizeof(sbeVersion_t));
+                    sizeof(sbeSeepromVersionInfo_t));
 
             /***********************************************/
             /*  Determine which SEEPROM System Booted On   */
diff --git a/src/usr/sbe/test/sbeupdatetest.H b/src/usr/sbe/test/sbeupdatetest.H
index 4ab0150b2..7c5624b35 100644
--- a/src/usr/sbe/test/sbeupdatetest.H
+++ b/src/usr/sbe/test/sbeupdatetest.H
@@ -483,7 +483,7 @@ class SBEUpdateTest: public CxxTest::TestSuite
             TRACDBIN( g_trac_sbe, "testSbeUpdateTarget()-pnorVersion",
                       &sbeState.pnorVersion, sizeof(sbe_image_version_t));
             TRACDBIN( g_trac_sbe, "testSbeUpdateTarget()-mvpdSbKeyword",
-                      &sbeState.mvpdSbKeyword, sizeof(mvpdSbeVersion_t));
+                      &sbeState.mvpdSbKeyword, sizeof(mvpdSbKeyword_t));
             TRACDBIN( g_trac_sbe, "testSbeUpdateTarget()-seeprom_0_ver",
                       &sbeState.seeprom_0_ver,
                       sizeof(sbeSeepromVersionInfo_t));
diff --git a/src/usr/xscom/xscom.C b/src/usr/xscom/xscom.C
index 877f77faf..1e6c9519f 100644
--- a/src/usr/xscom/xscom.C
+++ b/src/usr/xscom/xscom.C
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,2014              */
+/* Contributors Listed Below - COPYRIGHT 2011,2014                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -490,7 +492,7 @@ errlHndl_t  xScomDoOp(DeviceFW::OperationType i_opType,
     } while (io_hmer.mXSComStatus == PIB::PIB_RESOURCE_OCCUPIED);
 
 
-    TRACDCOMP(g_trac_xscom,"xscomPerformOp: OpType 0x%.16llX, Address 0x%llX, MMIO Address 0x%llX" static_cast<uint64_t>(i_opType),i_xscomAddr,static_cast<uint64_t>(l_mmioAddr));
+    TRACDCOMP(g_trac_xscom,"xscomPerformOp: OpType 0x%.16llX, Address 0x%llX, MMIO Address 0x%llX", static_cast<uint64_t>(i_opType),i_xscomAddr,static_cast<uint64_t>(l_mmioAddr));
 
     TRACDCOMP(g_trac_xscom, "xscomPerformOp: l_offset 0x%.16llX; VirtAddr %p; i_virtAddr+l_offset %p",l_offset,i_virtAddr,i_virtAddr + l_offset);