Skip to content
Snippets Groups Projects
Commit db950540 authored by Kenneth Hiemstra's avatar Kenneth Hiemstra
Browse files

cosmetic

parent fe2782a7
No related branches found
No related tags found
No related merge requests found
...@@ -66,8 +66,9 @@ END tech_10gbase_r_arria10; ...@@ -66,8 +66,9 @@ END tech_10gbase_r_arria10;
ARCHITECTURE str OF tech_10gbase_r_arria10 IS ARCHITECTURE str OF tech_10gbase_r_arria10 IS
--CONSTANT c_nof_channels_per_ip : NATURAL := sel_a_b(g_nof_channels=24, 24, 1); -- only support single 1 or block of 12 -- FIXME check selection of g_nof_channels to be 1,4,12 or 24
--CONSTANT c_nof_channels_per_ip : NATURAL := sel_a_b(g_nof_channels=24, 24, 1); -- only support single 1 or block of 12
--CONSTANT c_nof_channels_per_ip : NATURAL := 24 WHEN g_nof_channels=24 ELSE 12 WHEN g_nof_channels=12 ELSE 1; --CONSTANT c_nof_channels_per_ip : NATURAL := 24 WHEN g_nof_channels=24 ELSE 12 WHEN g_nof_channels=12 ELSE 1;
CONSTANT c_nof_channels_per_ip : NATURAL := g_nof_channels; CONSTANT c_nof_channels_per_ip : NATURAL := g_nof_channels;
...@@ -134,6 +135,7 @@ BEGIN ...@@ -134,6 +135,7 @@ BEGIN
xgmii_rx_dc_arr(I) <= func_xgmii_dc(rx_parallel_data_arr(I), rx_control_arr(I)); xgmii_rx_dc_arr(I) <= func_xgmii_dc(rx_parallel_data_arr(I), rx_control_arr(I));
END GENERATE; END GENERATE;
gen_phy_1 : IF c_nof_channels_per_ip=1 GENERATE gen_phy_1 : IF c_nof_channels_per_ip=1 GENERATE
gen_channels : FOR I IN 0 TO g_nof_channels-1 GENERATE gen_channels : FOR I IN 0 TO g_nof_channels-1 GENERATE
u_ip_arria10_phy_10gbase_r : ip_arria10_phy_10gbase_r u_ip_arria10_phy_10gbase_r : ip_arria10_phy_10gbase_r
...@@ -202,6 +204,8 @@ BEGIN ...@@ -202,6 +204,8 @@ BEGIN
END GENERATE; END GENERATE;
END GENERATE; END GENERATE;
gen_phy_4 : IF c_nof_channels_per_ip=4 GENERATE gen_phy_4 : IF c_nof_channels_per_ip=4 GENERATE
tx_serial_clk_slv <= (OTHERS=>tx_serial_clk(0)); tx_serial_clk_slv <= (OTHERS=>tx_serial_clk(0));
tr_coreclkin_slv <= (OTHERS=>tr_coreclkin(0)); tr_coreclkin_slv <= (OTHERS=>tr_coreclkin(0));
...@@ -284,6 +288,8 @@ BEGIN ...@@ -284,6 +288,8 @@ BEGIN
END GENERATE; END GENERATE;
gen_phy_12 : IF c_nof_channels_per_ip=12 GENERATE gen_phy_12 : IF c_nof_channels_per_ip=12 GENERATE
tx_serial_clk_slv <= (OTHERS=>tx_serial_clk(0)); tx_serial_clk_slv <= (OTHERS=>tx_serial_clk(0));
tr_coreclkin_slv <= (OTHERS=>tr_coreclkin(0)); tr_coreclkin_slv <= (OTHERS=>tr_coreclkin(0));
...@@ -366,6 +372,8 @@ BEGIN ...@@ -366,6 +372,8 @@ BEGIN
END GENERATE; END GENERATE;
gen_phy_24 : IF c_nof_channels_per_ip=24 GENERATE gen_phy_24 : IF c_nof_channels_per_ip=24 GENERATE
tx_serial_clk_slv <= (OTHERS=>tx_serial_clk(0)); tx_serial_clk_slv <= (OTHERS=>tx_serial_clk(0));
tr_coreclkin_slv <= (OTHERS=>tr_coreclkin(0)); tr_coreclkin_slv <= (OTHERS=>tr_coreclkin(0));
...@@ -446,6 +454,8 @@ BEGIN ...@@ -446,6 +454,8 @@ BEGIN
tx_ready => xgmii_tx_ready_arr(IP_SIZE-1 DOWNTO 0) -- : out std_logic_vector(11 downto 0) -- tx_ready.tx_ready tx_ready => xgmii_tx_ready_arr(IP_SIZE-1 DOWNTO 0) -- : out std_logic_vector(11 downto 0) -- tx_ready.tx_ready
); );
END GENERATE; END GENERATE;
-- ATX PLL -- ATX PLL
u_ip_arria10_transceiver_pll_10g : ip_arria10_transceiver_pll_10g u_ip_arria10_transceiver_pll_10g : ip_arria10_transceiver_pll_10g
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment