Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC ADC 100M 14b 4cha - Gateware
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
8
Issues
8
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 ADC 100M 14b 4cha - Gateware
Commits
f98f833b
Commit
f98f833b
authored
Nov 14, 2018
by
Dimitris Lampridis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hdl: expose acq config status bit
parent
1ecef9a7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
2 deletions
+14
-2
fmc_adc_100Ms_core.vhd
hdl/rtl/fmc_adc_100Ms_core.vhd
+5
-0
fmc_adc_100Ms_core_pkg.vhd
hdl/rtl/fmc_adc_100Ms_core_pkg.vhd
+3
-0
fmc_adc_mezzanine.vhd
hdl/rtl/fmc_adc_mezzanine.vhd
+4
-1
fmc_adc_mezzanine_pkg.vhd
hdl/rtl/fmc_adc_mezzanine_pkg.vhd
+2
-1
No files found.
hdl/rtl/fmc_adc_100Ms_core.vhd
View file @
f98f833b
...
...
@@ -60,6 +60,9 @@ entity fmc_adc_100Ms_core is
wb_ddr_master_i
:
in
t_wishbone_master_data64_in
;
wb_ddr_master_o
:
out
t_wishbone_master_data64_out
;
-- Acquisition configuration status flag
acq_cfg_ok_o
:
out
std_logic
;
-- Events output pulses
trigger_p_o
:
out
std_logic
;
acq_start_p_o
:
out
std_logic
;
...
...
@@ -1267,6 +1270,8 @@ begin
end
if
;
end
process
p_acq_cfg_ok
;
acq_cfg_ok_o
<=
acq_config_ok
;
-- FSM transitions
p_acq_fsm_transitions
:
process
(
sys_clk_i
)
begin
...
...
hdl/rtl/fmc_adc_100Ms_core_pkg.vhd
View file @
f98f833b
...
...
@@ -69,6 +69,9 @@ package fmc_adc_100Ms_core_pkg is
wb_ddr_master_i
:
in
t_wishbone_master_data64_in
;
wb_ddr_master_o
:
out
t_wishbone_master_data64_out
;
-- Acquisition configuration status flag
acq_cfg_ok_o
:
out
std_logic
;
-- Events output pulses
trigger_p_o
:
out
std_logic
;
acq_start_p_o
:
out
std_logic
;
...
...
hdl/rtl/fmc_adc_mezzanine.vhd
View file @
f98f833b
...
...
@@ -56,11 +56,12 @@ entity fmc_adc_mezzanine is
wb_ddr_master_i
:
in
t_wishbone_master_data64_in
;
wb_ddr_master_o
:
out
t_wishbone_master_data64_out
;
-- Interrupts
-- Interrupts
and status
ddr_wr_fifo_empty_i
:
in
std_logic
;
trig_irq_o
:
out
std_logic
;
acq_end_irq_o
:
out
std_logic
;
eic_irq_o
:
out
std_logic
;
acq_cfg_ok_o
:
out
std_logic
;
-- FMC interface
ext_trigger_p_i
:
in
std_logic
;
-- External trigger
...
...
@@ -413,6 +414,8 @@ begin
wb_ddr_master_o
=>
wb_ddr_master_o
,
wb_ddr_master_i
=>
wb_ddr_master_i
,
acq_cfg_ok_o
=>
acq_cfg_ok_o
,
trigger_p_o
=>
trigger_p
,
acq_start_p_o
=>
acq_start_p
,
acq_stop_p_o
=>
acq_stop_p
,
...
...
hdl/rtl/fmc_adc_mezzanine_pkg.vhd
View file @
f98f833b
...
...
@@ -61,11 +61,12 @@ package fmc_adc_mezzanine_pkg is
wb_ddr_master_i
:
in
t_wishbone_master_data64_in
;
wb_ddr_master_o
:
out
t_wishbone_master_data64_out
;
-- Interrupt
-- Interrupt
and status
ddr_wr_fifo_empty_i
:
in
std_logic
;
trig_irq_o
:
out
std_logic
;
acq_end_irq_o
:
out
std_logic
;
eic_irq_o
:
out
std_logic
;
acq_cfg_ok_o
:
out
std_logic
;
-- FMC interface
ext_trigger_p_i
:
in
std_logic
;
-- External trigger
...
...
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