]> jspc29.x-matter.uni-frankfurt.de Git - trbnet.git/commitdiff
*** empty log message ***
authorhadeshyp <hadeshyp>
Thu, 15 Nov 2012 12:00:29 +0000 (12:00 +0000)
committerhadeshyp <hadeshyp>
Thu, 15 Nov 2012 12:00:29 +0000 (12:00 +0000)
gbe2_ecp3/trb_net16_gbe_transmit_control.vhd

index cb82ce925baa389cecbdc93703571ee199b8a39a..a39fc5e9690d8229e394c4cf495abf9fab3b1cb9 100644 (file)
@@ -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";