From 34bb579ddf1e8caafe1f6712aa6d24cceb457d30 Mon Sep 17 00:00:00 2001
From: Reinier van der Walle <walle@astron.nl>
Date: Mon, 24 Feb 2020 12:23:23 +0100
Subject: [PATCH] Used constant nof_streams of 12 for jesd ip as another value
will cause synthesis errors
---
.../ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b.vhd | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/applications/ta2/libraries/ta2_unb2b_bsp/hardware/unb2b/ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b.vhd b/applications/ta2/libraries/ta2_unb2b_bsp/hardware/unb2b/ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b.vhd
index 860404c881..c2a6e2194b 100644
--- a/applications/ta2/libraries/ta2_unb2b_bsp/hardware/unb2b/ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b.vhd
+++ b/applications/ta2/libraries/ta2_unb2b_bsp/hardware/unb2b/ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b.vhd
@@ -83,8 +83,9 @@ END ta2_unb2b_jesd204b;
ARCHITECTURE str OF ta2_unb2b_jesd204b IS
CONSTANT c_sim : BOOLEAN := FALSE;
-
- CONSTANT c_nof_streams_jesd204b : NATURAL := 1;
+
+ CONSTANT c_nof_connected_streams_jesd204b: NATURAL := 1;
+ CONSTANT c_nof_streams_jesd204b : NATURAL := 12;
CONSTANT c_rx_fifo_size : NATURAL := 32; -- should be large enough
@@ -103,6 +104,8 @@ ARCHITECTURE str OF ta2_unb2b_jesd204b IS
SIGNAL jesd204b_mosi : t_mem_mosi;
SIGNAL jesd204b_miso : t_mem_miso;
+ SIGNAL i_jesd204b_sync_n_arr : STD_LOGIC_VECTOR(c_nof_streams_jesd204b-1 DOWNTO 0);
+ SIGNAL jesd204b_serial_rx_arr : STD_LOGIC_VECTOR(c_nof_streams_jesd204b-1 DOWNTO 0) := (OTHERS => '0');
BEGIN
jesd204b_mosi.address(7 DOWNTO 0) <= jesd204b_mosi_address;
@@ -112,6 +115,9 @@ BEGIN
jesd204b_miso_rddata <= jesd204b_miso.rddata(31 DOWNTO 0);
jesd204b_miso_waitrequest <= jesd204b_miso.waitrequest;
+ jesd204b_sync_n_arr <= i_jesd204b_sync_n_arr(c_nof_connected_streams_jesd204b -1 DOWNTO 0);
+ jesd204b_serial_rx_arr(c_nof_connected_streams_jesd204b -1 DOWNTO 0) <= serial_rx_arr;
+
u_jesd204b: ENTITY tech_jesd204b_lib.tech_jesd204b
GENERIC MAP(
g_sim => c_sim,
@@ -120,7 +126,7 @@ BEGIN
PORT MAP(
jesd204b_refclk => jesd204b_refclk,
jesd204b_sysref => jesd204b_sysref,
- jesd204b_sync_n_arr => jesd204b_sync_n_arr,
+ jesd204b_sync_n_arr => i_jesd204b_sync_n_arr,
rx_src_out_arr => jesd204b_rx_src_out_arr,
jesd204b_frame_clk => jesd204b_frame_clk,
@@ -134,7 +140,7 @@ BEGIN
-- Serial
serial_tx_arr => open,
- serial_rx_arr => serial_rx_arr
+ serial_rx_arr => jesd204b_serial_rx_arr
);
--
GitLab