*** empty log message ***

diff --git a/gbe2_ecp3/trb_net16_gbe_main_control.vhd b/gbe2_ecp3/trb_net16_gbe_main_control.vhd
index d5cfea52a452c628f3de4aff3dcfd91053e6043a..6fd5f3c0c79a227b7bf96c28831c62d6919d8adb 100644 (file)
--- a/gbe2_ecp3/trb_net16_gbe_main_control.vhd
+++ b/gbe2_ecp3/trb_net16_gbe_main_control.vhd
@@ -550,7 +550,7 @@ begin
                        if (PCS_AN_COMPLETE_IN = '0') then
                                link_next_state <= INACTIVE;
                        else
-                               if (wait_ctr = x"1000_ca00") then
+                               if (wait_ctr = x"0010_0000") then
                                        link_next_state <= GET_ADDRESS;
                                else
                                        link_next_state <= WAIT_FOR_BOOT;

diff --git a/gbe2_ecp3/trb_net16_gbe_protocol_selector.vhd b/gbe2_ecp3/trb_net16_gbe_protocol_selector.vhd
index 91534a7c1a5e2dbcc2f57c348cd170a57da23390..eed843981f7c65e541f33b219144f470eab7ff52 100644 (file)
--- a/gbe2_ecp3/trb_net16_gbe_protocol_selector.vhd
+++ b/gbe2_ecp3/trb_net16_gbe_protocol_selector.vhd
@@ -363,18 +363,6 @@ port map (
        DEBUG_OUT               => PROTOS_DEBUG_OUT(4 * 32 - 1 downto 3 * 32)
 );
 
-
---GSC_INIT_DATAREADY_OUT <= gsc_init_dataready;
---GSC_INIT_DATA_OUT <= gsc_init_data;
---GSC_INIT_PACKET_NUM_OUT <= gsc_init_packet_num;
---gsc_init_read <= GSC_INIT_READ_IN;
---gsc_reply_dataready <= GSC_REPLY_DATAREADY_IN;
---gsc_reply_data <= GSC_REPLY_DATA_IN;
---gsc_reply_packet_num <= GSC_REPLY_PACKET_NUM_IN;
---GSC_REPLY_READ_OUT <= gsc_reply_read;
---gsc_busy <= GSC_BUSY_IN;
-
-
 --stat_gen : if g_SIMULATE = 0 generate
 Stat : trb_net16_gbe_response_constructor_Stat
 generic map( STAT_ADDRESS_BASE => 10

diff --git a/gbe2_ecp3/trb_net16_gbe_response_constructor_DHCP.vhd b/gbe2_ecp3/trb_net16_gbe_response_constructor_DHCP.vhd
index aba6ad4b9650c03811877dda201929cf332b7e48..5690a3649e3dba829d86e5a940a06c064a91cebf 100644 (file)
--- a/gbe2_ecp3/trb_net16_gbe_response_constructor_DHCP.vhd
+++ b/gbe2_ecp3/trb_net16_gbe_response_constructor_DHCP.vhd
@@ -209,7 +209,7 @@ begin
                        state2 <= x"3"; 
                        if (receive_current_state = SAVE_VALUES) and (PS_DATA_IN(8) = '1') then
                                main_next_state <= SENDING_REQUEST;
-                       elsif (wait_ctr = x"ffff_ffff") then
+                       elsif (wait_ctr = x"1000_0000") then
                                main_next_state <= BOOTING;
                        else
                                main_next_state <= WAITING_FOR_OFFER;
@@ -227,7 +227,7 @@ begin
                        state2 <= x"5";
                        if (receive_current_state = SAVE_VALUES) and (PS_DATA_IN(8) = '1') then
                                main_next_state <= ESTABLISHED;
-                       elsif (wait_ctr = x"ffff_ffff") then
+                       elsif (wait_ctr = x"1000_0000") then
                                main_next_state <= BOOTING;
                        else
                                main_next_state <= WAITING_FOR_ACK;