- uses ieee_proposed.fixed_pkg

git-svn-id: http://moon:8086/svn/vhdl/trunk@171 cc03376c-175c-47c8-b038-4cd826a8556b

lib/radio/nco/sim/tb_mix_cordic.fdo

@@ -1,5 +1,6 @@
+vmap ieee_proposed ../../../../Common/sim/ieee_proposed
+
 vlib work
-vcom -explicit  -93 "../../../fixed/fixed_pkg_c.vhd"
 vcom -explicit  -93 "../../../fixed/fixed_util_pkg.vhd"
 vcom -explicit  -93 "../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd"
 vcom -explicit  -93 "../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd"

lib/radio/nco/sim/tb_nco_cordic.fdo

@@ -1,5 +1,6 @@
+vmap ieee_proposed ../../../../Common/sim/ieee_proposed
+
 vlib work
-vcom -explicit  -93 "../../../fixed/fixed_pkg_c.vhd"
 vcom -explicit  -93 "../../../fixed/fixed_util_pkg.vhd"
 vcom -explicit  -93 "../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd"
 vcom -explicit  -93 "../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd"

lib/radio/nco/sim/tb_nco_lut.fdo

@@ -1,5 +1,6 @@
+vmap ieee_proposed ../../../../Common/sim/ieee_proposed
+
 vlib work
-vcom -explicit  -93 "../../../fixed/fixed_pkg_c.vhd"
 vcom -explicit  -93 "../../../fixed/fixed_util_pkg.vhd"
 vcom -explicit  -93 "../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd"
 vcom -explicit  -93 "../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd"

lib/radio/nco/src/nco_lut.vhd

@@ -21,7 +21,12 @@ library IEEE;
 use IEEE.STD_LOGIC_1164.ALL;
 use IEEE.MATH_REAL.ALL;
 USE ieee.numeric_std.ALL;
-use work.fixed_pkg.all;
+
+library ieee_proposed;
+use ieee_proposed.math_utility_pkg.all;
+use ieee_proposed.fixed_pkg.all;
+
+library work;
 use work.fixed_util_pkg.all;
 use work.nco_pkg.all;
 

lib/radio/nco/src/nco_lut_dbg.vhd

@@ -21,7 +21,12 @@ library IEEE;
 use IEEE.STD_LOGIC_1164.ALL;
 use IEEE.MATH_REAL.ALL;
 USE ieee.numeric_std.ALL;
-use work.fixed_pkg.all;
+
+library ieee_proposed;
+use ieee_proposed.math_utility_pkg.all;
+use ieee_proposed.fixed_pkg.all;
+
+library work;
 use work.fixed_util_pkg.all;
 use work.nco_pkg.all;
 

lib/radio/nco/src/nco_pkg.vhd

@@ -3,7 +3,12 @@ library IEEE;
 use IEEE.STD_LOGIC_1164.ALL;
 use ieee.numeric_std.all;
 use IEEE.MATH_REAL.ALL;
-use work.fixed_pkg.all;
+
+library ieee_proposed;
+use ieee_proposed.math_utility_pkg.all;
+use ieee_proposed.fixed_pkg.all;
+
+library work;
 use work.fixed_util_pkg.all;
 
 -------------------------------------------------------------------------------

lib/radio/nco/src/tb_mix_cordic.vhd

@@ -17,8 +17,11 @@ use IEEE.MATH_REAL.ALL;
 USE ieee.numeric_std.ALL;
 use std.textio.all; --  Imports the standard textio package.
 
+library ieee_proposed;
+use ieee_proposed.math_utility_pkg.all;
+use ieee_proposed.fixed_pkg.all;
+
 library work;
-use work.fixed_pkg.all;
 use work.fixed_util_pkg.all;
 use work.cordic_pkg.all;
 use work.PCK_FIO.all;

lib/radio/nco/src/tb_nco_cordic.vhd

@@ -17,8 +17,11 @@ use IEEE.MATH_REAL.ALL;
 USE ieee.numeric_std.ALL;
 use std.textio.all; --  Imports the standard textio package.
 
+library ieee_proposed;
+use ieee_proposed.math_utility_pkg.all;
+use ieee_proposed.fixed_pkg.all;
+
 library work;
-use work.fixed_pkg.all;
 use work.fixed_util_pkg.all;
 use work.PCK_FIO.all;
 

lib/radio/nco/src/tb_nco_lut.vhd

@@ -17,8 +17,11 @@ use IEEE.MATH_REAL.ALL;
 USE ieee.numeric_std.ALL;
 use std.textio.all; --  Imports the standard textio package.
 
+library ieee_proposed;
+use ieee_proposed.math_utility_pkg.all;
+use ieee_proposed.fixed_pkg.all;
+
 library work;
-use work.fixed_pkg.all;
 use work.fixed_util_pkg.all;
 use work.nco_pkg.all;
 use work.PCK_FIO.all;

lib/radio/nco/src/wavelut.vhd

@@ -21,7 +21,12 @@ library IEEE;
 use IEEE.STD_LOGIC_1164.ALL;
 use IEEE.MATH_REAL.ALL;
 USE ieee.numeric_std.ALL;
-use work.fixed_pkg.all;
+
+library ieee_proposed;
+use ieee_proposed.math_utility_pkg.all;
+use ieee_proposed.fixed_pkg.all;
+
+library work;
 use work.fixed_util_pkg.all;
 use work.nco_pkg.all;
 
@@ -188,7 +193,7 @@ proc_out_i: process(clk, wave_i, inv_i, zero_i)
 		if z = '0' then
 			w := wave_i;
 			if inv = '1' then
-				w := resize(-wave_i, w, fixed_truncate, fixed_wrap);
+				w := resize(-wave_i, w, fixed_wrap, fixed_truncate);
 			end if;
 		end if;
 		
@@ -217,7 +222,7 @@ proc_out_q: process(clk, wave_q, inv_q, zero_q)
 		if z = '0' then
 			w := wave_q;
 			if inv = '1' then
-				w := resize(-wave_q, w, fixed_truncate, fixed_wrap);
+				w := resize(-wave_q, w, fixed_wrap, fixed_truncate);
 			end if;
 		end if;
 		

lib/radio/nco/src/waverom_dual.vhd

@@ -21,7 +21,12 @@ library IEEE;
 use IEEE.STD_LOGIC_1164.ALL;
 use IEEE.MATH_REAL.ALL;
 USE ieee.numeric_std.ALL;
-use work.fixed_pkg.all;
+
+library ieee_proposed;
+use ieee_proposed.math_utility_pkg.all;
+use ieee_proposed.fixed_pkg.all;
+
+library work;
 use work.fixed_util_pkg.all;
 use work.nco_pkg.all;
 
@@ -60,7 +65,7 @@ function to_wave_mem(wave_real : real_array_t; len : integer; proto : sfixed) re
 variable res : wave_mem_t;
 begin
 	for i in 0 to len-1 loop
-		res(i) := to_sfixed(wave_real(i), proto, fixed_round, fixed_saturate);
+		res(i) := to_sfixed(wave_real(i), proto, fixed_saturate, fixed_round);
 	end loop;
 
 	return res;