From b5ca54169d02ec21bb0dbea368a280f3707e12e8 Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Tue, 3 Jun 2014 09:42:37 +0000
Subject: [PATCH] Use tech_nat_to_mbps_str() from technology_pkg.vhd that is a
renamed copy of trnb_nat_to_str() in tr_nonbonded_pkg.vhd.
---
libraries/technology/altera/stratixiv_hssi/hdllib.cfg | 2 +-
.../altera/stratixiv_hssi/ip_stratixiv_hssi_gx_generic.vhd | 6 +++---
.../altera/stratixiv_hssi/ip_stratixiv_hssi_rx_generic.vhd | 6 +++---
.../altera/stratixiv_hssi/ip_stratixiv_hssi_tx_generic.vhd | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libraries/technology/altera/stratixiv_hssi/hdllib.cfg b/libraries/technology/altera/stratixiv_hssi/hdllib.cfg
index e00115601b..3c01d0c058 100644
--- a/libraries/technology/altera/stratixiv_hssi/hdllib.cfg
+++ b/libraries/technology/altera/stratixiv_hssi/hdllib.cfg
@@ -1,6 +1,6 @@
hdl_lib_name = ip_stratixiv_hssi
hdl_library_clause_name = ip_stratixiv_hssi_lib
-hdl_lib_uses =
+hdl_lib_uses = technology
build_sim_dir = $HDL_BUILD_DIR
build_synth_dir =
diff --git a/libraries/technology/altera/stratixiv_hssi/ip_stratixiv_hssi_gx_generic.vhd b/libraries/technology/altera/stratixiv_hssi/ip_stratixiv_hssi_gx_generic.vhd
index fb281988c5..543c3084d7 100644
--- a/libraries/technology/altera/stratixiv_hssi/ip_stratixiv_hssi_gx_generic.vhd
+++ b/libraries/technology/altera/stratixiv_hssi/ip_stratixiv_hssi_gx_generic.vhd
@@ -44,8 +44,8 @@
USE ieee.std_logic_1164.all;
USE IEEE.NUMERIC_STD.ALL;
- LIBRARY tr_nonbonded_lib;
- USE tr_nonbonded_lib.tr_nonbonded_pkg.all; -- Provides a function to convert a natural to a string.
+ LIBRARY technology_lib;
+ USE technology_lib.technology_pkg.all; -- Provides a function to convert a natural to a Mbps string.
ENTITY ip_stratixiv_hssi_gx_alt4gxb_81na IS
GENERIC
@@ -87,7 +87,7 @@
ARCHITECTURE RTL OF ip_stratixiv_hssi_gx_alt4gxb_81na IS
--VARIABLE unb_mbps_string : STRING := "5000 Mbps";
- CONSTANT unb_mbps_string : STRING(1 TO 9) := trnb_nat_to_str(g_mbps);
+ CONSTANT unb_mbps_string : STRING(1 TO 9) := tech_nat_to_mbps_str(g_mbps);
CONSTANT unb_mult : NATURAL := (g_mbps*2)/625; -- Workaround (division not possible with non-integers): equals (g_mbps/2)/156.25
CONSTANT unb_vco_postscaling : NATURAL := 6250/g_mbps; -- Results in postcalers 1, 1 and 2 for 6250, 5000 and 3125Mbps.
diff --git a/libraries/technology/altera/stratixiv_hssi/ip_stratixiv_hssi_rx_generic.vhd b/libraries/technology/altera/stratixiv_hssi/ip_stratixiv_hssi_rx_generic.vhd
index cd75062b4c..c6995b12d3 100644
--- a/libraries/technology/altera/stratixiv_hssi/ip_stratixiv_hssi_rx_generic.vhd
+++ b/libraries/technology/altera/stratixiv_hssi/ip_stratixiv_hssi_rx_generic.vhd
@@ -44,8 +44,8 @@
USE ieee.std_logic_1164.all;
USE IEEE.NUMERIC_STD.ALL;
- LIBRARY tr_nonbonded_lib;
- USE tr_nonbonded_lib.tr_nonbonded_pkg.all; -- Provides a function to convert a natural to a string.
+ LIBRARY technology_lib;
+ USE technology_lib.technology_pkg.all; -- Provides a function to convert a natural to a Mbps string.
ENTITY ip_stratixiv_hssi_rx_generic_alt4gxb_qi67 IS
GENERIC
@@ -78,7 +78,7 @@
ARCHITECTURE RTL OF ip_stratixiv_hssi_rx_generic_alt4gxb_qi67 IS
- CONSTANT unb_mbps_string : STRING(1 TO 9) := trnb_nat_to_str(g_mbps);
+ CONSTANT unb_mbps_string : STRING(1 TO 9) := tech_nat_to_mbps_str(g_mbps);
CONSTANT unb_mult : NATURAL := (g_mbps*2)/625; -- Workaround (division not possible with non-integers): equals (g_mbps/2)/156.25
CONSTANT unb_vco_postscaling : NATURAL := 6250/g_mbps; -- Results in postcalers 1, 1 and 2 for 6250, 5000 and 3125Mbps.
diff --git a/libraries/technology/altera/stratixiv_hssi/ip_stratixiv_hssi_tx_generic.vhd b/libraries/technology/altera/stratixiv_hssi/ip_stratixiv_hssi_tx_generic.vhd
index 15c19f1701..0d276d1f3a 100644
--- a/libraries/technology/altera/stratixiv_hssi/ip_stratixiv_hssi_tx_generic.vhd
+++ b/libraries/technology/altera/stratixiv_hssi/ip_stratixiv_hssi_tx_generic.vhd
@@ -45,8 +45,8 @@
USE IEEE.NUMERIC_STD.ALL;
- LIBRARY tr_nonbonded_lib;
- USE tr_nonbonded_lib.tr_nonbonded_pkg.all; -- Provides a function to convert a natural to a string.
+ LIBRARY technology_lib;
+ USE technology_lib.technology_pkg.all; -- Provides a function to convert a natural to a Mbps string.
ENTITY ip_stratixiv_hssi_tx_generic_alt4gxb_dgn4 IS
GENERIC
@@ -71,7 +71,7 @@
ARCHITECTURE RTL OF ip_stratixiv_hssi_tx_generic_alt4gxb_dgn4 IS
- CONSTANT unb_mbps_string : STRING(1 TO 9) := trnb_nat_to_str(g_mbps);
+ CONSTANT unb_mbps_string : STRING(1 TO 9) := tech_nat_to_mbps_str(g_mbps);
CONSTANT unb_mult : NATURAL := (g_mbps*2)/625; -- Workaround (division not possible with non-integers): equals (g_mbps/2)/156.25
CONSTANT unb_vco_postscaling : NATURAL := 6250/g_mbps; -- Results in postcalers 1, 1 and 2 for 6250, 5000 and 3125Mbps.
--
GitLab