From: Peter Lemmens Date: Thu, 26 Jun 2014 14:12:36 +0000 (+0200) Subject: Minor bug fix in soda_client reply. Error detection added to reply-handler. Debugging X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=dbdff4a1f09f0fe2dd087bb97f14d7e5bc442467;p=soda.git Minor bug fix in soda_client reply. Error detection added to reply-handler. Debugging multilayer trbnet not stable! --- diff --git a/code/med_ecp3_sfp_4_sync_down.vhd b/code/med_ecp3_sfp_4_sync_down.vhd index 02eb39e..d19f4cb 100644 --- a/code/med_ecp3_sfp_4_sync_down.vhd +++ b/code/med_ecp3_sfp_4_sync_down.vhd @@ -344,8 +344,9 @@ THE_SERDES : entity work.serdes_4_sync_downstream -- combined quad reset -- ------------------------- --rst_down_quad <= '1' when (rst_qd(0)='1' or rst_qd(1)='1' or rst_qd(2)='1' or rst_qd(3)='1') else '0'; -rst_down_quad <= RESET; -serdes_rst_down_quad <= '1' when (serdes_rst_qd(0)='1' or serdes_rst_qd(1)='1' or serdes_rst_qd(2)='1' or serdes_rst_qd(3)='1') else '0'; +rst_down_quad <= RESET; -- PL: 18/06/14 +--serdes_rst_down_quad <= '1' when (serdes_rst_qd(0)='1' or serdes_rst_qd(1)='1' or serdes_rst_qd(2)='1' or serdes_rst_qd(3)='1') else '0'; +serdes_rst_down_quad <= '0'; -- PL: 23/06/14 generated_logic : for i in 0 to 3 generate diff --git a/code/soda_hub.vhd b/code/soda_hub.vhd index e4ad825..4f6b442 100644 --- a/code/soda_hub.vhd +++ b/code/soda_hub.vhd @@ -115,11 +115,11 @@ begin CLEAR => '0', CLK_EN => CLK_EN, --Internal Connection - LINK_PHASE_IN => UPLINK_PHASE_IN, - START_OF_SUPERBURST => start_of_superburst_S, - SUPER_BURST_NR_IN => super_burst_nr_S, + LINK_PHASE_IN => UPLINK_PHASE_IN, + START_OF_SUPERBURST => start_of_superburst_S, + SUPER_BURST_NR_IN => super_burst_nr_S, SODA_CMD_STROBE_IN => soda_cmd_valid_S, - SODA_CMD_WORD_IN => soda_cmd_word_S, + SODA_CMD_WORD_IN => soda_cmd_word_S, TX_DLM_PREVIEW_OUT => TXUP_DLM_PREVIEW_OUT, TX_DLM_OUT => txup_dlm_out_S, --TX_DLM_OUT, TX_DLM_WORD_OUT => TXUP_DLM_WORD_OUT diff --git a/code/soda_reply_pkt_builder.vhd b/code/soda_reply_pkt_builder.vhd index 9a20245..89dd571 100644 --- a/code/soda_reply_pkt_builder.vhd +++ b/code/soda_reply_pkt_builder.vhd @@ -68,7 +68,7 @@ reply_fsm_proc : process(SODACLK) if (LINK_PHASE_IN = c_PHASE_H) then packet_state_S <= c_CMD1; TX_DLM_OUT <= '1'; - TX_DLM_WORD_OUT <= SODA_CMD_WORD_IN(7 downto 0); + TX_DLM_WORD_OUT <= '1' & SODA_CMD_WORD_IN(30 downto 24); else packet_state_S <= c_WAIT4CMD1; TX_DLM_OUT <= '0'; @@ -78,7 +78,7 @@ reply_fsm_proc : process(SODACLK) packet_state_S <= c_BST1; soda_dlm_preview_S <= '1'; TX_DLM_OUT <= '1'; - TX_DLM_WORD_OUT <= '1' & SUPER_BURST_NR_IN(30 downto 24); + TX_DLM_WORD_OUT <= SUPER_BURST_NR_IN(7 downto 0); when c_BST1 => packet_state_S <= c_BST2; TX_DLM_OUT <= '0'; diff --git a/soda_client_probe.rvl b/soda_client_probe.rvl index 21c9def..b2226d8 100644 --- a/soda_client_probe.rvl +++ b/soda_client_probe.rvl @@ -1,10 +1,10 @@ - + - + - + @@ -114,6 +114,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -121,11 +175,13 @@ + + diff --git a/soda_hub_probe.rvl b/soda_hub_probe.rvl index dd7e9b5..3b86699 100644 --- a/soda_hub_probe.rvl +++ b/soda_hub_probe.rvl @@ -1,7 +1,7 @@ - + - + @@ -50,6 +50,18 @@ + + + + + + + + + + + + @@ -131,22 +143,6 @@ - - - - - - - - - - - - - - - - @@ -154,15 +150,8 @@ - - - - - - - @@ -194,12 +183,6 @@ - - - - - - @@ -248,10 +231,14 @@ + + + + diff --git a/trb3_soda_client.xcf b/trb3_soda_client.xcf index 2f7c8a6..f87f918 100644 --- a/trb3_soda_client.xcf +++ b/trb3_soda_client.xcf @@ -47,8 +47,8 @@ 1 0 - /local/lemmens/lattice/soda/trb3_periph_sodaclient_20140527.bit - 05/27/14 11:25:29 + /local/lemmens/lattice/soda/trb3_periph_sodaclient_20140623.bit + 06/23/14 18:00:44 Fast Program