Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FMC TDC 1ns 5cha - Gateware
Manage
Activity
Members
Labels
Plan
Issues
1
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
FMC TDC 1ns 5cha - Gateware
Commits
d6596ec5
Commit
d6596ec5
authored
7 years ago
by
Grzegorz Daniluk
Browse files
Options
Downloads
Patches
Plain Diff
svec: use the latest v2.0 vme64x-core release
parent
0109fa2b
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
hdl/ip_cores/vme64x-core
+1
-1
1 addition, 1 deletion
hdl/ip_cores/vme64x-core
hdl/top/svec/wr_svec_tdc.vhd
+2
-10
2 additions, 10 deletions
hdl/top/svec/wr_svec_tdc.vhd
with
3 additions
and
11 deletions
vme64x-core
@
fa34d06e
Subproject commit
2865297786a48cd4792a56f7ba23c93339abd2e1
Subproject commit
fa34d06e35ca0bfad8eac24aa51713e81639da64
This diff is collapsed.
Click to expand it.
hdl/top/svec/wr_svec_tdc.vhd
+
2
−
10
View file @
d6596ec5
...
...
@@ -437,7 +437,6 @@ architecture rtl of wr_svec_tdc is
-- WISHBONE to crossbar slave port
signal
cnx_slave_out
:
t_wishbone_slave_out_array
(
c_NUM_WB_SLAVES
-1
downto
0
);
signal
cnx_slave_in
:
t_wishbone_slave_in_array
(
c_NUM_WB_SLAVES
-1
downto
0
);
signal
vme_wb_out
:
t_wishbone_master_out
;
signal
vme_wb_in
:
t_wishbone_master_in
;
---------------------------------------------------------------------------------------------------
...
...
@@ -582,6 +581,7 @@ begin
g_CLOCK_PERIOD
=>
16
,
g_DECODE_AM
=>
True
,
g_USER_CSR_EXT
=>
False
,
g_WB_GRANULARITY
=>
BYTE
,
g_MANUFACTURER_ID
=>
c_CERN_ID
,
g_BOARD_ID
=>
c_SVEC_ID
,
g_REVISION_ID
=>
c_SVEC_REVISION_ID
,
...
...
@@ -614,20 +614,12 @@ begin
vme_o
.
data_oe_n
=>
vme_data_oe_n_o
,
vme_o
.
addr_dir
=>
vme_addr_dir_int
,
vme_o
.
addr_oe_n
=>
vme_addr_oe_n_o
,
wb_o
=>
vme_wb_out
,
wb_o
=>
cnx_slave_in
(
c_MASTER_VME
)
,
wb_i
=>
vme_wb_in
);
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
vme_berr_o
<=
not
vme_berr_n
;
vme_irq_o
<=
not
vme_irq_n
;
-- Shift address for byte addressing.
cnx_slave_in
(
c_MASTER_VME
)
.
cyc
<=
vme_wb_out
.
cyc
;
cnx_slave_in
(
c_MASTER_VME
)
.
stb
<=
vme_wb_out
.
stb
;
cnx_slave_in
(
c_MASTER_VME
)
.
adr
<=
vme_wb_out
.
adr
(
29
downto
0
)
&
"00"
;
cnx_slave_in
(
c_MASTER_VME
)
.
sel
<=
vme_wb_out
.
sel
;
cnx_slave_in
(
c_MASTER_VME
)
.
we
<=
vme_wb_out
.
we
;
cnx_slave_in
(
c_MASTER_VME
)
.
dat
<=
vme_wb_out
.
dat
;
-- Drive inject also IRQ to the WB interface.
vme_wb_in
.
ack
<=
cnx_slave_out
(
c_MASTER_VME
)
.
ack
;
vme_wb_in
.
err
<=
cnx_slave_out
(
c_MASTER_VME
)
.
err
;
...
...
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