From 99cf4030e24dd9736ac4dc88964f55bdd337ad68 Mon Sep 17 00:00:00 2001 From: hadeshyp Date: Fri, 20 Jul 2012 12:13:13 +0000 Subject: [PATCH] *** empty log message *** --- gbe2_ecp3/trb_net16_gbe_buf.vhd | 2 +- gbe2_ecp3/trb_net16_gbe_main_control.vhd | 59 ++++++++++++------------ 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/gbe2_ecp3/trb_net16_gbe_buf.vhd b/gbe2_ecp3/trb_net16_gbe_buf.vhd index 4367934..519e4b0 100755 --- a/gbe2_ecp3/trb_net16_gbe_buf.vhd +++ b/gbe2_ecp3/trb_net16_gbe_buf.vhd @@ -1091,7 +1091,7 @@ port map( PC_WR_EN_IN => pc_wr_en, PC_DATA_IN => pc_data, PC_READY_OUT => pc_ready, - PC_START_OF_SUB_IN => dbg_rd_en, -- pc_sos, CHANGED TO SLOW CONTROL PULSE + PC_START_OF_SUB_IN => pc_sos, --CHANGED TO SLOW CONTROL PULSE PC_END_OF_SUB_IN => pc_eos, -- gk 07.10.10 PC_END_OF_DATA_IN => pc_eod, PC_TRANSMIT_ON_OUT => pc_transmit_on, diff --git a/gbe2_ecp3/trb_net16_gbe_main_control.vhd b/gbe2_ecp3/trb_net16_gbe_main_control.vhd index ff67794..d5cfea5 100644 --- a/gbe2_ecp3/trb_net16_gbe_main_control.vhd +++ b/gbe2_ecp3/trb_net16_gbe_main_control.vhd @@ -436,36 +436,35 @@ FLOW_MACHINE : process(flow_current_state, PC_TRANSMIT_ON_IN, PC_SOD_IN, TC_TRAN begin case flow_current_state is - when IDLE => - state <= x"1"; - --if (RC_FRAME_WAITING_IN = '1') and (PC_TRANSMIT_ON_IN = '0') then - if (ps_response_ready = '1') and (PC_TRANSMIT_ON_IN = '0') then - flow_next_state <= TRANSMIT_CTRL; - elsif (PC_SOD_IN = '1') then -- pottential loss of frames - flow_next_state <= TRANSMIT_DATA; - else - flow_next_state <= IDLE; - end if; - - when TRANSMIT_DATA => - state <= x"2"; - if (TC_TRANSMIT_DONE_IN = '1') then - flow_next_state <= CLEANUP; - else - flow_next_state <= TRANSMIT_DATA; - end if; - - when TRANSMIT_CTRL => - state <= x"3"; - if (TC_TRANSMIT_DONE_IN = '1') then - flow_next_state <= CLEANUP; - else - flow_next_state <= TRANSMIT_CTRL; - end if; - - when CLEANUP => - state <= x"4"; - flow_next_state <= IDLE; + when IDLE => + state <= x"1"; + if (ps_response_ready = '1') and (PC_TRANSMIT_ON_IN = '0') then + flow_next_state <= TRANSMIT_CTRL; + elsif (PC_SOD_IN = '1') then -- pottential loss of frames + flow_next_state <= TRANSMIT_DATA; + else + flow_next_state <= IDLE; + end if; + + when TRANSMIT_DATA => + state <= x"2"; + if (TC_TRANSMIT_DONE_IN = '1') then + flow_next_state <= CLEANUP; + else + flow_next_state <= TRANSMIT_DATA; + end if; + + when TRANSMIT_CTRL => + state <= x"3"; + if (TC_TRANSMIT_DONE_IN = '1') then + flow_next_state <= CLEANUP; + else + flow_next_state <= TRANSMIT_CTRL; + end if; + + when CLEANUP => + state <= x"4"; + flow_next_state <= IDLE; end case; end process FLOW_MACHINE; -- 2.43.0