From 189a33bdc3e4ad09e3e6f141d6b0dc95b75d917b Mon Sep 17 00:00:00 2001 From: Michael Boehmer Date: Mon, 31 Jan 2022 15:07:28 +0100 Subject: [PATCH] changed handling of TX_DISABLE --- media_interfaces/med_ecp3_sfp_sync_all_RS.vhd | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/media_interfaces/med_ecp3_sfp_sync_all_RS.vhd b/media_interfaces/med_ecp3_sfp_sync_all_RS.vhd index 69622e0..187e9c4 100644 --- a/media_interfaces/med_ecp3_sfp_sync_all_RS.vhd +++ b/media_interfaces/med_ecp3_sfp_sync_all_RS.vhd @@ -171,22 +171,22 @@ begin -- SFPs are disabled on unused SerDes channels ------------------------------------------------- -- BUG: slave ports need also disable with link_tx_ready(i) - SD_TXDIS_OUT(3) <= DESTROY_LINK_IN(3) or (not SLAVE_ACTIVE_IN) or RESET + SD_TXDIS_OUT(3) <= DESTROY_LINK_IN(3) or (not SLAVE_ACTIVE_IN) --or RESET when IS_MODE(3) = c_IS_MASTER else not link_rx_ready_i(3) when IS_MODE(3) = c_IS_SLAVE else '1' when IS_MODE(3) = c_IS_UNUSED else '0'; - SD_TXDIS_OUT(2) <= DESTROY_LINK_IN(2) or (not SLAVE_ACTIVE_IN) or RESET + SD_TXDIS_OUT(2) <= DESTROY_LINK_IN(2) or (not SLAVE_ACTIVE_IN) --or RESET when IS_MODE(2) = c_IS_MASTER else not link_rx_ready_i(2) when IS_MODE(2) = c_IS_SLAVE else '1' when IS_MODE(2) = c_IS_UNUSED else '0'; - SD_TXDIS_OUT(1) <= DESTROY_LINK_IN(1) or (not SLAVE_ACTIVE_IN) or RESET + SD_TXDIS_OUT(1) <= DESTROY_LINK_IN(1) or (not SLAVE_ACTIVE_IN) --or RESET when IS_MODE(1) = c_IS_MASTER else not link_rx_ready_i(1) when IS_MODE(1) = c_IS_SLAVE else '1' when IS_MODE(1) = c_IS_UNUSED else '0'; - SD_TXDIS_OUT(0) <= DESTROY_LINK_IN(0) or (not SLAVE_ACTIVE_IN) or RESET + SD_TXDIS_OUT(0) <= DESTROY_LINK_IN(0) or (not SLAVE_ACTIVE_IN) --or RESET when IS_MODE(0) = c_IS_MASTER else not link_rx_ready_i(0) when IS_MODE(0) = c_IS_SLAVE else '1' when IS_MODE(0) = c_IS_UNUSED else @@ -200,10 +200,6 @@ begin clk_rx_full(1) when ((quad_mode >= 8) and (IS_MODE(1) = c_IS_SLAVE)) else clk_rx_full(2) when ((quad_mode >= 8) and (IS_MODE(2) = c_IS_SLAVE)) else clk_rx_full(3) when ((quad_mode >= 8) and (IS_MODE(3) = c_IS_SLAVE)) else --- clk_tx_full(0) when ((quad_mode = 1) and (IS_MODE(0) = c_IS_MASTER)) else --- clk_tx_full(1) when ((quad_mode = 1) and (IS_MODE(1) = c_IS_MASTER)) else --- clk_tx_full(2) when ((quad_mode = 1) and (IS_MODE(2) = c_IS_MASTER)) else --- clk_tx_full(3) when ((quad_mode = 1) and (IS_MODE(3) = c_IS_MASTER)) else '0'; ------------------------------------------------- -- 2.43.0