]> jspc29.x-matter.uni-frankfurt.de Git - trbnet.git/commitdiff
*** empty log message ***
authorhadeshyp <hadeshyp>
Wed, 10 Oct 2012 11:17:16 +0000 (11:17 +0000)
committerhadeshyp <hadeshyp>
Wed, 10 Oct 2012 11:17:16 +0000 (11:17 +0000)
gbe2_ecp3/trb_net16_gbe_transmit_control.vhd
trb_net16_hub_streaming_port_sctrl_cts.vhd

index 307c9ecdab2b87c31568a2f26fb8df549a912bec..fbdb2309af8191e53bc10fa7ecb0361af31d0399 100644 (file)
@@ -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";
        
index 0e0e30a64db4e8e0f62000964a9a6fb6aca3f562..a7967ed485dd37971b256f368d376e883abf23ff 100644 (file)
@@ -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;