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
0b143861
Commit
0b143861
authored
Dec 07, 2020
by
Tristan Gingold
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dab64x_shared_vme' into 'master'
Dab64x shared vme See merge request
!4
parents
b25fbe11
2f199fec
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
vme_bus.vhd
hdl/rtl/vme_bus.vhd
+6
-4
xvme64x_core.vhd
hdl/rtl/xvme64x_core.vhd
+2
-1
No files found.
hdl/rtl/vme_bus.vhd
View file @
0b143861
...
...
@@ -110,7 +110,10 @@ entity vme_bus is
int_level_i
:
in
std_logic_vector
(
2
downto
0
);
int_vector_i
:
in
std_logic_vector
(
7
downto
0
);
irq_pending_i
:
in
std_logic
;
irq_ack_o
:
out
std_logic
irq_ack_o
:
out
std_logic
;
--Card selection
card_sel_o
:
out
std_logic
);
end
vme_bus
;
...
...
@@ -140,7 +143,6 @@ architecture rtl of vme_bus is
signal
vme_odff_retry_n
:
std_logic
;
signal
vme_odff_retry_oe
:
std_logic
;
signal
vme_xam
:
std_logic_vector
(
7
downto
0
);
signal
vme_cycles
:
unsigned
(
7
downto
0
);
-- If set, dtack is controled directly from ds.
...
...
@@ -725,8 +727,6 @@ begin
vme_idff_lword_n
<=
vme_lword_n_i
;
vme_idff_data
<=
vme_data_i
;
vme_xam
<=
addr_reg
(
7
downto
0
);
load_addr_reg_phase2
<=
'1'
;
s_wb_start
<=
'1'
;
...
...
@@ -1182,6 +1182,8 @@ begin
vme_retry_oe_o
<=
vme_odff_retry_oe
;
vme_dtack_oe_o
<=
vme_odff_dtack_oe
;
card_sel_o
<=
s_card_sel
;
process
(
vme_odff_dtack_n
,
vme_nsync_ds_n_i
,
vme_dtack_async_ctrl
)
begin
...
...
hdl/rtl/xvme64x_core.vhd
View file @
0b143861
...
...
@@ -388,7 +388,8 @@ begin
int_level_i
=>
s_irq_level
,
int_vector_i
=>
s_irq_vector
,
irq_pending_i
=>
s_irq_pending
,
irq_ack_o
=>
s_irq_ack
);
irq_ack_o
=>
s_irq_ack
,
card_sel_o
=>
open
);
s_reset_n
<=
rst_n_i
and
s_vme_rst_n
;
rst_n_o
<=
s_reset_n
and
(
not
s_module_reset
);
...
...
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