tag build-AmcCarrierBpmStriplineDDV2-0x00000001-20171201150756-strauman Tagger: Till Straumann Date: Fri Dec 1 17:31:26 2017 -0800 PROJECT: AmcCarrierBpmStriplineDDV2 FW_VERSION: 0x00000001 BUILD_STRING: AmcCarrierBpmStriplineDDV2: Vivado v2016.4, rdsrv221 (x86_64), Built Fri Dec 1 15:07:56 PST 2017 by strauman commit fc7acc2c3165ddadaa2dfbd854f48b7e95d740c6 Author: Till Straumann Date: Fri Dec 1 10:52:56 2017 -0800 Fixed typos (syntax errors in AppCoreImpl.vhd) diff --git a/firmware/common/Bpm/core/rtl/AppCoreImpl.vhd b/firmware/common/Bpm/core/rtl/AppCoreImpl.vhd index 00f72b5..34a5e15 100644 --- a/firmware/common/Bpm/core/rtl/AppCoreImpl.vhd +++ b/firmware/common/Bpm/core/rtl/AppCoreImpl.vhd @@ -663,7 +663,7 @@ begin -- A Filter to decimate BP messages for testing/debugging ---------------------- - bpMsgDecimatorConfig <= ( locCtrlRegVals(EVT_ENB_WREG_C)(0) & locCtrlRegVals(EVT_SEL_WREG_C) ); + bpMsgDecimatorConfig <= ( locCtrlRegVals(EVT_ENB_WREG_IDX_C)(0) & locCtrlRegVals(EVT_SEL_WREG_IDX_C) ); U_BpMsgDecimator : entity work.BpMsgDecimator generic map ( @@ -684,9 +684,9 @@ begin config => bpMsgDecimatorConfig, - status(0) => locStatRegVals(EVT_CNT_RREG_C), - status(1) => locStatRegVals(EVT_MIN_RREG_C), - status(2) => locStatRegVals(EVT_MAX_RREG_C) + status(0) => locStatRegVals(EVT_CNT_RREG_IDX_C), + status(1) => locStatRegVals(EVT_MIN_RREG_IDX_C), + status(2) => locStatRegVals(EVT_MAX_RREG_IDX_C) ); ---------------------- @@ -907,7 +907,7 @@ begin -- Application Messaging Interface (clk domain) clk => timingClk, rst => timingRst, - strobe => bpmMsgStrobe, -- to BLEN + strobe => bpMsgStrobe, -- to BLEN header => (others => (others => '0')), -- to BLEN timeStamp => bpMsgTimestamp, -- to BLEN data => locDiagnostic.data(BPM_N_MSG_CHANNELS-1 downto 0), -- to BLEN