Skip to content
Snippets Groups Projects
Commit e4c452df authored by Eric Kooistra's avatar Eric Kooistra
Browse files

Rename ip_altera_mf into ip_stratixiv.

Rename ip_stratixiv_hssi into ip_stratixiv.
parent 2173d7f2
Branches
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ USE IEEE.STD_LOGIC_1164.ALL; ...@@ -27,7 +27,7 @@ USE IEEE.STD_LOGIC_1164.ALL;
PACKAGE tech_transceiver_component_pkg IS PACKAGE tech_transceiver_component_pkg IS
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- stratixiv_hssi -- ip_stratixiv
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
COMPONENT ip_stratixiv_hssi_gx_generic IS COMPONENT ip_stratixiv_hssi_gx_generic IS
...@@ -111,11 +111,7 @@ PACKAGE tech_transceiver_component_pkg IS ...@@ -111,11 +111,7 @@ PACKAGE tech_transceiver_component_pkg IS
END COMPONENT; END COMPONENT;
------------------------------------------------------------------------------ COMPONENT ip_stratixiv_gxb_reconfig_12 IS
-- altera_mf
------------------------------------------------------------------------------
COMPONENT ip_altera_mf_gxb_reconfig_12_stratixiv IS
PORT ( PORT (
reconfig_clk : IN STD_LOGIC ; reconfig_clk : IN STD_LOGIC ;
reconfig_fromgxb : IN STD_LOGIC_VECTOR (203 DOWNTO 0); reconfig_fromgxb : IN STD_LOGIC_VECTOR (203 DOWNTO 0);
...@@ -124,7 +120,7 @@ PACKAGE tech_transceiver_component_pkg IS ...@@ -124,7 +120,7 @@ PACKAGE tech_transceiver_component_pkg IS
); );
END COMPONENT; END COMPONENT;
COMPONENT ip_altera_mf_gxb_reconfig_8_stratixiv IS COMPONENT ip_stratixiv_gxb_reconfig_8 IS
PORT ( PORT (
reconfig_clk : IN STD_LOGIC ; reconfig_clk : IN STD_LOGIC ;
reconfig_fromgxb : IN STD_LOGIC_VECTOR (135 DOWNTO 0); reconfig_fromgxb : IN STD_LOGIC_VECTOR (135 DOWNTO 0);
...@@ -133,7 +129,7 @@ PACKAGE tech_transceiver_component_pkg IS ...@@ -133,7 +129,7 @@ PACKAGE tech_transceiver_component_pkg IS
); );
END COMPONENT; END COMPONENT;
COMPONENT ip_altera_mf_gxb_reconfig_4_stratixiv IS COMPONENT ip_stratixiv_gxb_reconfig_4 IS
PORT ( PORT (
reconfig_clk : IN STD_LOGIC ; reconfig_clk : IN STD_LOGIC ;
reconfig_fromgxb : IN STD_LOGIC_VECTOR (67 DOWNTO 0); reconfig_fromgxb : IN STD_LOGIC_VECTOR (67 DOWNTO 0);
...@@ -142,7 +138,7 @@ PACKAGE tech_transceiver_component_pkg IS ...@@ -142,7 +138,7 @@ PACKAGE tech_transceiver_component_pkg IS
); );
END COMPONENT; END COMPONENT;
COMPONENT ip_altera_mf_gxb_reconfig_2_stratixiv IS COMPONENT ip_stratixiv_gxb_reconfig_2 IS
PORT ( PORT (
reconfig_clk : IN STD_LOGIC ; reconfig_clk : IN STD_LOGIC ;
reconfig_fromgxb : IN STD_LOGIC_VECTOR (33 DOWNTO 0); reconfig_fromgxb : IN STD_LOGIC_VECTOR (33 DOWNTO 0);
......
...@@ -70,7 +70,7 @@ END tech_transceiver_gx; ...@@ -70,7 +70,7 @@ END tech_transceiver_gx;
ARCHITECTURE str OF tech_transceiver_gx IS ARCHITECTURE str OF tech_transceiver_gx IS
BEGIN BEGIN
gen_stratixiv_hssi : IF g_technology=c_tech_stratixiv GENERATE gen_ip_stratixiv : IF g_technology=c_tech_stratixiv GENERATE
u0 : ENTITY work.tech_transceiver_gx_stratix_iv u0 : ENTITY work.tech_transceiver_gx_stratix_iv
GENERIC MAP (g_data_w, g_nof_gx, g_mbps, g_sim, g_tx, g_rx) GENERIC MAP (g_data_w, g_nof_gx, g_mbps, g_sim, g_tx, g_rx)
PORT MAP (cal_rec_clk, tr_clk, rx_clk, rx_rst, rx_sosi_arr, rx_siso_arr, tx_clk, tx_rst, tx_sosi_arr, tx_siso_arr, rx_datain, tx_dataout, tx_state, tx_align_en, rx_state, rx_align_en); PORT MAP (cal_rec_clk, tr_clk, rx_clk, rx_rst, rx_sosi_arr, rx_siso_arr, tx_clk, tx_rst, tx_sosi_arr, tx_siso_arr, rx_datain, tx_dataout, tx_state, tx_align_en, rx_state, rx_align_en);
......
...@@ -28,8 +28,7 @@ USE common_lib.common_pkg.ALL; ...@@ -28,8 +28,7 @@ USE common_lib.common_pkg.ALL;
USE dp_lib.dp_stream_pkg.ALL; USE dp_lib.dp_stream_pkg.ALL;
-- Declare IP libraries to ensure default binding in simulation. The IP library clause is ignored by synthesis. -- Declare IP libraries to ensure default binding in simulation. The IP library clause is ignored by synthesis.
LIBRARY ip_altera_mf_lib; LIBRARY ip_stratixiv_lib;
LIBRARY ip_stratixiv_hssi_lib;
ENTITY tech_transceiver_gx_stratix_iv IS ENTITY tech_transceiver_gx_stratix_iv IS
GENERIC( GENERIC(
...@@ -136,7 +135,7 @@ BEGIN ...@@ -136,7 +135,7 @@ BEGIN
gen_tr : IF g_tx = TRUE AND g_rx = TRUE GENERATE --Generate duplex transceivers gen_tr : IF g_tx = TRUE AND g_rx = TRUE GENERATE --Generate duplex transceivers
gen_32b : IF g_data_w = 32 GENERATE gen_32b : IF g_data_w = 32 GENERATE
u_gx: ENTITY ip_stratixiv_hssi_lib.ip_stratixiv_hssi_gx_generic u_gx: ENTITY ip_stratixiv_lib.ip_stratixiv_hssi_gx_generic
GENERIC MAP ( GENERIC MAP (
g_mbps => g_mbps, g_mbps => g_mbps,
starting_channel_number => i*4 --Starting channel numbers must be 0,4,8,12 etc for individual ALTGX instances starting_channel_number => i*4 --Starting channel numbers must be 0,4,8,12 etc for individual ALTGX instances
...@@ -182,7 +181,7 @@ BEGIN ...@@ -182,7 +181,7 @@ BEGIN
END GENERATE; END GENERATE;
gen_16b : IF g_data_w = 16 GENERATE gen_16b : IF g_data_w = 16 GENERATE
u_gx: ENTITY ip_stratixiv_hssi_lib.ip_stratixiv_hssi_gx_16b u_gx: ENTITY ip_stratixiv_lib.ip_stratixiv_hssi_gx_16b
GENERIC MAP ( GENERIC MAP (
starting_channel_number => i*4 --Starting channel numbers must be 0,4,8,12 etc for individual ALTGX instances starting_channel_number => i*4 --Starting channel numbers must be 0,4,8,12 etc for individual ALTGX instances
) --Reconfig megawizard: regenerate with 'number of channels' = 4*nof_gx ) --Reconfig megawizard: regenerate with 'number of channels' = 4*nof_gx
...@@ -226,7 +225,7 @@ BEGIN ...@@ -226,7 +225,7 @@ BEGIN
gen_rx : IF g_tx = FALSE AND g_rx = TRUE GENERATE --Generate receivers only gen_rx : IF g_tx = FALSE AND g_rx = TRUE GENERATE --Generate receivers only
gen_32b : IF g_data_w = 32 GENERATE gen_32b : IF g_data_w = 32 GENERATE
u_rx: ENTITY ip_stratixiv_hssi_lib.ip_stratixiv_hssi_rx_generic u_rx: ENTITY ip_stratixiv_lib.ip_stratixiv_hssi_rx_generic
GENERIC MAP ( GENERIC MAP (
g_mbps => g_mbps, g_mbps => g_mbps,
starting_channel_number => i*4 --Starting channel numbers must be 0,4,8,12 etc for individual ALTGX instances starting_channel_number => i*4 --Starting channel numbers must be 0,4,8,12 etc for individual ALTGX instances
...@@ -252,7 +251,7 @@ BEGIN ...@@ -252,7 +251,7 @@ BEGIN
END GENERATE; END GENERATE;
gen_16b : IF g_data_w = 16 GENERATE gen_16b : IF g_data_w = 16 GENERATE
u_rx: ENTITY ip_stratixiv_hssi_lib.ip_stratixiv_hssi_rx_16b u_rx: ENTITY ip_stratixiv_lib.ip_stratixiv_hssi_rx_16b
GENERIC MAP ( GENERIC MAP (
starting_channel_number => i*4 --Starting channel numbers must be 0,4,8,12 etc for individual ALTGX instances starting_channel_number => i*4 --Starting channel numbers must be 0,4,8,12 etc for individual ALTGX instances
) --Reconfig megawizard: regenerate with 'number of channels' = 4*nof_gx ) --Reconfig megawizard: regenerate with 'number of channels' = 4*nof_gx
...@@ -290,7 +289,7 @@ BEGIN ...@@ -290,7 +289,7 @@ BEGIN
gen_tx : IF g_tx = TRUE AND g_rx = FALSE GENERATE gen_tx : IF g_tx = TRUE AND g_rx = FALSE GENERATE
gen_32b : IF g_data_w = 32 GENERATE gen_32b : IF g_data_w = 32 GENERATE
u_tx: ENTITY ip_stratixiv_hssi_lib.ip_stratixiv_hssi_tx_generic u_tx: ENTITY ip_stratixiv_lib.ip_stratixiv_hssi_tx_generic
GENERIC MAP ( GENERIC MAP (
g_mbps => g_mbps g_mbps => g_mbps
) )
...@@ -309,7 +308,7 @@ BEGIN ...@@ -309,7 +308,7 @@ BEGIN
END GENERATE; END GENERATE;
gen_16b : IF g_data_w = 16 GENERATE gen_16b : IF g_data_w = 16 GENERATE
u_tx: ENTITY ip_stratixiv_hssi_lib.ip_stratixiv_hssi_tx_16b u_tx: ENTITY ip_stratixiv_lib.ip_stratixiv_hssi_tx_16b
PORT MAP ( PORT MAP (
-- Clocks, in -- Clocks, in
pll_inclk => tr_clk, pll_inclk => tr_clk,
...@@ -488,7 +487,7 @@ BEGIN ...@@ -488,7 +487,7 @@ BEGIN
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
gen_cond_reconfig : IF g_nof_gx = 12 GENERATE gen_cond_reconfig : IF g_nof_gx = 12 GENERATE
u_reconfig : ENTITY ip_altera_mf_lib.ip_altera_mf_gxb_reconfig_12_stratixiv --Create one reconfig module for all ALTGX instances u_reconfig : ENTITY ip_stratixiv_lib.ip_stratixiv_gxb_reconfig_12 --Create one reconfig module for all ALTGX instances
PORT MAP ( PORT MAP (
reconfig_clk => cal_rec_clk, reconfig_clk => cal_rec_clk,
reconfig_fromgxb => reconfig_fromgxb, reconfig_fromgxb => reconfig_fromgxb,
...@@ -498,7 +497,7 @@ BEGIN ...@@ -498,7 +497,7 @@ BEGIN
END GENERATE; END GENERATE;
gen_cond_reconfig_8 : IF g_nof_gx = 8 GENERATE gen_cond_reconfig_8 : IF g_nof_gx = 8 GENERATE
u_reconfig : ENTITY ip_altera_mf_lib.ip_altera_mf_gxb_reconfig_8_stratixiv --Create one reconfig module for all ALTGX instances u_reconfig : ENTITY ip_stratixiv_lib.ip_stratixiv_gxb_reconfig_8 --Create one reconfig module for all ALTGX instances
PORT MAP ( PORT MAP (
reconfig_clk => cal_rec_clk, reconfig_clk => cal_rec_clk,
reconfig_fromgxb => reconfig_fromgxb, reconfig_fromgxb => reconfig_fromgxb,
...@@ -508,7 +507,7 @@ BEGIN ...@@ -508,7 +507,7 @@ BEGIN
END GENERATE; END GENERATE;
gen_cond_reconfig_4 : IF g_nof_gx = 4 GENERATE gen_cond_reconfig_4 : IF g_nof_gx = 4 GENERATE
u_reconfig : ENTITY ip_altera_mf_lib.ip_altera_mf_gxb_reconfig_4_stratixiv --Create one reconfig module for all ALTGX instances u_reconfig : ENTITY ip_stratixiv_lib.ip_stratixiv_gxb_reconfig_4 --Create one reconfig module for all ALTGX instances
PORT MAP ( PORT MAP (
reconfig_clk => cal_rec_clk, reconfig_clk => cal_rec_clk,
reconfig_fromgxb => reconfig_fromgxb, reconfig_fromgxb => reconfig_fromgxb,
...@@ -518,7 +517,7 @@ BEGIN ...@@ -518,7 +517,7 @@ BEGIN
END GENERATE; END GENERATE;
gen_cond_reconfig_sim : IF g_nof_gx = 2 GENERATE gen_cond_reconfig_sim : IF g_nof_gx = 2 GENERATE
u_reconfig_sim : ENTITY ip_altera_mf_lib.ip_altera_mf_gxb_reconfig_2_stratixiv -- The sim version is meant for 2 transceivers u_reconfig_sim : ENTITY ip_stratixiv_lib.ip_stratixiv_gxb_reconfig_2 -- The sim version is meant for 2 transceivers
PORT MAP ( PORT MAP (
reconfig_clk => cal_rec_clk, reconfig_clk => cal_rec_clk,
reconfig_fromgxb => reconfig_fromgxb, reconfig_fromgxb => reconfig_fromgxb,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment