Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC TDC 1ns 5cha - Gateware
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
FMC TDC 1ns 5cha - Gateware
Commits
d6596ec5
Commit
d6596ec5
authored
Dec 18, 2017
by
Grzegorz Daniluk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
svec: use the latest v2.0 vme64x-core release
parent
0109fa2b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
11 deletions
+3
-11
vme64x-core
hdl/ip_cores/vme64x-core
+1
-1
wr_svec_tdc.vhd
hdl/top/svec/wr_svec_tdc.vhd
+2
-10
No files found.
vme64x-core
@
fa34d06e
Subproject commit
2865297786a48cd4792a56f7ba23c93339abd2e1
Subproject commit
fa34d06e35ca0bfad8eac24aa51713e81639da64
hdl/top/svec/wr_svec_tdc.vhd
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment