From 050f5a61928302190f7c366dea98ce9e98fe8aa6 Mon Sep 17 00:00:00 2001
From: Alvaro Dosil <alvaro.dosil@usc.es>
Date: Thu, 3 Apr 2014 14:20:09 +0000
Subject: [PATCH] fix bug in ipbus connection
---
firmware/hdl/common/eventFormatter_rtl.vhd | 1 +
.../fmc_mTLU/fmc_mTLU_lib/hdl/top_extphy_struct.vhd | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/firmware/hdl/common/eventFormatter_rtl.vhd b/firmware/hdl/common/eventFormatter_rtl.vhd
index 915c47fe..28f4ef3a 100644
--- a/firmware/hdl/common/eventFormatter_rtl.vhd
+++ b/firmware/hdl/common/eventFormatter_rtl.vhd
@@ -181,6 +181,7 @@ BEGIN
ipbus_o.ipb_ack <= s_ipbus_ack;
ipbus_o.ipb_err <= '0';
+
-----------------------------------------------------------------------------
-- IPBUS read
diff --git a/firmware/hdl_designer/fmc_mTLU/fmc_mTLU_lib/hdl/top_extphy_struct.vhd b/firmware/hdl_designer/fmc_mTLU/fmc_mTLU_lib/hdl/top_extphy_struct.vhd
index 810a41cb..3bdc1e30 100644
--- a/firmware/hdl_designer/fmc_mTLU/fmc_mTLU_lib/hdl/top_extphy_struct.vhd
+++ b/firmware/hdl_designer/fmc_mTLU/fmc_mTLU_lib/hdl/top_extphy_struct.vhd
@@ -128,7 +128,6 @@ ARCHITECTURE struct OF top_extphy IS
SIGNAL event_number_o : std_logic_vector(g_IPBUS_WIDTH-1 DOWNTO 0); -- starts at one. Increments for each post_veto_trigger
SIGNAL ipbr : ipb_rbus_array(g_NUM_EXT_SLAVES-1 DOWNTO 0); --! IPBus read signals
SIGNAL ipbus_clk : std_logic;
- SIGNAL ipbus_clk_i : std_logic;
SIGNAL ipbus_reset : std_logic;
SIGNAL ipbus_rst : std_logic; -- ! IPBus reset to slaves
SIGNAL ipbw : ipb_wbus_array(g_NUM_EXT_SLAVES-1 DOWNTO 0); --! IBus write signals
@@ -469,7 +468,7 @@ BEGIN
)
PORT MAP (
clk_4x_logic_i => clk_4x_logic,
- ipbus_clk_i => ipbus_clk_i,
+ ipbus_clk_i => ipbus_clk,
logic_strobe_i => strobe_4x_logic,
logic_reset_i => logic_reset,
trigger_i => overall_trigger,
--
GitLab