From: hadeshyp <hadeshyp>
Date: Thu, 15 Nov 2012 12:00:29 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: oldGBE~27
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=14a8a08a55a9fc1f509159db7c7006177653a5f4;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 cb82ce9..a39fc5e 100644
--- a/gbe2_ecp3/trb_net16_gbe_transmit_control.vhd
+++ b/gbe2_ecp3/trb_net16_gbe_transmit_control.vhd
@@ -153,19 +153,19 @@ TX_MACHINE : process(tx_current_state, MC_TRANSMIT_CTRL_IN, MC_TRANSMIT_DATA_IN,
 begin
   case tx_current_state is
 
-    when IDLE =>
-      state <= x"1";
-      if (FC_READY_IN = '1') then
-	if (MC_TRANSMIT_CTRL_IN = '1') then
-	  tx_next_state <= TRANSMIT_CTRL;
-	elsif (MC_TRANSMIT_DATA_IN = '1') then
-	  tx_next_state <= TRANSMIT_DATA;
-	else
-	  tx_next_state <= IDLE;
-	end if;
-      else
-	tx_next_state <= IDLE;
-      end if;
+	when IDLE =>
+		state <= x"1";
+		if (FC_READY_IN = '1') then
+			if (MC_TRANSMIT_CTRL_IN = '1') then
+		  		tx_next_state <= TRANSMIT_CTRL;
+			elsif (MC_TRANSMIT_DATA_IN = '1') then
+		  		tx_next_state <= TRANSMIT_DATA;
+			else
+		  		tx_next_state <= IDLE;
+			end if;
+	  	else
+			tx_next_state <= IDLE;
+	  end if;
 
     when TRANSMIT_DATA =>
       state <= x"2";
@@ -212,8 +212,8 @@ begin
 	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_MAC_ADDRESS_OUT  <= IC_SRC_MAC_ADDRESS_IN;
+	SRC_IP_ADDRESS_OUT   <= IC_SRC_IP_ADDRESS_IN;
 	SRC_UDP_PORT_OUT     <= IC_SRC_UDP_PORT_IN;
 	
 	FC_IP_PROTOCOL_OUT   <= x"11";