Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AIDA-2020 TLU
Manage
Activity
Members
Labels
Plan
Issues
2
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Projects
AIDA-2020 TLU
Commits
050f5a61
Commit
050f5a61
authored
10 years ago
by
Alvaro Dosil
Browse files
Options
Downloads
Patches
Plain Diff
fix bug in ipbus connection
parent
ba2473c0
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
firmware/hdl/common/eventFormatter_rtl.vhd
+1
-0
1 addition, 0 deletions
firmware/hdl/common/eventFormatter_rtl.vhd
firmware/hdl_designer/fmc_mTLU/fmc_mTLU_lib/hdl/top_extphy_struct.vhd
+1
-2
1 addition, 2 deletions
..._designer/fmc_mTLU/fmc_mTLU_lib/hdl/top_extphy_struct.vhd
with
2 additions
and
2 deletions
firmware/hdl/common/eventFormatter_rtl.vhd
+
1
−
0
View file @
050f5a61
...
...
@@ -181,6 +181,7 @@ BEGIN
ipbus_o
.
ipb_ack
<=
s_ipbus_ack
;
ipbus_o
.
ipb_err
<=
'0'
;
-----------------------------------------------------------------------------
-- IPBUS read
...
...
This diff is collapsed.
Click to expand it.
firmware/hdl_designer/fmc_mTLU/fmc_mTLU_lib/hdl/top_extphy_struct.vhd
+
1
−
2
View file @
050f5a61
...
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment