From: hadeshyp Date: Tue, 5 Oct 2010 16:01:36 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: oldGBE~163 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=d15a60173e97703121085375ce6a302f6b19bbbb;p=trbnet.git *** empty log message *** --- diff --git a/media_interfaces/trb_net16_med_ecp_fot_4_ctc.vhd b/media_interfaces/trb_net16_med_ecp_fot_4_ctc.vhd index 3ff5163..8d818f3 100644 --- a/media_interfaces/trb_net16_med_ecp_fot_4_ctc.vhd +++ b/media_interfaces/trb_net16_med_ecp_fot_4_ctc.vhd @@ -581,6 +581,7 @@ gen_tx: for i in 0 to 3 generate RESET_IN => tx_lane_reset, TX_DATA_IN => MED_DATA_IN(i*16+15 downto i*16), + TX_PACKET_NUMBER_IN => MED_PACKET_NUM_IN(i*3+2 downto i*3), TX_WRITE_IN => MED_DATAREADY_IN(i), TX_READ_OUT => MED_READ_OUT(i), diff --git a/media_interfaces/trb_net16_rx_checker.vhd b/media_interfaces/trb_net16_rx_checker.vhd index 034411f..759014d 100644 --- a/media_interfaces/trb_net16_rx_checker.vhd +++ b/media_interfaces/trb_net16_rx_checker.vhd @@ -15,6 +15,7 @@ port( PKT_TOC_IN : in std_logic; -- full packet RX timeout RX_IC_IN : in std_logic; -- illegal comma or CodeViolation on RX STX_FND_IN : in std_logic; -- StartOfTransmission found on RX + STX_TOC_IN : in std_logic; -- timeout waiting for StartOfTransmission PKT_IN_TRANS_IN : in std_logic; -- paket in transmission to media interface -- control signals FIFO_RST_OUT : out std_logic; -- clear RX FIFO @@ -106,6 +107,8 @@ begin if( STX_FND_IN = '1' ) then next_state <= DONE; resume_x <= '1'; + elsif STX_TOC_IN = '1' then + next_state <= RX_FAIL; else next_state <= WAIT_STX; fifo_rst_x <= '1';