Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VME64x core
Manage
Activity
Members
Labels
Plan
Issues
0
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
VME64x core
Commits
0b143861
Commit
0b143861
authored
4 years ago
by
Tristan Gingold
Browse files
Options
Downloads
Plain Diff
Merge branch 'dab64x_shared_vme' into 'master'
Dab64x shared vme See merge request
!4
parents
b25fbe11
2f199fec
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!4
Dab64x shared vme
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hdl/rtl/vme_bus.vhd
+6
-4
6 additions, 4 deletions
hdl/rtl/vme_bus.vhd
hdl/rtl/xvme64x_core.vhd
+2
-1
2 additions, 1 deletion
hdl/rtl/xvme64x_core.vhd
with
8 additions
and
5 deletions
hdl/rtl/vme_bus.vhd
+
6
−
4
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
...
...
This diff is collapsed.
Click to expand it.
hdl/rtl/xvme64x_core.vhd
+
2
−
1
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
);
...
...
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