Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit core collection
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
30
Issues
30
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Schedules
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
White Rabbit core collection
Commits
099e58a1
Commit
099e58a1
authored
May 31, 2017
by
Grzegorz Daniluk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename signals needed for absolute calibration
parent
306ef2bb
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
43 additions
and
35 deletions
+43
-35
wr_board_pkg.vhd
board/common/wr_board_pkg.vhd
+2
-2
xwrc_board_common.vhd
board/common/xwrc_board_common.vhd
+4
-4
wr_spec_pkg.vhd
board/spec/wr_spec_pkg.vhd
+2
-2
wrc_board_spec.vhd
board/spec/wrc_board_spec.vhd
+4
-4
xwrc_board_spec.vhd
board/spec/xwrc_board_spec.vhd
+4
-4
wr_core.vhd
modules/wrc_core/wr_core.vhd
+8
-4
wrcore_pkg.vhd
modules/wrc_core/wrcore_pkg.vhd
+8
-4
xwr_core.vhd
modules/wrc_core/xwr_core.vhd
+5
-4
spec_wr_ref_top.vhd
top/spec_ref_design/spec_wr_ref_top.vhd
+6
-7
No files found.
board/common/wr_board_pkg.vhd
View file @
099e58a1
...
...
@@ -152,8 +152,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
;
abscal_txts_o
:
out
std_logic
;
abscal_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
;
...
...
board/common/xwrc_board_common.vhd
View file @
099e58a1
...
...
@@ -219,8 +219,8 @@ entity xwrc_board_common is
-----------------------------------------
-- Timestamp helper signals, used for Absolute Calibration
-----------------------------------------
txts_o
:
out
std_logic
;
rxts_o
:
out
std_logic
;
abscal_
txts_o
:
out
std_logic
;
abscal_
rxts_o
:
out
std_logic
;
---------------------------------------------------------------------------
-- Pause Frame Control
...
...
@@ -408,8 +408,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
,
abscal_txts_o
=>
abscal_
txts_o
,
abscal_rxts_o
=>
abscal_
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
,
...
...
board/spec/wr_spec_pkg.vhd
View file @
099e58a1
...
...
@@ -97,8 +97,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
;
abscal_txts_o
:
out
std_logic
;
abscal_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
;
...
...
board/spec/wrc_board_spec.vhd
View file @
099e58a1
...
...
@@ -263,8 +263,8 @@ entity wrc_board_spec is
-----------------------------------------
-- Timestamp helper signals, used for Absolute Calibration
-----------------------------------------
txts_o
:
out
std_logic
;
rxts_o
:
out
std_logic
;
abscal_txts_o
:
out
std_logic
;
abscal_rxts_o
:
out
std_logic
;
---------------------------------------------------------------------------
-- Pause Frame Control
...
...
@@ -491,8 +491,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
,
abscal_txts_o
=>
abscal_
txts_o
,
abscal_rxts_o
=>
abscal_
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
,
...
...
board/spec/xwrc_board_spec.vhd
View file @
099e58a1
...
...
@@ -219,8 +219,8 @@ entity xwrc_board_spec is
-----------------------------------------
-- Timestamp helper signals, used for Absolute Calibration
-----------------------------------------
txts_o
:
out
std_logic
;
rxts_o
:
out
std_logic
;
abscal_txts_o
:
out
std_logic
;
abscal_rxts_o
:
out
std_logic
;
---------------------------------------------------------------------------
-- Pause Frame Control
...
...
@@ -502,8 +502,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
,
abscal_txts_o
=>
abscal_
txts_o
,
abscal_rxts_o
=>
abscal_
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
,
...
...
modules/wrc_core/wr_core.vhd
View file @
099e58a1
...
...
@@ -265,8 +265,12 @@ entity wr_core is
txtsu_ts_incorrect_o
:
out
std_logic
;
txtsu_stb_o
:
out
std_logic
;
txtsu_ack_i
:
in
std_logic
:
=
'1'
;
txts_o
:
out
std_logic
;
rxts_o
:
out
std_logic
;
-----------------------------------------
-- Timestamp helper signals, used for Absolute Calibration
-----------------------------------------
abscal_txts_o
:
out
std_logic
;
abscal_rxts_o
:
out
std_logic
;
-----------------------------------------
-- Pause Frame Control
...
...
@@ -778,8 +782,8 @@ begin
wb_i
=>
ep_wb_in
,
wb_o
=>
ep_wb_out
,
rmon_events_o
=>
open
,
txts_o
=>
txts_o
,
rxts_o
=>
rxts_o
,
txts_o
=>
abscal_
txts_o
,
rxts_o
=>
abscal_
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
,
...
...
modules/wrc_core/wrcore_pkg.vhd
View file @
099e58a1
...
...
@@ -445,8 +445,8 @@ package wrcore_pkg is
timestamps_o
:
out
t_txtsu_timestamp
;
timestamps_ack_i
:
in
std_logic
:
=
'1'
;
txts_o
:
out
std_logic
;
rxts_o
:
out
std_logic
;
abscal_txts_o
:
out
std_logic
;
abscal_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"
;
...
...
@@ -663,8 +663,12 @@ package wrcore_pkg is
txtsu_ts_incorrect_o
:
out
std_logic
;
txtsu_stb_o
:
out
std_logic
;
txtsu_ack_i
:
in
std_logic
:
=
'1'
;
txts_o
:
out
std_logic
;
rxts_o
:
out
std_logic
;
-----------------------------------------
-- Timestamp helper signals, used for Absolute Calibration
-----------------------------------------
abscal_txts_o
:
out
std_logic
;
abscal_rxts_o
:
out
std_logic
;
-----------------------------------------
-- Pause Frame Control
...
...
modules/wrc_core/xwr_core.vhd
View file @
099e58a1
...
...
@@ -219,8 +219,8 @@ entity xwr_core is
-----------------------------------------
-- Timestamp helper signals, used for Absolute Calibration
-----------------------------------------
txts_o
:
out
std_logic
;
rxts_o
:
out
std_logic
;
abscal_txts_o
:
out
std_logic
;
abscal_rxts_o
:
out
std_logic
;
-----------------------------------------
-- Pause Frame Control
...
...
@@ -398,8 +398,9 @@ begin
txtsu_ts_incorrect_o
=>
timestamps_o
.
incorrect
,
txtsu_stb_o
=>
timestamps_o
.
stb
,
txtsu_ack_i
=>
timestamps_ack_i
,
txts_o
=>
txts_o
,
rxts_o
=>
rxts_o
,
abscal_txts_o
=>
abscal_txts_o
,
abscal_rxts_o
=>
abscal_rxts_o
,
fc_tx_pause_req_i
=>
fc_tx_pause_req_i
,
fc_tx_pause_delay_i
=>
fc_tx_pause_delay_i
,
...
...
top/spec_ref_design/spec_wr_ref_top.vhd
View file @
099e58a1
...
...
@@ -286,8 +286,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_
abscal_
txts_out
:
std_logic
;
signal
wrc_
abscal_
rxts_out
:
std_logic
;
signal
wrc_pps_out
:
std_logic
;
signal
wrc_pps_led
:
std_logic
;
signal
wrc_pps_in
:
std_logic
;
...
...
@@ -474,8 +474,8 @@ 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
,
abscal_txts_o
=>
wrc_abscal
_txts_out
,
abscal_rxts_o
=>
wrc_abscal
_rxts_out
,
pps_ext_i
=>
wrc_pps_in
,
pps_p_o
=>
wrc_pps_out
,
...
...
@@ -543,9 +543,8 @@ begin -- architecture top
wrc_pps_in
<=
dio_in
(
3
);
dio_out
(
0
)
<=
wrc_pps_out
;
-- dio_out(1) <= clk_ref_div2;
dio_out
(
1
)
<=
wrc_rxts_out
;
dio_out
(
2
)
<=
wrc_txts_out
;
dio_out
(
1
)
<=
wrc_abscal_rxts_out
;
dio_out
(
2
)
<=
wrc_abscal_txts_out
;
-- LEDs
U_Extend_PPS
:
gc_extend_pulse
...
...
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