forwarded timestamp helper signals to DIO-card outputs.

txts -> dio_p/n_o[2] (= Lemo 3) rxts -> dio_p/n_o[1] (= Lemo 2; formerly used for 62.5 MHz RefClk)

forwarded timestamp helper signals to DIO-card outputs.
txts -> dio_p/n_o[2] (= Lemo 3) rxts -> dio_p/n_o[1] (= Lemo 2; formerly used for 62.5 MHz RefClk)
b741a658 · Peter Jansweijer · ab166bcc · b741a658 · b741a658 · b741a658
Commit b741a658 authored May 19, 2017 by Peter Jansweijer
6 changed files
--- a/board/common/wr_board_pkg.vhd
+++ b/board/common/wr_board_pkg.vhd
@@ -148,6 +148,8 @@ package wr_board_pkg is
      tm_clk_aux_locked_o  : out std_logic_vector(g_aux_clks-1 downto 0);
      timestamps_o         : out t_txtsu_timestamp;
      timestamps_ack_i     : in  std_logic                                        := '1';
+      txts_o               : out std_logic;
+      rxts_o               : out std_logic;
      fc_tx_pause_req_i    : in  std_logic                                        := '0';
      fc_tx_pause_delay_i  : in  std_logic_vector(15 downto 0)                    := x"0000";
      fc_tx_pause_ready_o  : out std_logic;

--- a/board/common/xwrc_board_common.vhd
+++ b/board/common/xwrc_board_common.vhd
@@ -214,6 +214,12 @@ entity xwrc_board_common is
    timestamps_o     : out t_txtsu_timestamp;
    timestamps_ack_i : in  std_logic := '1';

+    -----------------------------------------
+    -- Timestamp helper signals, used for Absolute Calibration
+    -----------------------------------------
+    txts_o               : out std_logic;
+    rxts_o               : out std_logic;
+
    ---------------------------------------------------------------------------
    -- Pause Frame Control
    ---------------------------------------------------------------------------
@@ -397,6 +403,8 @@ begin  -- architecture struct
      wrf_snk_i            => wrf_snk_in,
      timestamps_o         => timestamps_o,
      timestamps_ack_i     => timestamps_ack_i,
+      txts_o               => txts_o,
+      rxts_o               => rxts_o,
      fc_tx_pause_req_i    => fc_tx_pause_req_i,
      fc_tx_pause_delay_i  => fc_tx_pause_delay_i,
      fc_tx_pause_ready_o  => fc_tx_pause_ready_o,

--- a/board/spec/wr_spec_pkg.vhd
+++ b/board/spec/wr_spec_pkg.vhd
@@ -92,6 +92,8 @@ package wr_spec_pkg is
      tm_clk_aux_locked_o  : out std_logic_vector(g_aux_clks-1 downto 0);
      timestamps_o         : out t_txtsu_timestamp;
      timestamps_ack_i     : in  std_logic                                        := '1';
+      txts_o               : out std_logic;
+      rxts_o               : out std_logic;
      fc_tx_pause_req_i    : in  std_logic                                        := '0';
      fc_tx_pause_delay_i  : in  std_logic_vector(15 downto 0)                    := x"0000";
      fc_tx_pause_ready_o  : out std_logic;

--- a/board/spec/wrc_board_spec.vhd
+++ b/board/spec/wrc_board_spec.vhd
@@ -248,6 +248,12 @@ entity wrc_board_spec is
    tstamps_incorrect_o : out std_logic;
    tstamps_ack_i       : in  std_logic := '1';

+    -----------------------------------------
+    -- Timestamp helper signals, used for Absolute Calibration
+    -----------------------------------------
+    txts_o               : out std_logic;
+    rxts_o               : out std_logic;
+
    ---------------------------------------------------------------------------
    -- Pause Frame Control
    ---------------------------------------------------------------------------
@@ -454,6 +460,8 @@ begin  -- architecture struct
      tm_clk_aux_locked_o  => tm_clk_aux_locked_o,
      timestamps_o         => timestamps_out,
      timestamps_ack_i     => tstamps_ack_i,
+      txts_o               => txts_o,
+      rxts_o               => rxts_o,
      fc_tx_pause_req_i    => fc_tx_pause_req_i,
      fc_tx_pause_delay_i  => fc_tx_pause_delay_i,
      fc_tx_pause_ready_o  => fc_tx_pause_ready_o,

--- a/board/spec/xwrc_board_spec.vhd
+++ b/board/spec/xwrc_board_spec.vhd
@@ -211,6 +211,12 @@ entity xwrc_board_spec is
    timestamps_o     : out t_txtsu_timestamp;
    timestamps_ack_i : in  std_logic := '1';

+    -----------------------------------------
+    -- Timestamp helper signals, used for Absolute Calibration
+    -----------------------------------------
+    txts_o               : out std_logic;
+    rxts_o               : out std_logic;
+
    ---------------------------------------------------------------------------
    -- Pause Frame Control
    ---------------------------------------------------------------------------
@@ -475,6 +481,8 @@ begin  -- architecture struct
      tm_clk_aux_locked_o  => tm_clk_aux_locked_o,
      timestamps_o         => timestamps_o,
      timestamps_ack_i     => timestamps_ack_i,
+      txts_o               => txts_o,
+      rxts_o               => rxts_o,
      fc_tx_pause_req_i    => fc_tx_pause_req_i,
      fc_tx_pause_delay_i  => fc_tx_pause_delay_i,
      fc_tx_pause_ready_o  => fc_tx_pause_ready_o,

--- a/top/spec_ref_design/spec_wr_ref_top.vhd
+++ b/top/spec_ref_design/spec_wr_ref_top.vhd
@@ -280,6 +280,8 @@ architecture top of spec_wr_ref_top is
  signal onewire_oe   : std_logic;

  -- LEDs and GPIO
+  signal wrc_txts_out : std_logic;
+  signal wrc_rxts_out : std_logic;
  signal wrc_pps_out : std_logic;
  signal wrc_pps_led : std_logic;
  signal wrc_pps_in  : std_logic;
@@ -472,6 +474,9 @@ begin  -- architecture top

      wb_eth_master_o     => cnx_master_out(c_WB_MASTER_ETHBONE),
      wb_eth_master_i     => cnx_master_in(c_WB_MASTER_ETHBONE),
+      
+      txts_o              => wrc_txts_out,
+      rxts_o              => wrc_rxts_out,

      pps_ext_i           => wrc_pps_in,
      pps_p_o             => wrc_pps_out,
@@ -539,7 +544,9 @@ begin  -- architecture top

  wrc_pps_in    <= dio_in(3);
  dio_out(0)    <= wrc_pps_out;
-  dio_out(1)    <= clk_ref_div2;
+--  dio_out(1)    <= clk_ref_div2;
+  dio_out(1)    <= wrc_rxts_out;
+  dio_out(2)    <= wrc_txts_out;

  -- LEDs
  U_Extend_PPS : gc_extend_pulse