From 8bb306f2caffd4e77cce04df77def2687326aa06 Mon Sep 17 00:00:00 2001 From: hadeshyp Date: Thu, 19 Jul 2012 18:32:33 +0000 Subject: [PATCH] *** empty log message *** --- gbe2_ecp3/trb_net16_gbe_frame_receiver.vhd | 2 +- gbe2_ecp3/trb_net16_gbe_main_control.vhd | 2 +- gbe2_ecp3/trb_net16_gbe_response_constructor_SCTRL.vhd | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gbe2_ecp3/trb_net16_gbe_frame_receiver.vhd b/gbe2_ecp3/trb_net16_gbe_frame_receiver.vhd index 7fb7f20..4a2185d 100644 --- a/gbe2_ecp3/trb_net16_gbe_frame_receiver.vhd +++ b/gbe2_ecp3/trb_net16_gbe_frame_receiver.vhd @@ -169,7 +169,7 @@ begin state <= x"3"; if (remove_ctr = x"03") then -- counter starts with a delay that's why only 3 -- destination MAC address filtering here - if (saved_dest_mac = g_MY_MAC) then --or (saved_dest_mac = x"ffffffffffff") then + if (saved_dest_mac = g_MY_MAC) or (saved_dest_mac = x"ffffffffffff") then -- must accept broadcasts for ARP filter_next_state <= REMOVE_SRC; else filter_next_state <= DECIDE; diff --git a/gbe2_ecp3/trb_net16_gbe_main_control.vhd b/gbe2_ecp3/trb_net16_gbe_main_control.vhd index b3fda9b..ff67794 100644 --- a/gbe2_ecp3/trb_net16_gbe_main_control.vhd +++ b/gbe2_ecp3/trb_net16_gbe_main_control.vhd @@ -551,7 +551,7 @@ begin if (PCS_AN_COMPLETE_IN = '0') then link_next_state <= INACTIVE; else - if (wait_ctr = x"0000_ca00") then + if (wait_ctr = x"1000_ca00") then link_next_state <= GET_ADDRESS; else link_next_state <= WAIT_FOR_BOOT; diff --git a/gbe2_ecp3/trb_net16_gbe_response_constructor_SCTRL.vhd b/gbe2_ecp3/trb_net16_gbe_response_constructor_SCTRL.vhd index 19b366e..f89160a 100644 --- a/gbe2_ecp3/trb_net16_gbe_response_constructor_SCTRL.vhd +++ b/gbe2_ecp3/trb_net16_gbe_response_constructor_SCTRL.vhd @@ -290,7 +290,7 @@ begin if rising_edge(CLK) then if (RESET = '1' or dissect_current_state = IDLE or dissect_current_state = WAIT_FOR_HUB) then tx_loaded_ctr <= (others => '0'); - elsif (dissect_current_state = LOAD_FRAME and TC_RD_EN_IN = '1' and PS_SELECTED_IN = '1') then + elsif (dissect_current_state = LOAD_FRAME and TC_RD_EN_IN = '1' and PS_SELECTED_IN = '1' and (tx_frame_loaded /= g_MAX_FRAME_SIZE)) then tx_loaded_ctr <= tx_loaded_ctr + x"1"; elsif (dissect_current_state = LOAD_ACK and TC_RD_EN_IN = '1' and PS_SELECTED_IN = '1') then tx_loaded_ctr <= tx_loaded_ctr + x"1"; @@ -336,7 +336,7 @@ begin end if; end process FRAME_SIZE_PROC; -TC_UDP_SIZE_OUT <= tx_data_ctr - divide_ctr; +TC_UDP_SIZE_OUT <= tx_data_ctr; TC_FLAGS_OFFSET_OUT(15 downto 14) <= "00"; @@ -519,7 +519,7 @@ begin size_left <= (others => '0'); elsif (dissect_current_state = WAIT_FOR_LOAD) then size_left <= tx_data_ctr; - elsif (dissect_current_state = LOAD_FRAME and TC_RD_EN_IN = '1' and PS_SELECTED_IN = '1') then + elsif (dissect_current_state = LOAD_FRAME and TC_RD_EN_IN = '1' and PS_SELECTED_IN = '1' and (tx_frame_loaded /= g_MAX_FRAME_SIZE)) then size_left <= size_left - x"1"; end if; end if; -- 2.43.0