Skip to content
Snippets Groups Projects
Commit 4efd9ffb authored by Reinier van der Walle's avatar Reinier van der Walle
Browse files

forgot to save changes...

parent ba149c06
Branches
No related tags found
1 merge request!155added ring_rx
...@@ -38,6 +38,7 @@ USE work.ring_pkg.ALL; ...@@ -38,6 +38,7 @@ USE work.ring_pkg.ALL;
ENTITY ring_rx IS ENTITY ring_rx IS
GENERIC ( GENERIC (
g_use_dp_layer : BOOLEAN := TRUE;
g_lane_direction : NATURAL := 1; g_lane_direction : NATURAL := 1;
g_data_w : NATURAL := 64; g_data_w : NATURAL := 64;
g_nof_rx_monitors : NATURAL := 1; g_nof_rx_monitors : NATURAL := 1;
...@@ -76,9 +77,8 @@ END ring_rx; ...@@ -76,9 +77,8 @@ END ring_rx;
ARCHITECTURE str OF ring_rx IS ARCHITECTURE str OF ring_rx IS
CONSTANT c_use_dp_layer : BOOLEAN := TRUE; CONSTANT c_nof_hdr_fields : NATURAL := sel_a_b(g_use_dp_layer, c_ring_dp_nof_hdr_fields, c_ring_eth_nof_hdr_fields);
CONSTANT c_nof_hdr_fields : NATURAL := sel_a_b(c_use_dp_layer, c_ring_dp_nof_hdr_fields, c_ring_eth_nof_hdr_fields); CONSTANT c_hdr_field_arr : t_common_field_arr(c_nof_hdr_fields-1 DOWNTO 0) := sel_a_b(g_use_dp_layer, c_ring_dp_hdr_field_arr, c_ring_eth_hdr_field_arr);
CONSTANT c_hdr_field_arr : t_common_field_arr(c_nof_hdr_fields-1 DOWNTO 0) := sel_a_b(c_use_dp_layer, c_ring_dp_hdr_field_arr, c_ring_eth_hdr_field_arr);
SIGNAL lane_rx_sosi : t_dp_sosi; SIGNAL lane_rx_sosi : t_dp_sosi;
SIGNAL packet_sosi : t_dp_sosi; SIGNAL packet_sosi : t_dp_sosi;
...@@ -153,7 +153,7 @@ BEGIN ...@@ -153,7 +153,7 @@ BEGIN
); );
-- Use dp layer -- Use dp layer
gen_dp_layer : IF c_use_dp_layer GENERATE gen_dp_layer : IF g_use_dp_layer GENERATE
p_set_meta: PROCESS(offload_rx_sosi, hdr_fields_out) p_set_meta: PROCESS(offload_rx_sosi, hdr_fields_out)
BEGIN BEGIN
decoded_sosi <= offload_rx_sosi; decoded_sosi <= offload_rx_sosi;
...@@ -182,7 +182,6 @@ BEGIN ...@@ -182,7 +182,6 @@ BEGIN
reg_miso => reg_dp_block_validate_bsn_at_sync_cipo reg_miso => reg_dp_block_validate_bsn_at_sync_cipo
); );
-- BSN Monitors
-- Convert nof_hops to source RN -- Convert nof_hops to source RN
p_hop_to_src_rn: PROCESS(validated_sosi, this_rn, N_rn) p_hop_to_src_rn: PROCESS(validated_sosi, this_rn, N_rn)
BEGIN BEGIN
...@@ -202,6 +201,7 @@ BEGIN ...@@ -202,6 +201,7 @@ BEGIN
src_out_arr => monitor_sosi_arr src_out_arr => monitor_sosi_arr
); );
-- BSN Monitors
u_mms_dp_bsn_monitor_v2 : ENTITY dp_lib.mms_dp_bsn_monitor_v2 u_mms_dp_bsn_monitor_v2 : ENTITY dp_lib.mms_dp_bsn_monitor_v2
GENERIC MAP ( GENERIC MAP (
g_nof_streams => g_nof_rx_monitors g_nof_streams => g_nof_rx_monitors
...@@ -221,7 +221,7 @@ BEGIN ...@@ -221,7 +221,7 @@ BEGIN
END GENERATE; END GENERATE;
-- Do not use dp layer -- Do not use dp layer
gen_no_dp_layer : IF NOT c_use_dp_layer GENERATE gen_no_dp_layer : IF NOT g_use_dp_layer GENERATE
from_lane_sosi <= offload_rx_sosi; from_lane_sosi <= offload_rx_sosi;
END GENERATE; END GENERATE;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment