From: hadeshyp <hadeshyp>
Date: Wed, 10 Oct 2012 11:17:16 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: oldGBE~31
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=cf582329cf0bac7863e020377afc1a64af6534c2;p=trbnet.git

*** empty log message ***
---

diff --git a/gbe2_ecp3/trb_net16_gbe_transmit_control.vhd b/gbe2_ecp3/trb_net16_gbe_transmit_control.vhd
index 307c9ec..fbdb230 100644
--- a/gbe2_ecp3/trb_net16_gbe_transmit_control.vhd
+++ b/gbe2_ecp3/trb_net16_gbe_transmit_control.vhd
@@ -209,12 +209,12 @@ begin
 	FC_FLAGS_OFFSET_OUT  <= PC_FLAGS_OFFSET_IN;
 	FC_IDENT_OUT         <= sent_packets_ctr;
 
-	DEST_MAC_ADDRESS_OUT <= x"ffffffffffff"; --IC_DEST_MAC_ADDRESS_IN;
-	DEST_IP_ADDRESS_OUT  <= x"ff00a8c0";     --IC_DEST_IP_ADDRESS_IN;
-	DEST_UDP_PORT_OUT    <= x"1111"; --IC_DEST_UDP_PORT_IN;
+	DEST_MAC_ADDRESS_OUT <= IC_DEST_MAC_ADDRESS_IN;
+	DEST_IP_ADDRESS_OUT  <= IC_DEST_IP_ADDRESS_IN;
+	DEST_UDP_PORT_OUT    <= IC_DEST_UDP_PORT_IN;
 	SRC_MAC_ADDRESS_OUT  <= g_MY_MAC; --x"0096beef0000"; --IC_SRC_MAC_ADDRESS_IN;
 	SRC_IP_ADDRESS_OUT   <= g_MY_IP; --x"0b00a8c0";     --IC_SRC_IP_ADDRESS_IN;
-	SRC_UDP_PORT_OUT     <= x"1111"; --IC_SRC_UDP_PORT_IN;
+	SRC_UDP_PORT_OUT     <= IC_SRC_UDP_PORT_IN;
 	
 	FC_IP_PROTOCOL_OUT   <= x"11";
 	
diff --git a/trb_net16_hub_streaming_port_sctrl_cts.vhd b/trb_net16_hub_streaming_port_sctrl_cts.vhd
index 0e0e30a..a7967ed 100644
--- a/trb_net16_hub_streaming_port_sctrl_cts.vhd
+++ b/trb_net16_hub_streaming_port_sctrl_cts.vhd
@@ -390,7 +390,7 @@ begin
       external_send_reset_long <= '1';
       external_send_reset_timer <= '1';
     end if;
-    if timer_ticks(0) = '1' or reset_i = '1' then
+    if timer_ticks(0) = '1' then
       external_send_reset_timer <= '0';
       external_send_reset_long  <= external_send_reset_timer;
     end if;