Skip to content

W
White Rabbit core collection
Commit 814e2ab2 authored by Grzegorz Daniluk's avatar Grzegorz Daniluk
Browse files
Options

g_with_dmtd generic from wr_endpoint propagated to xwr_endpoint and wr_core

parent 3ddf7c25
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 68 deletions
modules/wr_endpoint/endpoint_pkg.vhd
View file @ 814e2ab2
...@@ -10,22 +10,23 @@ package endpoint_pkg is ...@@ -10,22 +10,23 @@ package endpoint_pkg is
component wr_endpoint component wr_endpoint
generic ( generic (
g_interface_mode : t_wishbone_interface_mode := CLASSIC; g_interface_mode : t_wishbone_interface_mode := CLASSIC;
g_address_granularity : t_wishbone_address_granularity := WORD; g_address_granularity : t_wishbone_address_granularity := WORD;
g_simulation : boolean := false; g_simulation : boolean := false;
g_tx_force_gap_length : integer := 0; g_tx_force_gap_length : integer := 0;
g_pcs_16bit : boolean := false; g_pcs_16bit : boolean := false;
g_rx_buffer_size : integer := 1024; g_rx_buffer_size : integer := 1024;
g_with_rx_buffer : boolean := true; g_with_rx_buffer : boolean := true;
g_with_flow_control : boolean := true; g_with_flow_control : boolean := true;
g_with_timestamper : boolean := true; g_with_timestamper : boolean := true;
g_with_dpi_classifier : boolean := false; g_with_dpi_classifier : boolean := false;
g_with_vlans : boolean := false; g_with_vlans : boolean := false;
g_with_rtu : boolean := false; g_with_rtu : boolean := false;
g_with_leds : boolean := false); g_with_leds : boolean := false;
g_with_dmtd : boolean := false);
port ( port (
clk_ref_i : in std_logic; clk_ref_i : in std_logic;
clk_sys_i : in std_logic; clk_sys_i : in std_logic;
clk_dmtd_i : in std_logic := '0'; clk_dmtd_i : in std_logic := '0';
rst_n_i : in std_logic; rst_n_i : in std_logic;
pps_csync_p1_i : in std_logic := '0'; pps_csync_p1_i : in std_logic := '0';
phy_rst_o : out std_logic; phy_rst_o : out std_logic;
...@@ -49,7 +50,7 @@ package endpoint_pkg is ...@@ -49,7 +50,7 @@ package endpoint_pkg is
gmii_rx_clk_i : in std_logic := '0'; gmii_rx_clk_i : in std_logic := '0';
gmii_rxd_i : in std_logic_vector(7 downto 0) := x"00"; gmii_rxd_i : in std_logic_vector(7 downto 0) := x"00";
gmii_rx_er_i : in std_logic := '0'; gmii_rx_er_i : in std_logic := '0';
gmii_rx_dv_i : in std_logic := '0'; gmii_rx_dv_i : in std_logic := '0';
src_dat_o : out std_logic_vector(15 downto 0); src_dat_o : out std_logic_vector(15 downto 0);
src_adr_o : out std_logic_vector(1 downto 0); src_adr_o : out std_logic_vector(1 downto 0);
src_sel_o : out std_logic_vector(1 downto 0); src_sel_o : out std_logic_vector(1 downto 0);
...@@ -91,7 +92,7 @@ package endpoint_pkg is ...@@ -91,7 +92,7 @@ package endpoint_pkg is
wb_dat_i : in std_logic_vector(31 downto 0); wb_dat_i : in std_logic_vector(31 downto 0);
wb_dat_o : out std_logic_vector(31 downto 0); wb_dat_o : out std_logic_vector(31 downto 0);
wb_ack_o : out std_logic; wb_ack_o : out std_logic;
wb_stall_o: out std_logic; wb_stall_o : out std_logic;
led_link_o : out std_logic; led_link_o : out std_logic;
led_act_o : out std_logic); led_act_o : out std_logic);
end component; end component;
...@@ -100,21 +101,22 @@ package endpoint_pkg is ...@@ -100,21 +101,22 @@ package endpoint_pkg is
generic ( generic (
g_interface_mode : t_wishbone_interface_mode := CLASSIC; g_interface_mode : t_wishbone_interface_mode := CLASSIC;
g_address_granularity : t_wishbone_address_granularity := WORD; g_address_granularity : t_wishbone_address_granularity := WORD;
g_simulation : boolean := false; g_simulation : boolean := false;
g_pcs_16bit : boolean := false; g_pcs_16bit : boolean := false;
g_tx_force_gap_length : integer := 0; g_tx_force_gap_length : integer := 0;
g_rx_buffer_size : integer := 1024; g_rx_buffer_size : integer := 1024;
g_with_rx_buffer : boolean := true; g_with_rx_buffer : boolean := true;
g_with_flow_control : boolean := true; g_with_flow_control : boolean := true;
g_with_timestamper : boolean := true; g_with_timestamper : boolean := true;
g_with_dpi_classifier : boolean := false; g_with_dpi_classifier : boolean := false;
g_with_vlans : boolean := false; g_with_vlans : boolean := false;
g_with_rtu : boolean := false; g_with_rtu : boolean := false;
g_with_leds : boolean := false); g_with_leds : boolean := false;
g_with_dmtd : boolean := false);
port ( port (
clk_ref_i : in std_logic; clk_ref_i : in std_logic;
clk_sys_i : in std_logic; clk_sys_i : in std_logic;
clk_dmtd_i: in std_logic := '0'; clk_dmtd_i : in std_logic := '0';
rst_n_i : in std_logic; rst_n_i : in std_logic;
pps_csync_p1_i : in std_logic := '0'; pps_csync_p1_i : in std_logic := '0';
phy_rst_o : out std_logic; phy_rst_o : out std_logic;
...@@ -157,8 +159,8 @@ package endpoint_pkg is ...@@ -157,8 +159,8 @@ package endpoint_pkg is
rtu_rq_has_vid_o : out std_logic; rtu_rq_has_vid_o : out std_logic;
rtu_rq_prio_o : out std_logic_vector(3 - 1 downto 0); rtu_rq_prio_o : out std_logic_vector(3 - 1 downto 0);
rtu_rq_has_prio_o : out std_logic; rtu_rq_has_prio_o : out std_logic;
wb_i : in t_wishbone_slave_in; wb_i : in t_wishbone_slave_in;
wb_o : out t_wishbone_slave_out; wb_o : out t_wishbone_slave_out;
led_link_o : out std_logic; led_link_o : out std_logic;
led_act_o : out std_logic); led_act_o : out std_logic);
end component; end component;
......
modules/wr_endpoint/xwr_endpoint.vhd
View file @ 814e2ab2
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- Author : Tomasz Wlostowski -- Author : Tomasz Wlostowski
-- Company : CERN BE-Co-HT -- Company : CERN BE-Co-HT
-- Created : 2010-04-26 -- Created : 2010-04-26
-- Last update: 2012-01-23 -- Last update: 2012-03-07
-- Platform : FPGA-generics -- Platform : FPGA-generics
-- Standard : VHDL -- Standard : VHDL
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
...@@ -31,17 +31,18 @@ entity xwr_endpoint is ...@@ -31,17 +31,18 @@ entity xwr_endpoint is
generic ( generic (
g_interface_mode : t_wishbone_interface_mode := CLASSIC; g_interface_mode : t_wishbone_interface_mode := CLASSIC;
g_address_granularity : t_wishbone_address_granularity := WORD; g_address_granularity : t_wishbone_address_granularity := WORD;
g_simulation : boolean := false; g_simulation : boolean := false;
g_tx_force_gap_length : integer := 0; g_tx_force_gap_length : integer := 0;
g_pcs_16bit : boolean := false; g_pcs_16bit : boolean := false;
g_rx_buffer_size : integer := 1024; g_rx_buffer_size : integer := 1024;
g_with_rx_buffer : boolean := true; g_with_rx_buffer : boolean := true;
g_with_flow_control : boolean := true; g_with_flow_control : boolean := true;
g_with_timestamper : boolean := true; g_with_timestamper : boolean := true;
g_with_dpi_classifier : boolean := true; g_with_dpi_classifier : boolean := true;
g_with_vlans : boolean := true; g_with_vlans : boolean := true;
g_with_rtu : boolean := true; g_with_rtu : boolean := true;
g_with_leds : boolean := true g_with_leds : boolean := true;
g_with_dmtd : boolean := true
); );
port ( port (
...@@ -55,8 +56,8 @@ entity xwr_endpoint is ...@@ -55,8 +56,8 @@ entity xwr_endpoint is
-- reference clock / 2 (62.5 MHz, in-phase with refclk) -- reference clock / 2 (62.5 MHz, in-phase with refclk)
clk_sys_i : in std_logic; clk_sys_i : in std_logic;
clk_dmtd_i: in std_logic; clk_dmtd_i : in std_logic;
-- sync reset (clk_sys_i domain), active LO -- sync reset (clk_sys_i domain), active LO
rst_n_i : in std_logic; rst_n_i : in std_logic;
...@@ -93,21 +94,21 @@ entity xwr_endpoint is ...@@ -93,21 +94,21 @@ entity xwr_endpoint is
gmii_tx_en_o : out std_logic; gmii_tx_en_o : out std_logic;
gmii_tx_er_o : out std_logic; gmii_tx_er_o : out std_logic;
gmii_rx_clk_i : in std_logic := '0'; gmii_rx_clk_i : in std_logic := '0';
gmii_rxd_i : in std_logic_vector(7 downto 0) := x"00"; gmii_rxd_i : in std_logic_vector(7 downto 0) := x"00";
gmii_rx_er_i : in std_logic := '0'; gmii_rx_er_i : in std_logic := '0';
gmii_rx_dv_i : in std_logic := '0'; gmii_rx_dv_i : in std_logic := '0';
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- Wishbone I/O -- Wishbone I/O
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
src_o: out t_wrf_source_out; src_o : out t_wrf_source_out;
src_i: in t_wrf_source_in; src_i : in t_wrf_source_in;
snk_o : out t_wrf_sink_out;
snk_i : in t_wrf_sink_in;
snk_o: out t_wrf_sink_out;
snk_i: in t_wrf_sink_in;
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
-- TX timestamping unit interface -- TX timestamping unit interface
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
...@@ -132,10 +133,10 @@ entity xwr_endpoint is ...@@ -132,10 +133,10 @@ entity xwr_endpoint is
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
-- 1 indicates that coresponding RTU port is full. -- 1 indicates that coresponding RTU port is full.
rtu_full_i : in std_logic:='0'; rtu_full_i : in std_logic := '0';
-- 1 indicates that coresponding RTU port is almost full. -- 1 indicates that coresponding RTU port is almost full.
rtu_almost_full_i : in std_logic:='0'; rtu_almost_full_i : in std_logic := '0';
-- request strobe, single HI pulse begins evaluation of the request. -- request strobe, single HI pulse begins evaluation of the request.
rtu_rq_strobe_p1_o : out std_logic; rtu_rq_strobe_p1_o : out std_logic;
...@@ -161,30 +162,30 @@ entity xwr_endpoint is ...@@ -161,30 +162,30 @@ entity xwr_endpoint is
-- Wishbone bus -- Wishbone bus
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
wb_i: in t_wishbone_slave_in; wb_i : in t_wishbone_slave_in;
wb_o: out t_wishbone_slave_out; wb_o : out t_wishbone_slave_out;
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
-- Misc stuff -- Misc stuff
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
led_link_o: out std_logic; led_link_o : out std_logic;
led_act_o: out std_logic led_act_o : out std_logic
); );
end xwr_endpoint; end xwr_endpoint;
architecture syn of xwr_endpoint is architecture syn of xwr_endpoint is
begin begin
U_Wrapped_Endpoint: wr_endpoint U_Wrapped_Endpoint : wr_endpoint
generic map ( generic map (
g_interface_mode => g_interface_mode, g_interface_mode => g_interface_mode,
g_address_granularity => g_address_granularity, g_address_granularity => g_address_granularity,
g_tx_force_gap_length => g_tx_force_gap_length, g_tx_force_gap_length => g_tx_force_gap_length,
g_simulation => g_simulation, g_simulation => g_simulation,
g_pcs_16bit => g_pcs_16bit, g_pcs_16bit => g_pcs_16bit,
g_rx_buffer_size => g_rx_buffer_size, g_rx_buffer_size => g_rx_buffer_size,
...@@ -194,11 +195,12 @@ begin ...@@ -194,11 +195,12 @@ begin
g_with_dpi_classifier => g_with_dpi_classifier, g_with_dpi_classifier => g_with_dpi_classifier,
g_with_vlans => g_with_vlans, g_with_vlans => g_with_vlans,
g_with_rtu => g_with_rtu, g_with_rtu => g_with_rtu,
g_with_leds => g_with_leds) g_with_leds => g_with_leds,
g_with_dmtd => g_with_dmtd)
port map ( port map (
clk_ref_i => clk_ref_i, clk_ref_i => clk_ref_i,
clk_sys_i => clk_sys_i, clk_sys_i => clk_sys_i,
clk_dmtd_i => clk_dmtd_i, clk_dmtd_i => clk_dmtd_i,
rst_n_i => rst_n_i, rst_n_i => rst_n_i,
pps_csync_p1_i => pps_csync_p1_i, pps_csync_p1_i => pps_csync_p1_i,
phy_rst_o => phy_rst_o, phy_rst_o => phy_rst_o,
...@@ -264,10 +266,10 @@ begin ...@@ -264,10 +266,10 @@ begin
wb_dat_i => wb_i.dat, wb_dat_i => wb_i.dat,
wb_dat_o => wb_o.dat, wb_dat_o => wb_o.dat,
wb_ack_o => wb_o.ack, wb_ack_o => wb_o.ack,
wb_stall_o => wb_o.stall, wb_stall_o => wb_o.stall,
led_link_o => led_link_o, led_link_o => led_link_o,
led_act_o => led_act_o); led_act_o => led_act_o);
end syn; end syn;
modules/wrc_core/wr_core.vhd
View file @ 814e2ab2
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
-- Author : Grzegorz Daniluk -- Author : Grzegorz Daniluk
-- Company : Elproma -- Company : Elproma
-- Created : 2011-02-02 -- Created : 2011-02-02
-- Last update: 2012-02-28 -- Last update: 2012-03-07
-- Platform : FPGA-generics -- Platform : FPGA-generics
-- Standard : VHDL -- Standard : VHDL
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
...@@ -471,7 +471,8 @@ begin ...@@ -471,7 +471,8 @@ begin
g_with_dpi_classifier => true, g_with_dpi_classifier => true,
g_with_vlans => false, g_with_vlans => false,
g_with_rtu => false, g_with_rtu => false,
g_with_leds => false) g_with_leds => false,
g_with_dmtd => true)
port map ( port map (
clk_ref_i => clk_ref_i, clk_ref_i => clk_ref_i,
clk_sys_i => clk_sys_i, clk_sys_i => clk_sys_i,
......
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