From 09096ab2250baf0d9a604e1f4b801b1986d83384 Mon Sep 17 00:00:00 2001 From: Thi Tran Date: Fri, 17 Oct 2014 18:14:16 -0500 Subject: SW283098: Handle the review comments on "http://gfw160.aus.stglabs.ibm.com:8080/ Change-Id: I23c185dff6053ee647cbe09da3cae22ba67d5cae CQ:SW283098 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14067 Reviewed-by: Thi N. Tran Tested-by: Thi N. Tran Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14069 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III --- src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.H | 14 +++++++++++--- .../hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.xml | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'src/usr/hwpf/hwp/tod_init') diff --git a/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.H b/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.H index 1ca669dde..a166aa65b 100644 --- a/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.H +++ b/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.H @@ -22,11 +22,10 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: proc_tod_utils.H,v 1.14 2014/09/09 18:45:59 jklazyns Exp $ +// $Id: proc_tod_utils.H,v 1.15 2014/10/14 15:07:54 jklazyns Exp $ //------------------------------------------------------------------------------ // *! (C) Copyright International Business Machines Corp. 2012 // *! All Rights Reserved -- Property of IBM -// *! *** *** // *! // *! TITLE : proc_tod_utils.H // *! @@ -285,6 +284,10 @@ const uint32_t TOD_PORT_CTRL_REG_S_PATH_1 = 0x1; const uint32_t TOD_PORT_CTRL_REG_M_PATH_0 = 0x2; const uint32_t TOD_PORT_CTRL_REG_M_PATH_1 = 0x3; +//Bit definitions for TOD_PSS_MSS_STATUS_REG +const uint32_t TOD_PSS_MSS_STATUS_REG_M_PATH_0_STEP_CHECK_VALID = 6; +const uint32_t TOD_PSS_MSS_STATUS_REG_M_PATH_1_STEP_CHECK_VALID = 7; + //Bit definitions for PB_X_MODE_0x04010C0A const uint32_t PB_X_MODE_LINK_X0_ROUND_TRIP_DELAY = 24; const uint32_t PB_X_MODE_LINK_X1_ROUND_TRIP_DELAY = 32; @@ -308,6 +311,10 @@ const uint32_t TOD_ERROR_REG_RX_TTYPE_3 = 41; const uint32_t TOD_ERROR_REG_RX_TTYPE_4 = 42; const uint32_t TOD_ERROR_REG_RX_TTYPE_5 = 43; +//Bit definitions for TOD_ERROR_MASK_REG +const uint32_t TOD_ERROR_MASK_REG_M_PATH_0_STEP_CHECK_ERROR = 14; +const uint32_t TOD_ERROR_MASK_REG_M_PATH_1_STEP_CHECK_ERROR = 15; + //Bit definitions for TFMR const uint32_t TFMR_MAX_CYC_BET_STEPS = 0; const uint32_t TFMR_N_CLKS_PER_STEP = 8; @@ -382,7 +389,8 @@ enum tod_action { TOD_SETUP, TOD_INIT, - TOD_STATUS + TOD_STATUS, + TOD_CLEANUP }; // Input which determines the topology being configured diff --git a/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.xml b/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.xml index c3eb51aa2..d572a1bdd 100644 --- a/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.xml +++ b/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.xml @@ -22,7 +22,7 @@ - + -- cgit v1.2.1