OpenCores
URL https://opencores.org/ocsvn/yac/yac/trunk

Subversion Repositories yac

[/] [yac/] [trunk/] [rtl/] [vhdl/] [cordic_iterative_pkg.vhd] - Diff between revs 3 and 4

Go to most recent revision | Show entire file | Details | Blame | View Log

Rev 3 Rev 4
Line 60... Line 60...
package cordic_pkg is
package cordic_pkg is
 
 
 
 
 
 
<<<<<<< HEAD
<<<<<<< HEAD
 
<<<<<<< HEAD
   constant I_FLAG_VEC_ROT      : natural :=  3;  -- bit index
   constant I_FLAG_VEC_ROT      : natural :=  3;  -- bit index
   constant I_FLAG_ATAN_3       : natural :=  2;  -- bit index (for future usage)
   constant I_FLAG_ATAN_3       : natural :=  2;  -- bit index (for future usage)
=======
=======
   constant FLAG_VEC_ROT      : natural :=  3;  -- bit index
   constant FLAG_VEC_ROT      : natural :=  3;  -- bit index
   constant FLAG_ATAN_3       : natural :=  2;  -- bit index
   constant FLAG_ATAN_3       : natural :=  2;  -- bit index
>>>>>>> initial commit
>>>>>>> initial commit
 
=======
 
   constant I_FLAG_VEC_ROT      : natural :=  3;  -- bit index
 
   constant I_FLAG_ATAN_3       : natural :=  2;  -- bit index (for future usage)
 
>>>>>>> Updated C and RTL model as well as the documentation
   constant VAL_MODE_CIR      : std_logic_vector( 1 downto 0 ) :=  "00";  -- value
   constant VAL_MODE_CIR      : std_logic_vector( 1 downto 0 ) :=  "00";  -- value
   constant VAL_MODE_LIN      : std_logic_vector( 1 downto 0 ) :=  "01";  -- value
   constant VAL_MODE_LIN      : std_logic_vector( 1 downto 0 ) :=  "01";  -- value
   constant VAL_MODE_HYP      : std_logic_vector( 1 downto 0 ) :=  "10";  -- value
   constant VAL_MODE_HYP      : std_logic_vector( 1 downto 0 ) :=  "10";  -- value
 
 
   procedure mult_0_61( signal a    : in    signed;
   procedure mult_0_61( signal a    : in    signed;

powered by: WebSVN 2.1.0

© copyright 1999-2024 OpenCores.org, equivalent to Oliscience, all rights reserved. OpenCores®, registered trademark.