jens/vhdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- refactored

Browse Source 
git-svn-id: http://moon:8086/svn/vhdl/trunk@1541 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
jens
2021-03-28 10:27:33 +00:00
parent d0433ac19d
commit 06feba8f63
47 changed files with 255 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/radio/cordic/ghdl/cordic_iterative.inc
+9 -16
View File
@@ -1,23 +1,16 @@
# -----------------------------------------------------------
include $(VHDL_HOME)/make/defs.mk
# -----------------------------------------------------------
PKG_NAME := CORDIC_ITERATIVE
ROOT_PATH := ../../../..
LIB_PATH := $(ROOT_PATH)/lib
CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
# -----------------------------------------------------------
SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd
SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pkg.vhd
SRCS += $(LIB_PATH)/radio/cordic/src/cordic_rom.vhd
SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage.vhd
SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage_pre.vhd
SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage_post.vhd
SRCS += $(LIB_PATH)/radio/cordic/src/cordic_top.vhd
$(PKG_NAME)_SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pkg.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_rom.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage_pre.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage_post.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_top.vhd
# -----------------------------------------------------------
$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS))
SRCS :=
CUR_PATH :=
ROOT_PATH :=
LIB_PATH :=
lib/radio/cordic/ghdl/cordic_pipe.inc
+8 -15
View File
@@ -1,22 +1,15 @@
# -----------------------------------------------------------
include $(VHDL_HOME)/make/defs.mk
# -----------------------------------------------------------
PKG_NAME := CORDIC_PIPE
ROOT_PATH := ../../../..
LIB_PATH := $(ROOT_PATH)/lib
CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
# -----------------------------------------------------------
SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd
SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pkg.vhd
SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_stage.vhd
SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_pre.vhd
SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_post.vhd
SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_top.vhd
$(PKG_NAME)_SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pkg.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_stage.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_pre.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_post.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_top.vhd
# -----------------------------------------------------------
$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS))
SRCS :=
CUR_PATH :=
ROOT_PATH :=
LIB_PATH :=
lib/radio/cordic/ghdl/tb_cordic_iterative_top.make
+2 -3
View File
@@ -1,4 +1,5 @@
# -------------------------------------------------
include $(VHDL_HOME)/make/defs.mk
include cordic_iterative.inc
# -------------------------------------------------
@@ -11,8 +12,6 @@ WORK_LIB := work
# -------------------------------------------------
# Target options
# -------------------------------------------------
LIB_PATH := ../../../../lib
SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd
SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd
SRCS += $(CORDIC_ITERATIVE_SRCS)
@@ -27,5 +26,5 @@ RUN_TIME := 300us
GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed
include ../../../../Common/make/ghdl.mk
include $(VHDL_HOME)/make/ghdl.mk
# -------------------------------------------------
lib/radio/cordic/ghdl/tb_cordic_pipe_top.make
+3 -3
View File
@@ -1,4 +1,5 @@
# -------------------------------------------------
include $(VHDL_HOME)/make/defs.mk
include cordic_pipe.inc
# -------------------------------------------------
@@ -11,8 +12,6 @@ WORK_LIB := work
# -------------------------------------------------
# Target options
# -------------------------------------------------
LIB_PATH := ../../../../lib
SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd
SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd
SRCS += $(CORDIC_PIPE_SRCS)
@@ -27,5 +26,6 @@ RUN_TIME := 150us
GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed
include ../../../../Common/make/ghdl.mk
include $(VHDL_HOME)/make/ghdl.mk
# -------------------------------------------------
lib/radio/ddc/ghdl/tb_ddc.make
+6 -7
View File
@@ -1,10 +1,9 @@
include ../../../../lib/FIFO/ghdl/fifo_sync.inc
include ../../../../lib/filter/ghdl/fir_semi_parallel.inc
include ../../../../lib/radio/nco/ghdl/mix_cordic_pipe.inc
include ../../../../lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc
include $(VHDL_HOME)/make/defs.mk
ROOT_PATH := ../../../..
LIB_PATH := $(ROOT_PATH)/lib
include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc
include $(LIB_PATH)/filter/ghdl/fir_semi_parallel.inc
include $(LIB_PATH)/radio/nco/ghdl/mix_cordic_pipe.inc
include $(LIB_PATH)/radio/decimator/CIC/ghdl/cic_decim_pipe.inc
SRCS += $(FIFO_SYNC_SRCS)
SRCS += $(FIR_SEMI_PARALLEL_SRCS)
@@ -23,5 +22,5 @@ RUN_TIME := 100us
GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed
include $(ROOT_PATH)/Common/make/ghdl.mk
include $(VHDL_HOME)/make/ghdl.mk
lib/radio/ddc/ghdl/tb_syn_ddc.make
+7 -8
View File
@@ -1,11 +1,10 @@
include ../../../../lib/FIFO/ghdl/fifo_sync.inc
include ../../../../lib/FIFO/ghdl/fifo_async.inc
include ../../../../lib/filter/ghdl/fir_semi_parallel.inc
include ../../../../lib/radio/nco/ghdl/mix_cordic_pipe.inc
include ../../../../lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc
include $(VHDL_HOME)/make/defs.mk
ROOT_PATH := ../../../..
LIB_PATH := $(ROOT_PATH)/lib
include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc
include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc
include $(LIB_PATH)/filter/ghdl/fir_semi_parallel.inc
include $(LIB_PATH)/radio/nco/ghdl/mix_cordic_pipe.inc
include $(LIB_PATH)/radio/decimator/CIC/ghdl/cic_decim_pipe.inc
SRCS += $(LIB_PATH)/misc/utils_pkg.vhd
SRCS += $(FIFO_SYNC_SRCS)
@@ -27,5 +26,5 @@ RUN_TIME := 100us
GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed
include $(ROOT_PATH)/Common/make/ghdl.mk
include $(VHDL_HOME)/make/ghdl.mk
lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc
+7 -14
View File
@@ -1,21 +1,14 @@
# -----------------------------------------------------------
include $(VHDL_HOME)/make/defs.mk
# -----------------------------------------------------------
PKG_NAME := CIC_DECIM_PIPE
ROOT_PATH := ../../../../..
LIB_PATH := $(ROOT_PATH)/lib
CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
# -----------------------------------------------------------
SRCS := $(LIB_PATH)/misc/utils_pkg.vhd
SRCS += $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd
SRCS += $(LIB_PATH)/radio/decimator/CIC/src/cic_i_pipe.vhd
SRCS += $(LIB_PATH)/radio/decimator/CIC/src/cic_c_pipe.vhd
SRCS += $(LIB_PATH)/radio/decimator/CIC/src/cic_decim_pipe.vhd
$(PKG_NAME)_SRCS := $(LIB_PATH)/misc/utils_pkg.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/decimator/CIC/src/cic_i_pipe.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/decimator/CIC/src/cic_c_pipe.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/decimator/CIC/src/cic_decim_pipe.vhd
# -----------------------------------------------------------
$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS))
SRCS :=
CUR_PATH :=
ROOT_PATH :=
LIB_PATH :=
lib/radio/decimator/CIC/ghdl/tb_cic_decim_pipe.make
+2 -4
View File
@@ -1,8 +1,6 @@
include $(VHDL_HOME)/make/defs.mk
include cic_decim_pipe.inc
ROOT_PATH := ../../../../..
LIB_PATH := $(ROOT_PATH)/lib
SRCS += $(CIC_DECIM_PIPE_SRCS)
SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd
SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd
@@ -16,5 +14,5 @@ RUN_TIME := 75us
GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed
include $(ROOT_PATH)/Common/make/ghdl.mk
include $(VHDL_HOME)/make/ghdl.mk
lib/radio/nco/ghdl/mix_cordic_pipe.inc
+4 -12
View File
@@ -1,20 +1,12 @@
# -----------------------------------------------------------
include ../../../../lib/radio/cordic/ghdl/cordic_pipe.inc
include $(VHDL_HOME)/make/defs.mk
include $(LIB_PATH)/radio/cordic/ghdl/cordic_pipe.inc
# -----------------------------------------------------------
PKG_NAME := MIX_CORDIC_PIPE
ROOT_PATH := ../../../..
LIB_PATH := $(ROOT_PATH)/lib
CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
# -----------------------------------------------------------
SRCS := $(CORDIC_PIPE_SRCS)
SRCS += $(LIB_PATH)/radio/nco/src/mix_cordic_pipe.vhd
$(PKG_NAME)_SRCS := $(CORDIC_PIPE_SRCS)
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/nco/src/mix_cordic_pipe.vhd
# -----------------------------------------------------------
$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS))
SRCS :=
CUR_PATH :=
ROOT_PATH :=
LIB_PATH :=
lib/radio/nco/ghdl/nco_lut.inc
+7 -14
View File
@@ -1,21 +1,14 @@
# -----------------------------------------------------------
include $(VHDL_HOME)/make/defs.mk
# -----------------------------------------------------------
PKG_NAME := NCO_LUT
ROOT_PATH := ../../../..
LIB_PATH := $(ROOT_PATH)/lib
CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
# -----------------------------------------------------------
SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd
SRCS += $(LIB_PATH)/radio/nco/src/nco_pkg.vhd
SRCS += $(LIB_PATH)/radio/nco/src/waverom_dual.vhd
SRCS += $(LIB_PATH)/radio/nco/src/wavelut.vhd
SRCS += $(LIB_PATH)/radio/nco/src/nco_lut_dbg.vhd
$(PKG_NAME)_SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/nco/src/nco_pkg.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/nco/src/waverom_dual.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/nco/src/wavelut.vhd
$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/nco/src/nco_lut_dbg.vhd
# -----------------------------------------------------------
$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS))
SRCS :=
CUR_PATH :=
ROOT_PATH :=
LIB_PATH :=
lib/radio/nco/ghdl/tb_mix_cordic.make
+3 -6
View File
@@ -1,7 +1,6 @@
# -------------------------------------------------
# Includes
# -------------------------------------------------
include mix_cordic_pipe.inc
include $(VHDL_HOME)/make/defs.mk
include $(LIB_PATH)/radio/nco/ghdl/mix_cordic_pipe.inc
# -------------------------------------------------
# Global options
@@ -13,8 +12,6 @@ WORK_LIB := work
# -------------------------------------------------
# Target options
# -------------------------------------------------
LIB_PATH := ../../../../lib
SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd
SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd
SRCS += $(MIX_CORDIC_PIPE_SRCS)
@@ -29,7 +26,7 @@ RUN_TIME := 200us
GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed
include ../../../../Common/make/ghdl.mk
include $(VHDL_HOME)/make/ghdl.mk
# -------------------------------------------------
lib/radio/nco/ghdl/tb_nco_cordic.make
+3 -6
View File
@@ -1,7 +1,6 @@
# -------------------------------------------------
# Includes
# -------------------------------------------------
include mix_cordic_pipe.inc
include $(VHDL_HOME)/make/defs.mk
include $(LIB_PATH)/radio/nco/ghdl/mix_cordic_pipe.inc
# -------------------------------------------------
# Global options
@@ -13,8 +12,6 @@ WORK_LIB := work
# -------------------------------------------------
# Target options
# -------------------------------------------------
LIB_PATH := ../../../../lib
SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd
SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd
SRCS += $(MIX_CORDIC_PIPE_SRCS)
@@ -29,7 +26,7 @@ RUN_TIME := 250us
GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed
include ../../../../Common/make/ghdl.mk
include $(VHDL_HOME)/make/ghdl.mk
# -------------------------------------------------
lib/radio/nco/ghdl/tb_nco_lut.make
+3 -4
View File
@@ -1,5 +1,6 @@
# -------------------------------------------------
include nco_lut.inc
include $(VHDL_HOME)/make/defs.mk
include $(LIB_PATH)/radio/nco/ghdl/nco_lut.inc
# -------------------------------------------------
# Global options
@@ -11,8 +12,6 @@ WORK_LIB := work
# -------------------------------------------------
# Target options
# -------------------------------------------------
LIB_PATH := ../../../../lib
SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd
SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd
SRCS += $(NCO_LUT_SRCS)
@@ -27,6 +26,6 @@ RUN_TIME := 250us
GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed
include ../../../../Common/make/ghdl.mk
include $(VHDL_HOME)/make/ghdl.mk
# -------------------------------------------------