HG_REPOSITORIES/LPP/INSTRUMENTATION/VHD_Lib Commit - r467:10ba15a05d8c

LFR-em 1.1.35

pellion -

r467:10ba15a05d8c (LFR-EM) WFP_MS-1-1-35 JC

parent child

Context file:

r467:10ba15a05d8c

Collapse all files

designs/LFR-em-WFP_MS/LFR-em.vhd +1 -1

                   pirq_ms                => 6,
                   pirq_wfp               => 14,
                   hindex                 => 2,
-                  top_lfr_version        => X"010122")  -- aa.bb.cc version
+                  top_lfr_version        => X"010123")  -- aa.bb.cc version
                                                         -- AA : BOARD NUMBER
                                                         --      0 => MINI_LFR
                                                         --      1 => EM

designs/MINI-LFR_WFP_MS/testbench.vhd +12 -3

             LIBRARY lpp;
             USE lpp.lpp_sim_pkg.ALL;
+            USE lpp.lpp_lfr_sim_pkg.ALL;
             USE lpp.lpp_lfr_apbreg_pkg.ALL;
             USE lpp.lpp_lfr_time_management_apbreg_pkg.ALL;
               SIGNAL message_simu : STRING(1 TO 15) := "---------------";
+              SIGNAL data_message : STRING(1 TO 15) := "---------------";
+              SIGNAL data_read    : STD_LOGIC_VECTOR(31 DOWNTO 0) := (OTHERS => '0');
             BEGIN
               -----------------------------------------------------------------------------
               PROCESS
                 CONSTANT txp : TIME := 320 ns;
+                VARIABLE data_read_v : STD_LOGIC_VECTOR(31 DOWNTO 0);
               BEGIN  -- PROCESS
                 TXD1  <= '1';
                 reset <= '0';
                 UART_WRITE(TXD1,txp,ADDR_BASE_GPIO & "000010",X"0000FFFF");
                 UART_WRITE(TXD1,txp,ADDR_BASE_GPIO & "000001",X"00000A0A");
                 UART_WRITE(TXD1,txp,ADDR_BASE_GPIO & "000001",X"00000B0B");
+                UART_READ(TXD1,RXD1,txp,ADDR_BASE_GPIO & "000001",data_read_v);
+                data_read    <= data_read_v;
+                data_message <= "GPIO_data_write";
                 -- UNSET the LFR reset
                 message_simu <= "2 - LFR UNRESET";
-                UART_WRITE(TXD1,txp,ADDR_BASE_TIME_MANAGMENT & ADDR_LFR_TM_CONTROL   , X"00000000");
+                UNRESET_LFR(TXD1,txp,ADDR_BASE_TIME_MANAGMENT);
-                UART_WRITE(TXD1,txp,ADDR_BASE_TIME_MANAGMENT & ADDR_LFR_TM_TIME_LOAD , X"00000000");
+                --UART_WRITE(TXD1,txp,ADDR_BASE_TIME_MANAGMENT & ADDR_LFR_TM_CONTROL   , X"00000000");
+                --UART_WRITE(TXD1,txp,ADDR_BASE_TIME_MANAGMENT & ADDR_LFR_TM_TIME_LOAD , X"00000000");
                 --
                 message_simu <= "3 - LFR CONFIG ";
                 UART_WRITE(TXD1,txp,ADDR_BASE_LFR & ADDR_LFR_SM_F0_0_ADDR , X"00000B0B");

lib/lpp/lpp_dma/DMA_SubSystem.vhd +3 -3

             USE lpp.iir_filter.ALL;
             USE lpp.FILTERcfg.ALL;
             USE lpp.lpp_memory.ALL;
-            USE lpp.lpp_waveform_pkg.ALL;
+            --USE lpp.lpp_waveform_pkg.ALL;
             USE lpp.lpp_dma_pkg.ALL;
-            USE lpp.lpp_top_lfr_pkg.ALL;
+            --USE lpp.lpp_top_lfr_pkg.ALL;
-            USE lpp.lpp_lfr_pkg.ALL;
+            --USE lpp.lpp_lfr_pkg.ALL;
             USE lpp.general_purpose.ALL;
             LIBRARY techmap;

lib/lpp/lpp_dma/DMA_SubSystem_Arbiter.vhd +3 -3

             USE lpp.iir_filter.ALL;
             USE lpp.FILTERcfg.ALL;
             USE lpp.lpp_memory.ALL;
-            USE lpp.lpp_waveform_pkg.ALL;
+            --USE lpp.lpp_waveform_pkg.ALL;
             USE lpp.lpp_dma_pkg.ALL;
-            USE lpp.lpp_top_lfr_pkg.ALL;
+            --USE lpp.lpp_top_lfr_pkg.ALL;
-            USE lpp.lpp_lfr_pkg.ALL;
+            --USE lpp.lpp_lfr_pkg.ALL;
             USE lpp.general_purpose.ALL;
             LIBRARY techmap;

lib/lpp/lpp_dma/DMA_SubSystem_MUX.vhd +3 -3

             USE lpp.iir_filter.ALL;
             USE lpp.FILTERcfg.ALL;
             USE lpp.lpp_memory.ALL;
-            USE lpp.lpp_waveform_pkg.ALL;
+            --USE lpp.lpp_waveform_pkg.ALL;
             USE lpp.lpp_dma_pkg.ALL;
-            USE lpp.lpp_top_lfr_pkg.ALL;
+            --USE lpp.lpp_top_lfr_pkg.ALL;
-            USE lpp.lpp_lfr_pkg.ALL;
+            --USE lpp.lpp_lfr_pkg.ALL;
             USE lpp.general_purpose.ALL;
             LIBRARY techmap;

lib/lpp/lpp_dma/lpp_dma_singleOrBurst.vhd +1 -1

             USE lpp.apb_devices_list.ALL;
             USE lpp.lpp_memory.ALL;
             USE lpp.lpp_dma_pkg.ALL;
-            USE lpp.lpp_waveform_pkg.ALL;
+            --USE lpp.lpp_waveform_pkg.ALL;
             LIBRARY techmap;
             USE techmap.gencomp.ALL;

lib/lpp/lpp_sim/lpp_sim_pkg.vhd +36 -1

@@ -50,7 +50,15 PACKAGE lpp_sim_pkg IS
50	CONSTANT ADDR : IN STD_LOGIC_VECTOR(31 DOWNTO 2);	50	CONSTANT ADDR : IN STD_LOGIC_VECTOR(31 DOWNTO 2);
51	CONSTANT DATA : IN STD_LOGIC_VECTOR(31 DOWNTO 0)	51	CONSTANT DATA : IN STD_LOGIC_VECTOR(31 DOWNTO 0)
52	);	52	);
53		53	PROCEDURE UART_READ (
		54	SIGNAL TX : OUT STD_LOGIC;
		55	SIGNAL RX : IN STD_LOGIC;
		56	CONSTANT tx_period : IN TIME;
		57	CONSTANT ADDR : IN STD_LOGIC_VECTOR(31 DOWNTO 2);
		58	DATA : OUT STD_LOGIC_VECTOR
		59	);
		60
		61
54	END lpp_sim_pkg;	62	END lpp_sim_pkg;
55		63
56	PACKAGE BODY lpp_sim_pkg IS	64	PACKAGE BODY lpp_sim_pkg IS
@@ -101,4 +109,31 PACKAGE BODY lpp_sim_pkg IS
101	tx_period);	109	tx_period);
102	END;	110	END;
103		111
		112	PROCEDURE UART_READ (
		113	SIGNAL TX : OUT STD_LOGIC;
		114	SIGNAL RX : IN STD_LOGIC;
		115	CONSTANT tx_period : IN TIME;
		116	CONSTANT ADDR : IN STD_LOGIC_VECTOR(31 DOWNTO 2);
		117	DATA : OUT STD_LOGIC_VECTOR )
		118	IS
		119	VARIABLE V_DATA : STD_LOGIC_VECTOR(7 DOWNTO 0);
		120	CONSTANT ADDR_last : STD_LOGIC_VECTOR(7 DOWNTO 0) := ADDR(7 DOWNTO 2) & "00";
		121	BEGIN
		122	txc(TX, 16#80#, tx_period);
		123	txa(TX,
		124	to_integer(UNSIGNED(ADDR(31 DOWNTO 24))),
		125	to_integer(UNSIGNED(ADDR(23 DOWNTO 16))),
		126	to_integer(UNSIGNED(ADDR(15 DOWNTO 8))),
		127	to_integer(UNSIGNED(ADDR_last)),
		128	tx_period);
		129	rxc(RX,V_DATA,tx_period);
		130	DATA(31 DOWNTO 24) := V_DATA;
		131	rxc(RX,V_DATA,tx_period);
		132	DATA(23 DOWNTO 16) := V_DATA;
		133	rxc(RX,V_DATA,tx_period);
		134	DATA(15 DOWNTO 8) := V_DATA;
		135	rxc(RX,V_DATA,tx_period);
		136	DATA(7 DOWNTO 0) := V_DATA;
		137	END;
		138
104	END lpp_sim_pkg;	139	END lpp_sim_pkg;

lib/lpp/lpp_sim/vhdlsim.txt +1 0

@@ -1,2 +1,3
1	lpp_sim_pkg.vhd	1	lpp_sim_pkg.vhd
		2	lpp_lfr_sim_pkg.vhd
2		3

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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