# HG changeset patch # User pellion # Date 2014-05-05 09:55:02 # Node ID 668500b2114b5676a49bb7425ffc6dcf8ffc4e85 # Parent f908ee67bb4c9e8f0c4ac172663310e686d5cc95 temp diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -19,8 +19,6 @@ syntax: glob *.idx *doc* *Doc* -*vhdlsyn.txt -*dirs.txt *.orig *.o *.a diff --git a/APB_DEVICES/apb_devices_list.txt b/APB_DEVICES/apb_devices_list.txt --- a/APB_DEVICES/apb_devices_list.txt +++ b/APB_DEVICES/apb_devices_list.txt @@ -16,3 +16,10 @@ device LPP_MATRIX 13 device LPP_DELAY 14 device LPP_USB 15 device LPP_BALISE 16 +device LPP_DMA_TYPE 17 +device LPP_BOOTLOADER_TYPE 18 +device LPP_LFR 19 +device LPP_CLKSETTING 20 +device LPP_DEBUG_DMA A0 +device LPP_DEBUG_LFR A1 +device LPP_DEBUG_LFR_ID A2 diff --git a/lib/VHDLIB/AMBA_Peripherals/vhdlsyn.txt b/lib/VHDLIB/AMBA_Peripherals/vhdlsyn.txt new file mode 100644 --- /dev/null +++ b/lib/VHDLIB/AMBA_Peripherals/vhdlsyn.txt @@ -0,0 +1,3 @@ +AMBA_Peripherals.vhd +apb_devices_list.vhd + diff --git a/lib/VHDLIB/DSP/filters/vhdlsyn.txt b/lib/VHDLIB/DSP/filters/vhdlsyn.txt new file mode 100644 --- /dev/null +++ b/lib/VHDLIB/DSP/filters/vhdlsyn.txt @@ -0,0 +1,1 @@ +filters.vhd diff --git a/lib/VHDLIB/SOC/vhdlsyn.txt b/lib/VHDLIB/SOC/vhdlsyn.txt new file mode 100644 --- /dev/null +++ b/lib/VHDLIB/SOC/vhdlsyn.txt @@ -0,0 +1,1 @@ +SOC.vhd diff --git a/lib/VHDLIB/boards/vhdlsyn.txt b/lib/VHDLIB/boards/vhdlsyn.txt new file mode 100644 --- /dev/null +++ b/lib/VHDLIB/boards/vhdlsyn.txt @@ -0,0 +1,1 @@ +boards.vhd diff --git a/lib/VHDLIB/communication/vhdlsyn.txt b/lib/VHDLIB/communication/vhdlsyn.txt new file mode 100644 --- /dev/null +++ b/lib/VHDLIB/communication/vhdlsyn.txt @@ -0,0 +1,1 @@ +communication.vhd diff --git a/lib/VHDLIB/data_converters/vhdlsyn.txt b/lib/VHDLIB/data_converters/vhdlsyn.txt new file mode 100644 --- /dev/null +++ b/lib/VHDLIB/data_converters/vhdlsyn.txt @@ -0,0 +1,1 @@ +data_converters.vhd diff --git a/lib/VHDLIB/dirs.txt b/lib/VHDLIB/dirs.txt new file mode 100644 --- /dev/null +++ b/lib/VHDLIB/dirs.txt @@ -0,0 +1,7 @@ +AMBA_Peripherals +sample_type +general_purpose +data_converters +SOC +DSP/filters +memory diff --git a/lib/VHDLIB/general_purpose/vhdlsyn.txt b/lib/VHDLIB/general_purpose/vhdlsyn.txt new file mode 100644 --- /dev/null +++ b/lib/VHDLIB/general_purpose/vhdlsyn.txt @@ -0,0 +1,1 @@ +general_purpose.vhd diff --git a/lib/VHDLIB/memory/vhdlsyn.txt b/lib/VHDLIB/memory/vhdlsyn.txt new file mode 100644 --- /dev/null +++ b/lib/VHDLIB/memory/vhdlsyn.txt @@ -0,0 +1,1 @@ +memory.vhd diff --git a/lib/staging/LPP/JCP/AMBA_Peripherals/AHB_DMA/lpp_dma_singleOrBurst.vhd b/lib/staging/LPP/JCP/AMBA_Peripherals/AHB_DMA/lpp_dma_singleOrBurst.vhd --- a/lib/staging/LPP/JCP/AMBA_Peripherals/AHB_DMA/lpp_dma_singleOrBurst.vhd +++ b/lib/staging/LPP/JCP/AMBA_Peripherals/AHB_DMA/lpp_dma_singleOrBurst.vhd @@ -36,6 +36,9 @@ USE GRLIB.DMA2AHB_Package.ALL; LIBRARY techmap; USE techmap.gencomp.ALL; +LIBRARY VHDLIB; +USE VHDLIB.apb_devices_list.ALL; + LIBRARY staging; USE staging.lpp_dma_pkg_LPP_JCP.ALL; diff --git a/lib/staging/LPP/JCP/AMBA_Peripherals/lpp_lfr/lpp_lfr_apbreg.vhd b/lib/staging/LPP/JCP/AMBA_Peripherals/lpp_lfr/lpp_lfr_apbreg.vhd --- a/lib/staging/LPP/JCP/AMBA_Peripherals/lpp_lfr/lpp_lfr_apbreg.vhd +++ b/lib/staging/LPP/JCP/AMBA_Peripherals/lpp_lfr/lpp_lfr_apbreg.vhd @@ -31,6 +31,9 @@ USE grlib.devices.ALL; LIBRARY techmap; USE techmap.gencomp.ALL; +LIBRARY VHDLIB; +USE VHDLIB.apb_devices_list.ALL; + ENTITY lpp_lfr_apbreg_LPP_JCP IS GENERIC ( nb_data_by_buffer_size : INTEGER := 11; @@ -487,4 +490,4 @@ BEGIN -- beh irq_wfp_ZERO <= (OTHERS => '0'); ored_irq_wfp <= '0' WHEN irq_wfp = irq_wfp_ZERO ELSE '1'; -END beh; +END beh; \ No newline at end of file diff --git a/lib/staging/LPP/JCP/AMBA_Peripherals/lpp_lfr/lpp_lfr_pkg.vhd b/lib/staging/LPP/JCP/AMBA_Peripherals/lpp_lfr/lpp_lfr_pkg.vhd --- a/lib/staging/LPP/JCP/AMBA_Peripherals/lpp_lfr/lpp_lfr_pkg.vhd +++ b/lib/staging/LPP/JCP/AMBA_Peripherals/lpp_lfr/lpp_lfr_pkg.vhd @@ -207,5 +207,49 @@ PACKAGE lpp_lfr_pkg_LPP_JCP IS data_f3_data_out_ren : IN STD_LOGIC; observation_reg : OUT STD_LOGIC_VECTOR(31 DOWNTO 0)); END COMPONENT; + + ----------------------------------------------------------------------------- + -- lpp_matrix_spectral + ----------------------------------------------------------------------------- + COMPONENT lpp_lfr_ms_LPP_JCP + GENERIC ( + Mem_use : INTEGER); + PORT ( + clk : IN STD_LOGIC; + rstn : IN STD_LOGIC; + coarse_time : IN STD_LOGIC_VECTOR(31 DOWNTO 0); + fine_time : IN STD_LOGIC_VECTOR(15 DOWNTO 0); + sample_f0_wen : IN STD_LOGIC_VECTOR(4 DOWNTO 0); + sample_f0_wdata : IN STD_LOGIC_VECTOR((5*16)-1 DOWNTO 0); + sample_f1_wen : IN STD_LOGIC_VECTOR(4 DOWNTO 0); + sample_f1_wdata : IN STD_LOGIC_VECTOR((5*16)-1 DOWNTO 0); + sample_f3_wen : IN STD_LOGIC_VECTOR(4 DOWNTO 0); + sample_f3_wdata : IN STD_LOGIC_VECTOR((5*16)-1 DOWNTO 0); + dma_addr : OUT STD_LOGIC_VECTOR(31 DOWNTO 0); + dma_data : OUT STD_LOGIC_VECTOR(31 DOWNTO 0); + dma_valid : OUT STD_LOGIC; + dma_valid_burst : OUT STD_LOGIC; + dma_ren : IN STD_LOGIC; + dma_done : IN STD_LOGIC; + ready_matrix_f0_0 : OUT STD_LOGIC; + ready_matrix_f0_1 : OUT STD_LOGIC; + ready_matrix_f1 : OUT STD_LOGIC; + ready_matrix_f2 : OUT STD_LOGIC; + error_anticipating_empty_fifo : OUT STD_LOGIC; + error_bad_component_error : OUT STD_LOGIC; + debug_reg : OUT STD_LOGIC_VECTOR(31 DOWNTO 0); + status_ready_matrix_f0_0 : IN STD_LOGIC; + status_ready_matrix_f0_1 : IN STD_LOGIC; + status_ready_matrix_f1 : IN STD_LOGIC; + status_ready_matrix_f2 : IN STD_LOGIC; + status_error_anticipating_empty_fifo : IN STD_LOGIC; + status_error_bad_component_error : IN STD_LOGIC; + config_active_interruption_onNewMatrix : IN STD_LOGIC; + config_active_interruption_onError : IN STD_LOGIC; + addr_matrix_f0_0 : IN STD_LOGIC_VECTOR(31 DOWNTO 0); + addr_matrix_f0_1 : IN STD_LOGIC_VECTOR(31 DOWNTO 0); + addr_matrix_f1 : IN STD_LOGIC_VECTOR(31 DOWNTO 0); + addr_matrix_f2 : IN STD_LOGIC_VECTOR(31 DOWNTO 0)); + END COMPONENT; END; diff --git a/lib/staging/LPP/JCP/AMBA_Peripherals/vhdlsyn.txt b/lib/staging/LPP/JCP/AMBA_Peripherals/vhdlsyn.txt --- a/lib/staging/LPP/JCP/AMBA_Peripherals/vhdlsyn.txt +++ b/lib/staging/LPP/JCP/AMBA_Peripherals/vhdlsyn.txt @@ -17,6 +17,7 @@ lpp_lfr/lpp_waveform/lpp_waveform_dma_ge lpp_lfr/lpp_waveform/lpp_waveform_fifo_arbiter.vhd lpp_lfr/lpp_waveform/lpp_waveform_fifo_arbiter_reg.vhd lpp_lfr/lpp_waveform/lpp_waveform_genaddress.vhd +lpp_lfr/lpp_matrix_spectral/lpp_lfr_ms.vhd AHB_DMA/lpp_dma_pkg.vhd AHB_DMA/lpp_dma_send_1word.vhd AHB_DMA/lpp_dma_send_16word.vhd diff --git a/scripts/APB_DEV_UPDATER.sh b/scripts/APB_DEV_UPDATER.sh --- a/scripts/APB_DEV_UPDATER.sh +++ b/scripts/APB_DEV_UPDATER.sh @@ -38,7 +38,7 @@ CFileEnd=$LPP_PATCHPATH/APB_DEVICES/CLis ListFILE=$LPP_PATCHPATH/APB_DEVICES/apb_devices_list.txt -VHDListFILE=$LPP_PATCHPATH/lib/lpp/lpp_amba/apb_devices_list.vhd +VHDListFILE=$LPP_PATCHPATH/lib/VHDLIB/AMBA_Peripherals/apb_devices_list.vhd CListFILE=$LPP_PATCHPATH/LPP_drivers/libsrc/AMBA/apb_devices_list.h diff --git a/scripts/linklibs.sh b/scripts/linklibs.sh --- a/scripts/linklibs.sh +++ b/scripts/linklibs.sh @@ -41,7 +41,7 @@ if [ -d "$GRLIBPATH" ]; then if(grep -q $LPP_PATCHPATH/lib/lpp $1/lib/libs.txt); then echo "No need to Patch $1/lib/libs.txt..." else - echo $LPP_PATCHPATH/lib/lpp >>$1/lib/libs.txt + echo $LPP_PATCHPATH/lib/VHDLIB >>$1/lib/libs.txt fi if(grep -q $LPP_PATCHPATH/lib/staging $1/lib/libs.txt); then echo "No need to Patch $1/lib/libs.txt..."