From d605b2b1813967164e36b1f95e6d85c8cd2c7ac6 Mon Sep 17 00:00:00 2001 From: Benjamin Weisenbeck Date: Fri, 22 Jan 2016 08:52:55 -0600 Subject: PRD: Fix processor-specific homer register lists CQ: SW332952 Change-Id: I1abdfe95588da8128e37927cb1e42db0fb597891 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/23529 Reviewed-by: Caleb N. Palmer Tested-by: Jenkins Server Reviewed-by: BENJAMIN J. WEISENBECK Reviewed-by: Brian J. Stegmiller Reviewed-by: Zane Shelley Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/23674 Reviewed-by: Daniel M. Crowell --- src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C b/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C index 0c3e9a6ea..6b4aa9c8f 100644 --- a/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C +++ b/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015 */ +/* Contributors Listed Below - COPYRIGHT 2015,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -660,7 +660,7 @@ errlHndl_t writeData( uint8_t * i_hBuf, size_t i_hBufSize, // Check Processor type bool isNaples = false; TargetHandleList list = getFunctionalTargetList( TYPE_PROC ); - if (list.size() > 0 && MODEL_NAPLES == getProcModel(list[0])) + if ((list.size() > 0) && (MODEL_NAPLES == getProcModel(list[0]))) isNaples = true; // Get the ultimate buffer size. @@ -672,12 +672,12 @@ errlHndl_t writeData( uint8_t * i_hBuf, size_t i_hBufSize, size_t sz_data = sizeof(o_data); sz_hBuf += sz_data; s[PROC][GLBL] = sizeof(proc_glbl); sz_hBuf += s[PROC][GLBL]; - s[PROC][FIR] = sizeof(proc_common_fir) + - isNaples ? sizeof(proc_naples_fir) : sizeof(proc_murano_venice_fir); + s[PROC][FIR] = sizeof(proc_common_fir) + ( isNaples ? + sizeof(proc_naples_fir) : sizeof(proc_murano_venice_fir) ); sz_hBuf += s[PROC][FIR]; - s[PROC][REG] = sizeof(proc_common_reg) + - isNaples ? sizeof(proc_naples_reg) : sizeof(proc_murano_venice_reg); + s[PROC][REG] = sizeof(proc_common_reg) + ( isNaples ? + sizeof(proc_naples_reg) : sizeof(proc_murano_venice_reg) ); sz_hBuf += s[PROC][REG]; s[EX][GLBL] = sizeof(ex_glbl); sz_hBuf += s[EX][GLBL]; @@ -732,7 +732,7 @@ errlHndl_t writeData( uint8_t * i_hBuf, size_t i_hBufSize, o_data.counts[c][REG] = s[c][REG] / u32; o_data.counts[c][IDFIR] = s[c][IDFIR] / u64; o_data.counts[c][IDREG] = s[c][IDREG] / u64; -} + } // Add everything to the buffer. uint32_t idx = 0; -- cgit v1.2.1