Skip to content

F
FMC ADC 100M 14b 4cha
Commit 80d19aca authored by Dimitris Lampridis's avatar Dimitris Lampridis
Browse files
Options

[hdl] replace all local instances of gc_sync_ffs with gc_sync

parent 32ecce51
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 105 deletions
general-cores @ f9c55e8c
Subproject commit a96c884969da8540c0ea81d6c46aaff722a064ae Subproject commit f9c55e8cb1fb38554479d2d4cee7597b36dd5ce4
hdl/rtl/fmc_adc_100Ms_core.vhd
View file @ 80d19aca
...@@ -186,7 +186,7 @@ architecture rtl of fmc_adc_100Ms_core is ...@@ -186,7 +186,7 @@ architecture rtl of fmc_adc_100Ms_core is
signal ext_trig_delay : std_logic_vector(31 downto 0); signal ext_trig_delay : std_logic_vector(31 downto 0);
signal ext_trig_delay_cnt : unsigned(31 downto 0); signal ext_trig_delay_cnt : unsigned(31 downto 0);
signal ext_trig_delay_bsy : std_logic; signal ext_trig_delay_bsy : std_logic;
signal ext_trig_en : std_logic; signal ext_trig_en, ext_trig_sync : std_logic;
signal ext_trig_fixed_delay : std_logic_vector(g_TRIG_DELAY_EXT+2 downto 0); signal ext_trig_fixed_delay : std_logic_vector(g_TRIG_DELAY_EXT+2 downto 0);
signal ext_trig_p, ext_trig_n : std_logic; signal ext_trig_p, ext_trig_n : std_logic;
signal ext_trig_pol : std_logic; signal ext_trig_pol : std_logic;
...@@ -209,10 +209,11 @@ architecture rtl of fmc_adc_100Ms_core is ...@@ -209,10 +209,11 @@ architecture rtl of fmc_adc_100Ms_core is
signal sw_trig_fixed_delay : std_logic_vector(g_TRIG_DELAY_SW+2 downto 0); signal sw_trig_fixed_delay : std_logic_vector(g_TRIG_DELAY_SW+2 downto 0);
signal sw_trig_in : std_logic := '0'; signal sw_trig_in : std_logic := '0';
signal sw_trig_sync_ack : std_logic := '0'; signal sw_trig_sync_ack : std_logic := '0';
signal time_trig : std_logic; signal time_trig, time_trig_sync : std_logic;
signal time_trig_en : std_logic; signal time_trig_en : std_logic;
signal time_trig_fixed_delay : std_logic_vector(g_TRIG_DELAY_SW+2 downto 0); signal time_trig_fixed_delay : std_logic_vector(g_TRIG_DELAY_SW+2 downto 0);
signal aux_time_trig : std_logic; signal aux_time_trig : std_logic;
signal aux_time_trig_sync : std_logic;
signal aux_time_trig_fixed_delay : std_logic_vector(g_TRIG_DELAY_SW+2 downto 0); signal aux_time_trig_fixed_delay : std_logic_vector(g_TRIG_DELAY_SW+2 downto 0);
signal trig : std_logic; signal trig : std_logic;
signal trig_align : std_logic_vector(8 downto 0); signal trig_align : std_logic_vector(8 downto 0);
...@@ -392,12 +393,12 @@ begin ...@@ -392,12 +393,12 @@ begin
-- Resets -- Resets
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
cmp_sys_rst_fs_resync : gc_sync_ffs cmp_sys_rst_fs_resync : gc_sync
port map ( port map (
clk_i => fs_clk, clk_i => fs_clk,
rst_n_i => '1', rst_n_a_i => '1',
data_i => sys_rst_n_i, d_i => sys_rst_n_i,
synced_o => fs_rst_n); q_o => fs_rst_n);
serdes_arst <= not fs_rst_n; serdes_arst <= not fs_rst_n;
...@@ -433,12 +434,12 @@ begin ...@@ -433,12 +434,12 @@ begin
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- ADC SerDes -- ADC SerDes
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
cmp_man_bitslip_sync : gc_sync_ffs cmp_man_bitslip_sync : gc_sync
port map ( port map (
clk_i => fs_clk, clk_i => fs_clk,
rst_n_i => '1', rst_n_a_i => '1',
data_i => serdes_man_bitslip, d_i => serdes_man_bitslip,
synced_o => serdes_man_bitslip_sync); q_o => serdes_man_bitslip_sync);
cmp_adc_serdes : entity work.ltc2174_2l16b_receiver cmp_adc_serdes : entity work.ltc2174_2l16b_receiver
generic map ( generic map (
...@@ -458,12 +459,12 @@ begin ...@@ -458,12 +459,12 @@ begin
adc_data_o => serdes_out_data, adc_data_o => serdes_out_data,
adc_clk_o => fs_clk); adc_clk_o => fs_clk);
cmp_serdes_synced_sync : gc_sync_ffs cmp_serdes_synced_sync : gc_sync
port map ( port map (
clk_i => sys_clk_i, clk_i => sys_clk_i,
rst_n_i => '1', rst_n_a_i => '1',
data_i => serdes_synced, d_i => serdes_synced,
synced_o => serdes_synced_sync); q_o => serdes_synced_sync);
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- ADC core control and status registers (CSR) -- ADC core control and status registers (CSR)
...@@ -553,26 +554,26 @@ begin ...@@ -553,26 +554,26 @@ begin
end if; end if;
end process p_delay_gpio_ssr; end process p_delay_gpio_ssr;
cmp_ext_trig_en_sync : gc_sync_ffs cmp_ext_trig_en_sync : gc_sync
port map ( port map (
clk_i => fs_clk, clk_i => fs_clk,
rst_n_i => '1', rst_n_a_i => '1',
data_i => csr_regout.trig_en_ext, d_i => csr_regout.trig_en_ext,
synced_o => ext_trig_en); q_o => ext_trig_en);
cmp_ext_trig_pol_sync : gc_sync_ffs cmp_ext_trig_pol_sync : gc_sync
port map ( port map (
clk_i => fs_clk, clk_i => fs_clk,
rst_n_i => '1', rst_n_a_i => '1',
data_i => csr_regout.trig_pol_ext, d_i => csr_regout.trig_pol_ext,
synced_o => ext_trig_pol); q_o => ext_trig_pol);
cmp_time_trig_en_sync : gc_sync_ffs cmp_time_trig_en_sync : gc_sync
port map ( port map (
clk_i => fs_clk, clk_i => fs_clk,
rst_n_i => '1', rst_n_a_i => '1',
data_i => csr_regout.trig_en_time, d_i => csr_regout.trig_en_time,
synced_o => time_trig_en); q_o => time_trig_en);
cmp_downsample_sync : gc_sync_word_wr cmp_downsample_sync : gc_sync_word_wr
generic map ( generic map (
...@@ -612,19 +613,19 @@ begin ...@@ -612,19 +613,19 @@ begin
gen_ch_reg_sync : for I in 1 to 4 generate gen_ch_reg_sync : for I in 1 to 4 generate
cmp_int_trig_en_sync : gc_sync_ffs cmp_int_trig_en_sync : gc_sync
port map ( port map (
clk_i => fs_clk, clk_i => fs_clk,
rst_n_i => '1', rst_n_a_i => '1',
data_i => int_trig_en_in(I), d_i => int_trig_en_in(I),
synced_o => int_trig_en(I)); q_o => int_trig_en(I));
cmp_int_trig_pol_sync : gc_sync_ffs cmp_int_trig_pol_sync : gc_sync
port map ( port map (
clk_i => fs_clk, clk_i => fs_clk,
rst_n_i => '1', rst_n_a_i => '1',
data_i => int_trig_pol_in(I), d_i => int_trig_pol_in(I),
synced_o => int_trig_pol(I)); q_o => int_trig_pol(I));
cmp_ch_trig_thres_sync : gc_sync_word_wr cmp_ch_trig_thres_sync : gc_sync_word_wr
generic map ( generic map (
...@@ -741,14 +742,26 @@ begin ...@@ -741,14 +742,26 @@ begin
); );
-- External hardware trigger synchronization -- External hardware trigger synchronization
cmp_ext_trig_sync : gc_sync_ffs cmp_ext_trig_sync : gc_sync
port map ( port map (
clk_i => fs_clk, clk_i => fs_clk,
rst_n_i => '1', rst_n_a_i => '1',
data_i => ext_trig_a, d_i => ext_trig_a,
synced_o => open, q_o => ext_trig_sync);
npulse_o => ext_trig_n,
ppulse_o => ext_trig_p); cmp_ext_trig_negedge : gc_negedge
port map (
clk_i => fs_clk,
rst_n_i => '1',
data_i => ext_trig_sync,
pulse_o => ext_trig_n);
cmp_ext_trig_posedge : gc_posedge
port map (
clk_i => fs_clk,
rst_n_i => '1',
data_i => ext_trig_sync,
pulse_o => ext_trig_p);
-- select external trigger pulse polarity -- select external trigger pulse polarity
with ext_trig_pol select with ext_trig_pol select
...@@ -803,23 +816,33 @@ begin ...@@ -803,23 +816,33 @@ begin
end process p_ext_trig_delay; end process p_ext_trig_delay;
-- Time trigger synchronization (from 125MHz timetag core) -- Time trigger synchronization (from 125MHz timetag core)
cmp_time_trig_sync : gc_sync_ffs cmp_time_trig_sync : gc_sync
port map (
clk_i => fs_clk,
rst_n_a_i => '1',
d_i => time_trig_i,
q_o => time_trig_sync);
cmp_time_trig_posedge : gc_posedge
port map ( port map (
clk_i => fs_clk, clk_i => fs_clk,
rst_n_i => '1', rst_n_i => '1',
data_i => time_trig_i, data_i => time_trig_sync,
synced_o => open, pulse_o => time_trig);
npulse_o => open,
ppulse_o => time_trig); cmp_aux_time_trig_sync : gc_sync
port map (
cmp_aux_time_trig_sync : gc_sync_ffs clk_i => fs_clk,
rst_n_a_i => '1',
d_i => aux_time_trig_i,
q_o => aux_time_trig_sync);
cmp_aux_time_trig_posedge : gc_posedge
port map ( port map (
clk_i => fs_clk, clk_i => fs_clk,
rst_n_i => '1', rst_n_i => '1',
data_i => aux_time_trig_i, data_i => aux_time_trig_sync,
synced_o => open, pulse_o => aux_time_trig);
npulse_o => open,
ppulse_o => aux_time_trig);
-- Internal hardware trigger -- Internal hardware trigger
g_int_trig : for I in 1 to 4 generate g_int_trig : for I in 1 to 4 generate
......
hdl/top/spec_ref_design/spec_ref_fmc_adc_100Ms.vhd
View file @ 80d19aca
...@@ -437,26 +437,26 @@ begin -- architecture arch ...@@ -437,26 +437,26 @@ begin -- architecture arch
master_i => cnx_fmc_sync_master_in, master_i => cnx_fmc_sync_master_in,
master_o => cnx_fmc_sync_master_out); master_o => cnx_fmc_sync_master_out);
cmp_tm_time_valid_sync : gc_sync_ffs cmp_tm_time_valid_sync : gc_sync
port map ( port map (
clk_i => clk_ref_125m, clk_i => clk_ref_125m,
rst_n_i => '1', rst_n_a_i => '1',
data_i => tm_time_valid, d_i => tm_time_valid,
synced_o => tm_time_valid_sync); q_o => tm_time_valid_sync);
cmp_fmc_ddr_wr_fifo_sync : gc_sync_ffs cmp_fmc_ddr_wr_fifo_sync : gc_sync
port map ( port map (
clk_i => clk_ref_125m, clk_i => clk_ref_125m,
rst_n_i => '1', rst_n_a_i => '1',
data_i => ddr_wr_fifo_empty, d_i => ddr_wr_fifo_empty,
synced_o => ddr_wr_fifo_empty_sync); q_o => ddr_wr_fifo_empty_sync);
cmp_fmc_irq_sync : gc_sync_ffs cmp_fmc_irq_sync : gc_sync
port map ( port map (
clk_i => clk_sys_62m5, clk_i => clk_sys_62m5,
rst_n_i => '1', rst_n_a_i => '1',
data_i => fmc_irq, d_i => fmc_irq,
synced_o => irq_vector(0)); q_o => irq_vector(0));
cmp_fmc_adc_mezzanine : fmc_adc_mezzanine cmp_fmc_adc_mezzanine : fmc_adc_mezzanine
generic map ( generic map (
......
hdl/top/svec_ref_design/svec_ref_fmc_adc_100Ms.vhd
View file @ 80d19aca
...@@ -504,12 +504,12 @@ begin -- architecture arch ...@@ -504,12 +504,12 @@ begin -- architecture arch
-- Mezzanine 1-wire master -- Mezzanine 1-wire master
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
cmp_tm_time_valid_sync : gc_sync_ffs cmp_tm_time_valid_sync : gc_sync
port map ( port map (
clk_i => clk_ref_125m, clk_i => clk_ref_125m,
rst_n_i => '1', rst_n_a_i => '1',
data_i => tm_time_valid, d_i => tm_time_valid,
synced_o => tm_time_valid_sync); q_o => tm_time_valid_sync);
gen_fmc_mezzanine : for I in 0 to g_NB_FMC_SLOTS - 1 generate gen_fmc_mezzanine : for I in 0 to g_NB_FMC_SLOTS - 1 generate
...@@ -527,19 +527,19 @@ begin -- architecture arch ...@@ -527,19 +527,19 @@ begin -- architecture arch
master_i => cnx_fmc_sync_master_in(I), master_i => cnx_fmc_sync_master_in(I),
master_o => cnx_fmc_sync_master_out(I)); master_o => cnx_fmc_sync_master_out(I));
cmp_fmc_ddr_wr_fifo_sync : gc_sync_ffs cmp_fmc_ddr_wr_fifo_sync : gc_sync
port map ( port map (
clk_i => clk_ref_125m, clk_i => clk_ref_125m,
rst_n_i => '1', rst_n_a_i => '1',
data_i => ddr_wr_fifo_empty(I), d_i => ddr_wr_fifo_empty(I),
synced_o => ddr_wr_fifo_empty_sync(I)); q_o => ddr_wr_fifo_empty_sync(I));
cmp_fmc_irq_sync : gc_sync_ffs cmp_fmc_irq_sync : gc_sync
port map ( port map (
clk_i => clk_sys_62m5, clk_i => clk_sys_62m5,
rst_n_i => '1', rst_n_a_i => '1',
data_i => fmc_irq(I), d_i => fmc_irq(I),
synced_o => irq_vector(I)); q_o => irq_vector(I));
cmp_fmc_adc_mezzanine : fmc_adc_mezzanine cmp_fmc_adc_mezzanine : fmc_adc_mezzanine
generic map ( generic map (
...@@ -637,19 +637,19 @@ begin -- architecture arch ...@@ -637,19 +637,19 @@ begin -- architecture arch
gen_fmc_led : for I in 0 to g_NB_FMC_SLOTS - 1 generate gen_fmc_led : for I in 0 to g_NB_FMC_SLOTS - 1 generate
cmp_fmc_cfg_ok_sync : gc_sync_ffs cmp_fmc_cfg_ok_sync : gc_sync
port map ( port map (
clk_i => clk_sys_62m5, clk_i => clk_sys_62m5,
rst_n_i => '1', rst_n_a_i => '1',
data_i => fmc_acq_cfg_ok(I), d_i => fmc_acq_cfg_ok(I),
synced_o => fmc_acq_cfg_ok_sync(I)); q_o => fmc_acq_cfg_ok_sync(I));
cmp_fmc_trig_sync : gc_sync_ffs cmp_fmc_trig_sync : gc_sync
port map ( port map (
clk_i => clk_sys_62m5, clk_i => clk_sys_62m5,
rst_n_i => '1', rst_n_a_i => '1',
data_i => fmc_acq_trig(I), d_i => fmc_acq_trig(I),
synced_o => fmc_acq_trig_sync(I)); q_o => fmc_acq_trig_sync(I));
p_fmc_acq_led: process (fmc_acq_cfg_ok_sync) is p_fmc_acq_led: process (fmc_acq_cfg_ok_sync) is
begin begin
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment