HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/PELLION/VHD_Lib Commit - r354:668500b2114b

lib/VHDLIB/AMBA_Peripherals/vhdlsyn.txt created 644 +3 0

@@ -0,0 +1,3
	1	AMBA_Peripherals.vhd
	2	apb_devices_list.vhd
	3

lib/VHDLIB/DSP/filters/vhdlsyn.txt created 644 +1 0

	@@ -0,0 +1,1
				1	filters.vhd

lib/VHDLIB/SOC/vhdlsyn.txt created 644 +1 0

	@@ -0,0 +1,1
				1	SOC.vhd

lib/VHDLIB/boards/vhdlsyn.txt created 644 +1 0

	@@ -0,0 +1,1
				1	boards.vhd

lib/VHDLIB/communication/vhdlsyn.txt created 644 +1 0

	@@ -0,0 +1,1
				1	communication.vhd

lib/VHDLIB/data_converters/vhdlsyn.txt created 644 +1 0

	@@ -0,0 +1,1
				1	data_converters.vhd

lib/VHDLIB/dirs.txt created 644 +7 0

@@ -0,0 +1,7
	1	AMBA_Peripherals
	2	sample_type
	3	general_purpose
	4	data_converters
	5	SOC
	6	DSP/filters
	7	memory

lib/VHDLIB/general_purpose/vhdlsyn.txt created 644 +1 0

	@@ -0,0 +1,1
				1	general_purpose.vhd

lib/VHDLIB/memory/vhdlsyn.txt created 644 +1 0

	@@ -0,0 +1,1
				1	memory.vhd

.hgignore 0 -2

             *.idx
             *doc*
             *Doc*
-            *vhdlsyn.txt
-            *dirs.txt
             *.orig
             *.o
             *.a

APB_DEVICES/apb_devices_list.txt +7 0

@@ -16,3 +16,10 device LPP_MATRIX 13
16	device LPP_DELAY 14	16	device LPP_DELAY 14
17	device LPP_USB 15	17	device LPP_USB 15
18	device LPP_BALISE 16	18	device LPP_BALISE 16
		19	device LPP_DMA_TYPE 17
		20	device LPP_BOOTLOADER_TYPE 18
		21	device LPP_LFR 19
		22	device LPP_CLKSETTING 20
		23	device LPP_DEBUG_DMA A0
		24	device LPP_DEBUG_LFR A1
		25	device LPP_DEBUG_LFR_ID A2

lib/staging/LPP/JCP/AMBA_Peripherals/AHB_DMA/lpp_dma_singleOrBurst.vhd +3 0

             LIBRARY techmap;
             USE techmap.gencomp.ALL;
+            LIBRARY VHDLIB;
+            USE VHDLIB.apb_devices_list.ALL;
             LIBRARY staging;
             USE staging.lpp_dma_pkg_LPP_JCP.ALL;

lib/staging/LPP/JCP/AMBA_Peripherals/lpp_lfr/lpp_lfr_apbreg.vhd +4 -1

             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;
               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

lib/staging/LPP/JCP/AMBA_Peripherals/lpp_lfr/lpp_lfr_pkg.vhd +44 0

@@ -207,5 +207,49 PACKAGE lpp_lfr_pkg_LPP_JCP IS
207	data_f3_data_out_ren : IN STD_LOGIC;	207	data_f3_data_out_ren : IN STD_LOGIC;
208	observation_reg : OUT STD_LOGIC_VECTOR(31 DOWNTO 0));	208	observation_reg : OUT STD_LOGIC_VECTOR(31 DOWNTO 0));
209	END COMPONENT;	209	END COMPONENT;
		210
		211	-----------------------------------------------------------------------------
		212	-- lpp_matrix_spectral
		213	-----------------------------------------------------------------------------
		214	COMPONENT lpp_lfr_ms_LPP_JCP
		215	GENERIC (
		216	Mem_use : INTEGER);
		217	PORT (
		218	clk : IN STD_LOGIC;
		219	rstn : IN STD_LOGIC;
		220	coarse_time : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
		221	fine_time : IN STD_LOGIC_VECTOR(15 DOWNTO 0);
		222	sample_f0_wen : IN STD_LOGIC_VECTOR(4 DOWNTO 0);
		223	sample_f0_wdata : IN STD_LOGIC_VECTOR((5*16)-1 DOWNTO 0);
		224	sample_f1_wen : IN STD_LOGIC_VECTOR(4 DOWNTO 0);
		225	sample_f1_wdata : IN STD_LOGIC_VECTOR((5*16)-1 DOWNTO 0);
		226	sample_f3_wen : IN STD_LOGIC_VECTOR(4 DOWNTO 0);
		227	sample_f3_wdata : IN STD_LOGIC_VECTOR((5*16)-1 DOWNTO 0);
		228	dma_addr : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
		229	dma_data : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
		230	dma_valid : OUT STD_LOGIC;
		231	dma_valid_burst : OUT STD_LOGIC;
		232	dma_ren : IN STD_LOGIC;
		233	dma_done : IN STD_LOGIC;
		234	ready_matrix_f0_0 : OUT STD_LOGIC;
		235	ready_matrix_f0_1 : OUT STD_LOGIC;
		236	ready_matrix_f1 : OUT STD_LOGIC;
		237	ready_matrix_f2 : OUT STD_LOGIC;
		238	error_anticipating_empty_fifo : OUT STD_LOGIC;
		239	error_bad_component_error : OUT STD_LOGIC;
		240	debug_reg : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
		241	status_ready_matrix_f0_0 : IN STD_LOGIC;
		242	status_ready_matrix_f0_1 : IN STD_LOGIC;
		243	status_ready_matrix_f1 : IN STD_LOGIC;
		244	status_ready_matrix_f2 : IN STD_LOGIC;
		245	status_error_anticipating_empty_fifo : IN STD_LOGIC;
		246	status_error_bad_component_error : IN STD_LOGIC;
		247	config_active_interruption_onNewMatrix : IN STD_LOGIC;
		248	config_active_interruption_onError : IN STD_LOGIC;
		249	addr_matrix_f0_0 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
		250	addr_matrix_f0_1 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
		251	addr_matrix_f1 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
		252	addr_matrix_f2 : IN STD_LOGIC_VECTOR(31 DOWNTO 0));
		253	END COMPONENT;
210		254
211	END;	255	END;

lib/staging/LPP/JCP/AMBA_Peripherals/vhdlsyn.txt +1 0

             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

scripts/APB_DEV_UPDATER.sh +1 -1

             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

scripts/linklibs.sh +1 -1

             				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..."

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages