Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC ADC 100M 14b 4cha
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
FMC ADC 100M 14b 4cha
Commits
a5839b29
Commit
a5839b29
authored
Jan 17, 2020
by
Dimitris Lampridis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[spec] post-Convention cleanup
parent
4f7b5076
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
8 deletions
+15
-8
spec
hdl/ip_cores/spec
+1
-1
spec_ref_fmc_adc_100Ms.vhd
hdl/top/spec_ref_design/spec_ref_fmc_adc_100Ms.vhd
+14
-7
No files found.
spec
@
4feaba67
Subproject commit
531dec9158aa05caa7aa10f91306999a39f3b1ef
Subproject commit
4feaba679fc13458a35066c9a5bfe9b31cb853cd
hdl/top/spec_ref_design/spec_ref_fmc_adc_100Ms.vhd
View file @
a5839b29
...
...
@@ -44,7 +44,6 @@ entity spec_ref_fmc_adc_100Ms is
generic
(
g_SIMULATION
:
integer
:
=
0
;
g_MULTISHOT_RAM_SIZE
:
natural
:
=
2048
;
g_CALIB_SOFT_IP
:
string
:
=
"TRUE"
;
g_WRPC_INITF
:
string
:
=
"../../ip_cores/wr-cores/bin/wrpc/wrc_phy8.bram"
);
port
(
...
...
@@ -246,11 +245,12 @@ architecture arch of spec_ref_fmc_adc_100Ms is
signal
fmc_wb_ddr_out
:
t_wishbone_master_data64_out
;
-- Interrupts and status
signal
ddr_wr_fifo_empty
:
std_logic
;
signal
fmc_irq
:
std_logic
;
signal
fmc_acq_cfg_ok
:
std_logic
;
signal
irq_vector
:
std_logic_vector
(
0
downto
0
);
signal
gn4124_access
:
std_logic
;
signal
ddr_wr_fifo_empty
:
std_logic
;
signal
ddr_wr_fifo_empty_sync
:
std_logic
;
signal
fmc_irq
:
std_logic
;
signal
fmc_acq_cfg_ok
:
std_logic
;
signal
irq_vector
:
std_logic_vector
(
0
downto
0
);
signal
gn4124_access
:
std_logic
;
-- WR PTP core timing interface
signal
tm_link_up
:
std_logic
;
...
...
@@ -444,6 +444,13 @@ begin -- architecture arch
data_i
=>
tm_time_valid
,
synced_o
=>
tm_time_valid_sync
);
cmp_fmc_ddr_wr_fifo_sync
:
gc_sync_ffs
port
map
(
clk_i
=>
clk_ref_125m
,
rst_n_i
=>
'1'
,
data_i
=>
ddr_wr_fifo_empty
,
synced_o
=>
ddr_wr_fifo_empty_sync
);
cmp_fmc_irq_sync
:
gc_sync_ffs
port
map
(
clk_i
=>
clk_sys_62m5
,
...
...
@@ -469,7 +476,7 @@ begin -- architecture arch
wb_ddr_master_i
=>
fmc_wb_ddr_in
,
wb_ddr_master_o
=>
fmc_wb_ddr_out
,
ddr_wr_fifo_empty_i
=>
ddr_wr_fifo_empty
,
ddr_wr_fifo_empty_i
=>
ddr_wr_fifo_empty
_sync
,
trig_irq_o
=>
open
,
acq_end_irq_o
=>
open
,
eic_irq_o
=>
fmc_irq
,
...
...
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