Skip to content
Snippets Groups Projects
Commit 339a0b60 authored by Pieter Donker's avatar Pieter Donker
Browse files

L2SDP-78, changes after in between review Eric.

parent 7a843253
No related branches found
No related tags found
2 merge requests!28Master,!26Resolve L2SDP-78
...@@ -93,8 +93,6 @@ ARCHITECTURE rtl OF ppsh IS ...@@ -93,8 +93,6 @@ ARCHITECTURE rtl OF ppsh IS
SIGNAL i_capture_cnt : STD_LOGIC_VECTOR(capture_cnt'RANGE) := (OTHERS=>'1'); 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 pps_sys_buf : STD_LOGIC;
SIGNAL i_pps_toggle : STD_LOGIC; SIGNAL i_pps_toggle : STD_LOGIC;
SIGNAL nxt_pps_toggle : STD_LOGIC; SIGNAL nxt_pps_toggle : STD_LOGIC;
...@@ -105,7 +103,6 @@ ARCHITECTURE rtl OF ppsh IS ...@@ -105,7 +103,6 @@ ARCHITECTURE rtl OF ppsh IS
BEGIN BEGIN
capture_cnt <= i_capture_cnt; capture_cnt <= i_capture_cnt;
offset_cnt <= i_offset_cnt;
pps_toggle <= i_pps_toggle; pps_toggle <= i_pps_toggle;
pps_ext_delayed(0) <= pps_ext; -- no input delay support pps_ext_delayed(0) <= pps_ext; -- no input delay support
...@@ -176,7 +173,7 @@ BEGIN ...@@ -176,7 +173,7 @@ BEGIN
in_evt => pps_ext_revt, in_evt => pps_ext_revt,
-- MM -- MM
interval_cnt => i_capture_cnt, 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 -- Output the pps_sys with extra pipelining to ease timing of pps_sys fan out
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
-- |-----------------------------------------------------------------------| -- |-----------------------------------------------------------------------|
-- |edge[31], xxx expected_cnt = [n:0]| 1 -- |edge[31], xxx expected_cnt = [n:0]| 1
-- |-----------------------------------------------------------------------| -- |-----------------------------------------------------------------------|
-- | xxx offset_cnt = [n:0]| 2
-- |-----------------------------------------------------------------------|
-- Info from L2SDP-78 ticket. -- Info from L2SDP-78 ticket.
...@@ -230,7 +232,7 @@ BEGIN ...@@ -230,7 +232,7 @@ BEGIN
out_new => OPEN 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 ( PORT MAP (
in_rst => st_rst, in_rst => st_rst,
in_clk => st_clk, in_clk => st_clk,
......
...@@ -246,14 +246,12 @@ BEGIN ...@@ -246,14 +246,12 @@ BEGIN
-- check if offset_cnt is counting -- check if offset_cnt is counting
IF (NOW > 7500 ms) AND (NOW <= 7500 ms + c_clk_period) THEN 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 IF UNSIGNED(offset_cnt)/=475 THEN
REPORT "PPSH : Unexpected offset count value at 5.5 s." SEVERITY ERROR; REPORT "PPSH : Unexpected offset count value at 5.5 s." SEVERITY ERROR;
END IF; END IF;
END IF; END IF;
IF (NOW > 7700 ms) AND (NOW <= 7700 ms + c_clk_period) THEN 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 IF UNSIGNED(offset_cnt)/=675 THEN
REPORT "PPSH : Unexpected offset count value at 5.5 s." SEVERITY ERROR; REPORT "PPSH : Unexpected offset count value at 5.5 s." SEVERITY ERROR;
END IF; END IF;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment