Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
V
VME64x core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
VME64x core
Commits
b5d758c9
Commit
b5d758c9
authored
Nov 27, 2017
by
Tristan Gingold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce a little bit more the number of warnings.
parent
8aaa3368
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
dlamprid-vme64x_review.org
doc/review-2017-11-13/dlamprid-vme64x_review.org
+1
-1
vme_bus.vhd
hdl/rtl/vme_bus.vhd
+4
-4
vme_funct_match.vhd
hdl/rtl/vme_funct_match.vhd
+3
-3
xvme64x_core.vhd
hdl/rtl/xvme64x_core.vhd
+2
-2
No files found.
doc/review-2017-11-13/dlamprid-vme64x_review.org
View file @
b5d758c9
...
...
@@ -28,7 +28,7 @@
** VME64xCore_top.vhd
- Add generic/constant for number of supported functions and use it to limit size of ader/adem
arrays etc, in order to reduce number of warnings in ISE (from ~450 to ~50)
Ok
.
Done
.
- gc_sync_register: does it even make sense? Slide #95 of NASA radiation tolerant design presentation:
https://indico.cern.ch/event/663761/contributions/2710422/attachments/1537821/2410163/Berg_SynchronousDesign_2017.pdf
No problem, discussion about width postponed.
...
...
hdl/rtl/vme_bus.vhd
View file @
b5d758c9
...
...
@@ -112,8 +112,8 @@ entity vme_bus is
wb_stall_i
:
in
std_logic
;
-- Function decoder
addr_decoder_i
:
in
std_logic_vector
(
31
downto
0
);
addr_decoder_o
:
out
std_logic_vector
(
31
downto
0
);
addr_decoder_i
:
in
std_logic_vector
(
31
downto
1
);
addr_decoder_o
:
out
std_logic_vector
(
31
downto
1
);
decode_start_o
:
out
std_logic
;
decode_done_i
:
in
std_logic
;
am_o
:
out
std_logic_vector
(
5
downto
0
);
...
...
@@ -427,7 +427,7 @@ begin
-- card_sel = '1' it means WB application addressed
s_card_sel
<=
'1'
;
-- Keep only the local part of the address.
s_vme_addr_reg
<=
addr_decoder_i
(
31
downto
1
)
;
s_vme_addr_reg
<=
addr_decoder_i
;
if
VME_DS_n_i
=
"11"
then
s_mainFSMstate
<=
WAIT_FOR_DS
;
...
...
@@ -755,7 +755,7 @@ begin
wb_dat_o
<=
s_locDataIn
(
31
downto
0
);
-- Function Decoder
addr_decoder_o
<=
s_vme_addr_reg
&
'0'
;
addr_decoder_o
<=
s_vme_addr_reg
;
am_o
<=
s_AMlatched
;
-- CR/CSR In/Out
...
...
hdl/rtl/vme_funct_match.vhd
View file @
b5d758c9
...
...
@@ -47,9 +47,9 @@ entity vme_funct_match is
rst_n_i
:
in
std_logic
;
-- Input address (to be decoded).
addr_i
:
in
std_logic_vector
(
31
downto
0
);
addr_i
:
in
std_logic_vector
(
31
downto
1
);
-- Sub-address of the function (the part not masked by adem).
addr_o
:
out
std_logic_vector
(
31
downto
0
);
addr_o
:
out
std_logic_vector
(
31
downto
1
);
decode_start_i
:
in
std_logic
;
am_i
:
in
std_logic_vector
(
5
downto
0
);
...
...
@@ -115,7 +115,7 @@ begin
-- Address output latch
------------------------------------------------------------------------------
process
(
clk_i
)
is
variable
mask
:
std_logic_vector
(
31
downto
0
);
variable
mask
:
std_logic_vector
(
31
downto
1
);
begin
if
rising_edge
(
clk_i
)
then
if
rst_n_i
=
'0'
or
s_decode_start_1
=
'0'
then
...
...
hdl/rtl/xvme64x_core.vhd
View file @
b5d758c9
...
...
@@ -237,8 +237,8 @@ architecture rtl of xvme64x_core is
signal
s_user_csr_we
:
std_logic
;
-- Function decoders
signal
s_addr_decoder_i
:
std_logic_vector
(
31
downto
0
);
signal
s_addr_decoder_o
:
std_logic_vector
(
31
downto
0
);
signal
s_addr_decoder_i
:
std_logic_vector
(
31
downto
1
);
signal
s_addr_decoder_o
:
std_logic_vector
(
31
downto
1
);
signal
s_decode_start
:
std_logic
;
signal
s_decode_done
:
std_logic
;
signal
s_decode_sel
:
std_logic
;
...
...
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