From 1174d7e94b2272cba735bda2f5c1adf7fad46fe9 Mon Sep 17 00:00:00 2001 From: hadeshyp Date: Tue, 21 Aug 2012 09:10:16 +0000 Subject: [PATCH] *** empty log message *** --- gbe2_ecp3/trb_net16_gbe_main_control.vhd | 2 +- gbe2_ecp3/trb_net16_gbe_protocol_selector.vhd | 12 ------------ .../trb_net16_gbe_response_constructor_DHCP.vhd | 4 ++-- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/gbe2_ecp3/trb_net16_gbe_main_control.vhd b/gbe2_ecp3/trb_net16_gbe_main_control.vhd index d5cfea5..6fd5f3c 100644 --- 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 91534a7..eed8439 100644 --- 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 aba6ad4..5690a36 100644 --- 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; -- 2.43.0