diff --git a/generic_ip/third_party_ip/transconfig/transconfig_sim/mentor/msim_setup.tcl b/generic_ip/third_party_ip/transconfig/transconfig_sim/mentor/msim_setup.tcl index d97d914..bd15471 100644 --- a/generic_ip/third_party_ip/transconfig/transconfig_sim/mentor/msim_setup.tcl +++ b/generic_ip/third_party_ip/transconfig/transconfig_sim/mentor/msim_setup.tcl @@ -146,10 +146,10 @@ alias file_copy { # ---------------------------------------- # Create compilation libraries proc ensure_lib { lib } { if ![file isdirectory $lib] { vlib $lib } } -ensure_lib ./libraries/ -ensure_lib ./libraries/work/ -vmap work ./libraries/work/ -vmap work_lib ./libraries/work/ +#ensure_lib ./libraries/ +ensure_lib ./work/ +vmap work ./work/ +#vmap work_lib ./libraries/work/ if ![ string match "*ModelSim ALTERA*" [ vsim -version ] ] { ensure_lib ./libraries/altera_ver/ vmap altera_ver ./libraries/altera_ver/ @@ -180,8 +180,8 @@ if ![ string match "*ModelSim ALTERA*" [ vsim -version ] ] { ensure_lib ./libraries/cyclonev/ vmap cyclonev ./libraries/cyclonev/ } -ensure_lib ./libraries/transconfig/ -vmap transconfig ./libraries/transconfig/ +ensure_lib ./transconfig/ +vmap transconfig ./transconfig/ # ---------------------------------------- # Compile device library files @@ -392,4 +392,4 @@ alias h { echo "USER_DEFINED_VERILOG_COMPILE_OPTIONS -- User-defined verilog compile options, added to com/dev_com aliases." } file_copy -h +#h diff --git a/generic_ip/third_party_ip/xaui_phy_itf/src/xaui_phy_itf_sim/xaui_phy_itf.vhd b/generic_ip/third_party_ip/xaui_phy_itf/src/xaui_phy_itf_sim/xaui_phy_itf.vhd index caee7d6..e7c9992 100644 --- a/generic_ip/third_party_ip/xaui_phy_itf/src/xaui_phy_itf_sim/xaui_phy_itf.vhd +++ b/generic_ip/third_party_ip/xaui_phy_itf/src/xaui_phy_itf_sim/xaui_phy_itf.vhd @@ -1,3 +1,5 @@ +-- megafunction wizard: %XAUI PHY Intel FPGA IP v18.1% +-- GENERATION: XML -- xaui_phy_itf.vhd -- Generated using ACDS version 18.1 625 @@ -11,6 +13,7 @@ entity xaui_phy_itf is pll_ref_clk : in std_logic := '0'; -- pll_ref_clk.clk xgmii_tx_clk : in std_logic := '0'; -- xgmii_tx_clk.clk xgmii_rx_clk : out std_logic; -- xgmii_rx_clk.clk + rx_recovered_clk : out std_logic_vector(3 downto 0); -- rx_recovered_clk.clk xgmii_rx_dc : out std_logic_vector(71 downto 0); -- xgmii_rx_dc.data xgmii_tx_dc : in std_logic_vector(71 downto 0) := (others => '0'); -- xgmii_tx_dc.data xaui_rx_serial_data : in std_logic_vector(3 downto 0) := (others => '0'); -- xaui_rx_serial_data.export @@ -25,6 +28,10 @@ entity xaui_phy_itf is phy_mgmt_write : in std_logic := '0'; -- .write phy_mgmt_writedata : in std_logic_vector(31 downto 0) := (others => '0'); -- .writedata phy_mgmt_waitrequest : out std_logic; -- .waitrequest + rx_channelaligned : out std_logic; -- rx_channelaligned.data + rx_syncstatus : out std_logic_vector(7 downto 0); -- rx_syncstatus.data + rx_disperr : out std_logic_vector(7 downto 0); -- rx_disperr.data + rx_errdetect : out std_logic_vector(7 downto 0); -- rx_errdetect.data reconfig_from_xcvr : out std_logic_vector(229 downto 0); -- reconfig_from_xcvr.data reconfig_to_xcvr : in std_logic_vector(349 downto 0) := (others => '0') -- reconfig_to_xcvr.data ); @@ -67,6 +74,7 @@ architecture rtl of xaui_phy_itf is pll_ref_clk : in std_logic := 'X'; -- clk xgmii_tx_clk : in std_logic := 'X'; -- clk xgmii_rx_clk : out std_logic; -- clk + rx_recovered_clk : out std_logic_vector(3 downto 0); -- clk xgmii_rx_dc : out std_logic_vector(71 downto 0); -- data xgmii_tx_dc : in std_logic_vector(71 downto 0) := (others => 'X'); -- data xaui_rx_serial_data : in std_logic_vector(3 downto 0) := (others => 'X'); -- export @@ -81,16 +89,15 @@ architecture rtl of xaui_phy_itf is phy_mgmt_write : in std_logic := 'X'; -- write phy_mgmt_writedata : in std_logic_vector(31 downto 0) := (others => 'X'); -- writedata phy_mgmt_waitrequest : out std_logic; -- waitrequest + rx_channelaligned : out std_logic; -- data + rx_syncstatus : out std_logic_vector(7 downto 0); -- data + rx_disperr : out std_logic_vector(7 downto 0); -- data + rx_errdetect : out std_logic_vector(7 downto 0); -- data reconfig_from_xcvr : out std_logic_vector(229 downto 0); -- data reconfig_to_xcvr : in std_logic_vector(349 downto 0) := (others => 'X'); -- data - rx_recovered_clk : out std_logic_vector(3 downto 0); -- export tx_clk312_5 : out std_logic; -- export rx_digitalreset : in std_logic := 'X'; -- export tx_digitalreset : in std_logic := 'X'; -- export - rx_channelaligned : out std_logic; -- export - rx_syncstatus : out std_logic_vector(7 downto 0); -- export - rx_disperr : out std_logic_vector(7 downto 0); -- export - rx_errdetect : out std_logic_vector(7 downto 0); -- export rx_analogreset : in std_logic := 'X'; -- export rx_invpolarity : in std_logic_vector(3 downto 0) := (others => 'X'); -- export rx_set_locktodata : in std_logic_vector(3 downto 0) := (others => 'X'); -- export @@ -142,9 +149,9 @@ begin xaui_pll_type => "CMU", BASE_DATA_RATE => "3125 Mbps", en_synce_support => 0, - use_control_and_status_ports => 0, + use_control_and_status_ports => 1, external_pma_ctrl_reconf => 0, - recovered_clk_out => 0, + recovered_clk_out => 1, number_of_interfaces => 1, reconfig_interfaces => 5, use_rx_rate_match => 0, @@ -169,6 +176,7 @@ begin pll_ref_clk => pll_ref_clk, -- pll_ref_clk.clk xgmii_tx_clk => xgmii_tx_clk, -- xgmii_tx_clk.clk xgmii_rx_clk => xgmii_rx_clk, -- xgmii_rx_clk.clk + rx_recovered_clk => rx_recovered_clk, -- rx_recovered_clk.clk xgmii_rx_dc => xgmii_rx_dc, -- xgmii_rx_dc.data xgmii_tx_dc => xgmii_tx_dc, -- xgmii_tx_dc.data xaui_rx_serial_data => xaui_rx_serial_data, -- xaui_rx_serial_data.export @@ -183,16 +191,15 @@ begin phy_mgmt_write => phy_mgmt_write, -- .write phy_mgmt_writedata => phy_mgmt_writedata, -- .writedata phy_mgmt_waitrequest => phy_mgmt_waitrequest, -- .waitrequest + rx_channelaligned => rx_channelaligned, -- rx_channelaligned.data + rx_syncstatus => rx_syncstatus, -- rx_syncstatus.data + rx_disperr => rx_disperr, -- rx_disperr.data + rx_errdetect => rx_errdetect, -- rx_errdetect.data reconfig_from_xcvr => reconfig_from_xcvr, -- reconfig_from_xcvr.data reconfig_to_xcvr => reconfig_to_xcvr, -- reconfig_to_xcvr.data - rx_recovered_clk => open, -- (terminated) tx_clk312_5 => open, -- (terminated) rx_digitalreset => '0', -- (terminated) tx_digitalreset => '0', -- (terminated) - rx_channelaligned => open, -- (terminated) - rx_syncstatus => open, -- (terminated) - rx_disperr => open, -- (terminated) - rx_errdetect => open, -- (terminated) rx_analogreset => '0', -- (terminated) rx_invpolarity => "0000", -- (terminated) rx_set_locktodata => "0000", -- (terminated) @@ -233,3 +240,69 @@ begin ); end architecture rtl; -- of xaui_phy_itf +-- Retrieval info: +-- +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- Retrieval info: +-- IPFS_FILES : xaui_phy_itf.vho +-- RELATED_FILES: xaui_phy_itf.vhd, altera_xcvr_functions.sv, alt_pma_functions.sv, altera_xcvr_xaui.sv, hxaui_csr_h.sv, hxaui_csr.sv, alt_xcvr_mgmt2dec_phyreconfig.sv, alt_xcvr_mgmt2dec_xaui.sv, alt_pma_controller_tgx.v, alt_reset_ctrl_lego.sv, alt_reset_ctrl_tgx_cdrauto.sv, alt_xcvr_resync.sv, alt_xcvr_csr_common_h.sv, alt_xcvr_csr_common.sv, alt_xcvr_csr_pcs8g_h.sv, alt_xcvr_csr_pcs8g.sv, alt_xcvr_csr_selector.sv, alt_xcvr_mgmt2dec.sv, altera_wait_generate.v, altera_xcvr_reset_control.sv, alt_xcvr_reset_counter.sv, alt_soft_xaui_pcs.v, alt_soft_xaui_reset.v, alt_soft_xaui_rx.v, alt_soft_xaui_rx_8b10b_dec.v, alt_soft_xaui_rx_channel_synch.v, alt_soft_xaui_rx_deskew.v, alt_soft_xaui_rx_deskew_channel.v, alt_soft_xaui_rx_deskew_ram.v, altera_soft_xaui_rx_deskew_ram.v, alt_soft_xaui_rx_invalid_code_det.v, alt_soft_xaui_rx_parity.v, alt_soft_xaui_rx_parity_4b.v, alt_soft_xaui_rx_parity_6b.v, alt_soft_xaui_rx_rate_match.v, alt_soft_xaui_rx_rate_match_ram.v, alt_soft_xaui_rx_rl_chk_6g.v, alt_soft_xaui_rx_sm.v, alt_soft_xaui_tx.v, alt_soft_xaui_tx_8b10b_enc.v, alt_soft_xaui_tx_idle_conv.v, l_modules.v, serdes_4_unit_lc_siv.v, serdes_4_unit_siv.v, serdes_4unit.v, altera_std_synchronizer_nocut.v, sxaui.v, cv_xcvr_xaui.sv, av_xcvr_low_latency_phy_nr.sv, sv_reconfig_bundle_to_xcvr.sv, sv_reconfig_bundle_to_ip.sv, sv_reconfig_bundle_merger.sv, av_xcvr_h.sv, av_xcvr_avmm_csr.sv, av_tx_pma_ch.sv, av_tx_pma.sv, av_rx_pma.sv, av_pma.sv, av_pcs_ch.sv, av_pcs.sv, av_xcvr_avmm.sv, av_xcvr_native.sv, av_xcvr_plls.sv, av_xcvr_data_adapter.sv, av_reconfig_bundle_to_basic.sv, av_reconfig_bundle_to_xcvr.sv, av_hssi_8g_rx_pcs_rbc.sv, av_hssi_8g_tx_pcs_rbc.sv, av_hssi_common_pcs_pma_interface_rbc.sv, av_hssi_common_pld_pcs_interface_rbc.sv, av_hssi_pipe_gen1_2_rbc.sv, av_hssi_rx_pcs_pma_interface_rbc.sv, av_hssi_rx_pld_pcs_interface_rbc.sv, av_hssi_tx_pcs_pma_interface_rbc.sv, av_hssi_tx_pld_pcs_interface_rbc.sv, av_xcvr_custom_native.sv, alt_xcvr_arbiter.sv, alt_xcvr_m2s.sv diff --git a/generic_ip/xgbe_oe/0/src/xgbe_oe_0.vhd b/generic_ip/xgbe_oe/0/src/xgbe_oe_0.vhd index 59a08ed..092898d 100644 --- a/generic_ip/xgbe_oe/0/src/xgbe_oe_0.vhd +++ b/generic_ip/xgbe_oe/0/src/xgbe_oe_0.vhd @@ -538,7 +538,7 @@ begin phy_mgmt_waitrequest => open -- TODO ); - transconfig_inst : entity transconfig.transconfig + transconfig_inst : entity work.transconfig port map ( reconfig_busy => open,