diff --git a/libraries/io/ppsh/src/vhdl/ppsh.vhd b/libraries/io/ppsh/src/vhdl/ppsh.vhd index 40f63e29fc2cc6d20bca552564d741de6367e7d0..eb9dc3991bc07bdc52047bc83ff0b70ca0e0e026 100644 --- a/libraries/io/ppsh/src/vhdl/ppsh.vhd +++ b/libraries/io/ppsh/src/vhdl/ppsh.vhd @@ -93,8 +93,6 @@ ARCHITECTURE rtl OF ppsh IS SIGNAL i_capture_cnt : STD_LOGIC_VECTOR(capture_cnt'RANGE) := (OTHERS=>'1'); - SIGNAL i_offset_cnt : STD_LOGIC_VECTOR(offset_cnt'RANGE) := (OTHERS=>'1'); - SIGNAL pps_sys_buf : STD_LOGIC; SIGNAL i_pps_toggle : STD_LOGIC; SIGNAL nxt_pps_toggle : STD_LOGIC; @@ -105,7 +103,6 @@ ARCHITECTURE rtl OF ppsh IS BEGIN capture_cnt <= i_capture_cnt; - offset_cnt <= i_offset_cnt; pps_toggle <= i_pps_toggle; pps_ext_delayed(0) <= pps_ext; -- no input delay support @@ -176,7 +173,7 @@ BEGIN in_evt => pps_ext_revt, -- MM interval_cnt => i_capture_cnt, - clk_cnt => i_offset_cnt + clk_cnt => offset_cnt ); -- Output the pps_sys with extra pipelining to ease timing of pps_sys fan out diff --git a/libraries/io/ppsh/src/vhdl/ppsh_reg.vhd b/libraries/io/ppsh/src/vhdl/ppsh_reg.vhd index de648f5e9fcafa3076b6fe940639dd4ac756abd7..31789f7f36f640e0344ecb210d18011c69bda76c 100644 --- a/libraries/io/ppsh/src/vhdl/ppsh_reg.vhd +++ b/libraries/io/ppsh/src/vhdl/ppsh_reg.vhd @@ -31,6 +31,8 @@ -- |-----------------------------------------------------------------------| -- |edge[31], xxx expected_cnt = [n:0]| 1 -- |-----------------------------------------------------------------------| +-- | xxx offset_cnt = [n:0]| 2 +-- |-----------------------------------------------------------------------| -- Info from L2SDP-78 ticket. @@ -230,7 +232,7 @@ BEGIN out_new => OPEN ); - u_offset_cnt : ENTITY common_lib.common_reg_cross_domain + u_offset_cnt : ENTITY common_lib.common_reg_cross_domain PORT MAP ( in_rst => st_rst, in_clk => st_clk, diff --git a/libraries/io/ppsh/tb/vhdl/tb_ppsh.vhd b/libraries/io/ppsh/tb/vhdl/tb_ppsh.vhd index c77528573229ab1c1f0a02b4e6eb4f71530351b0..4887a8489d1df8bb0245cf12ddb2f6c75c31dbca 100644 --- a/libraries/io/ppsh/tb/vhdl/tb_ppsh.vhd +++ b/libraries/io/ppsh/tb/vhdl/tb_ppsh.vhd @@ -246,14 +246,12 @@ BEGIN -- check if offset_cnt is counting IF (NOW > 7500 ms) AND (NOW <= 7500 ms + c_clk_period) THEN - --REPORT "PPSH : offset_cnt = " & integer'image(To_integer(unsigned(offset_cnt))) SEVERITY ERROR; IF UNSIGNED(offset_cnt)/=475 THEN REPORT "PPSH : Unexpected offset count value at 5.5 s." SEVERITY ERROR; END IF; END IF; IF (NOW > 7700 ms) AND (NOW <= 7700 ms + c_clk_period) THEN - --REPORT "PPSH : offset_cnt = " & integer'image(To_integer(unsigned(offset_cnt))) SEVERITY ERROR; IF UNSIGNED(offset_cnt)/=675 THEN REPORT "PPSH : Unexpected offset count value at 5.5 s." SEVERITY ERROR; END IF;