##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » PELLION » VHD_Lib
RSS

Clone from http://pc-instru.lpp.polytechnique.fr:5000/VHD_Lib

WaveFormPicker :...
pellion -
r276:05c1cc175dfc LPP-LFR-em-WaveFormPicker-0-0-8 JC
parent child
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,200
1 ------------------------------------------------------------------------------
2 -- This file is a part of the LPP VHDL IP LIBRARY
3 -- Copyright (C) 2009 - 2012, Laboratory of Plasmas Physic - CNRS
4 --
5 -- This program is free software; you can redistribute it and/or modify
6 -- it under the terms of the GNU General Public License as published by
7 -- the Free Software Foundation; either version 3 of the License, or
8 -- (at your option) any later version.
9 --
10 -- This program is distributed in the hope that it will be useful,
11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 -- GNU General Public License for more details.
14 --
15 -- You should have received a copy of the GNU General Public License
16 -- along with this program; if not, write to the Free Software
17 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18 ------------------------------------------------------------------------------
19 -- Author : Jean-christophe PELLION
20 -- Mail : jean-christophe.pellion@lpp.polytechnique.fr
21 ------------------------------------------------------------------------------
22 LIBRARY IEEE;
23 USE IEEE.std_logic_1164.ALL;
24 USE IEEE.numeric_std.ALL;
25 LIBRARY lpp;
26 USE lpp.lpp_memory.ALL;
27 USE lpp.iir_filter.ALL;
28 USE lpp.lpp_waveform_pkg.ALL;
29
30 LIBRARY techmap;
31 USE techmap.gencomp.ALL;
32
33 ENTITY lpp_waveform_fifo_headreg IS
34 GENERIC(
35 tech : INTEGER := 0
36 );
37 PORT(
38 clk : IN STD_LOGIC;
39 rstn : IN STD_LOGIC;
40 ---------------------------------------------------------------------------
41 run : IN STD_LOGIC;
42 ---------------------------------------------------------------------------
43 o_empty_almost : OUT STD_LOGIC_VECTOR(3 DOWNTO 0); --occupancy is lesser than 16 * 32b
44 o_empty : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
45 o_data_ren : IN STD_LOGIC_VECTOR(3 DOWNTO 0);
46 o_rdata_0 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0); --
47 o_rdata_1 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0); --
48 o_rdata_2 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0); --
49 o_rdata_3 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0); --
50 ---------------------------------------------------------------------------
51 i_empty_almost : IN STD_LOGIC_VECTOR(3 DOWNTO 0);
52 i_empty : IN STD_LOGIC_VECTOR(3 DOWNTO 0);
53 i_data_ren : OUT STD_LOGIC_VECTOR(3 DOWNTO 0); --
54 i_rdata : IN STD_LOGIC_VECTOR(31 DOWNTO 0)
55 );
56 END ENTITY;
57
58
59 ARCHITECTURE ar_lpp_waveform_fifo_headreg OF lpp_waveform_fifo_headreg IS
60 SIGNAL reg_full : STD_LOGIC_VECTOR(3 DOWNTO 0);
61 SIGNAL s_ren : STD_LOGIC_VECTOR(3 DOWNTO 0);
62 SIGNAL s_ren_reg : STD_LOGIC_VECTOR(3 DOWNTO 0);
63 SIGNAL one_ren_and_notEmpty : STD_LOGIC;
64 SIGNAL ren_and_notEmpty : STD_LOGIC_VECTOR(3 DOWNTO 0);
65 SIGNAL s_empty_almost : STD_LOGIC_VECTOR(3 DOWNTO 0);
66 SIGNAL s_rdata_0 : STD_LOGIC_VECTOR(31 DOWNTO 0);
67 SIGNAL s_rdata_1 : STD_LOGIC_VECTOR(31 DOWNTO 0);
68 SIGNAL s_rdata_2 : STD_LOGIC_VECTOR(31 DOWNTO 0);
69 SIGNAL s_rdata_3 : STD_LOGIC_VECTOR(31 DOWNTO 0);
70 BEGIN
71
72 -----------------------------------------------------------------------------
73 -- DATA_REN_FIFO
74 -----------------------------------------------------------------------------
75 i_data_ren <= s_ren;
76 PROCESS (clk, rstn)
77 BEGIN
78 IF rstn = '0' THEN
79 s_ren_reg <= (OTHERS => '1');
80 ELSIF clk'EVENT AND clk = '1' THEN
81 s_ren_reg <= s_ren;
82 END IF;
83 END PROCESS;
84
85 s_ren(0) <= o_data_ren(0) WHEN one_ren_and_notEmpty = '1' ELSE
86 NOT ((NOT i_empty(0)) AND (NOT reg_full(0)));
87 s_ren(1) <= o_data_ren(1) WHEN one_ren_and_notEmpty = '1' ELSE
88 '1' WHEN s_ren(0) = '0' ELSE
89 NOT ((NOT i_empty(1)) AND (NOT reg_full(1)));
90 s_ren(2) <= o_data_ren(2) WHEN one_ren_and_notEmpty = '1' ELSE
91 '1' WHEN s_ren(0) = '0' ELSE
92 '1' WHEN s_ren(1) = '0' ELSE
93 NOT ((NOT i_empty(2)) AND (NOT reg_full(2)));
94 s_ren(3) <= o_data_ren(3) WHEN one_ren_and_notEmpty = '1' ELSE
95 '1' WHEN s_ren(0) = '0' ELSE
96 '1' WHEN s_ren(1) = '0' ELSE
97 '1' WHEN s_ren(2) = '0' ELSE
98 NOT ((NOT i_empty(3)) AND (NOT reg_full(3)));
99 -----------------------------------------------------------------------------
100 all_ren : FOR I IN 3 DOWNTO 0 GENERATE
101 ren_and_notEmpty(I) <= (NOT o_data_ren(I)) AND (NOT i_empty(I));
102 END GENERATE all_ren;
103 one_ren_and_notEmpty <= '0' WHEN ren_and_notEmpty = "0000" ELSE '1';
104
105 -----------------------------------------------------------------------------
106 -- DATA
107 -----------------------------------------------------------------------------
108 o_rdata_0 <= i_rdata WHEN s_ren_reg(0) = '0' AND s_ren(0) = '0' ELSE s_rdata_0;
109 o_rdata_1 <= i_rdata WHEN s_ren_reg(1) = '0' AND s_ren(1) = '0' ELSE s_rdata_1;
110 o_rdata_2 <= i_rdata WHEN s_ren_reg(2) = '0' AND s_ren(2) = '0' ELSE s_rdata_2;
111 o_rdata_3 <= i_rdata WHEN s_ren_reg(3) = '0' AND s_ren(3) = '0' ELSE s_rdata_3;
112
113 PROCESS (clk, rstn)
114 BEGIN
115 IF rstn = '0' THEN
116 s_rdata_0 <= (OTHERS => '0');
117 s_rdata_1 <= (OTHERS => '0');
118 s_rdata_2 <= (OTHERS => '0');
119 s_rdata_3 <= (OTHERS => '0');
120 ELSIF clk'EVENT AND clk = '1' THEN
121 IF s_ren_reg(0) = '0' THEN s_rdata_0 <= i_rdata; END IF;
122 IF s_ren_reg(1) = '0' THEN s_rdata_1 <= i_rdata; END IF;
123 IF s_ren_reg(2) = '0' THEN s_rdata_2 <= i_rdata; END IF;
124 IF s_ren_reg(3) = '0' THEN s_rdata_3 <= i_rdata; END IF;
125 END IF;
126 END PROCESS;
127
128 all_reg_full : FOR I IN 3 DOWNTO 0 GENERATE
129 PROCESS (clk, rstn)
130 BEGIN
131 IF rstn = '0' THEN
132 reg_full(I) <= '0';
133 ELSIF clk'EVENT AND clk = '1' THEN
134 -- IF s_ren_reg(I) = '0' THEN
135 IF s_ren(I) = '0' THEN
136 reg_full(I) <= '1';
137 ELSIF o_data_ren(I) = '0' THEN
138 reg_full(I) <= '0';
139 END IF;
140 END IF;
141 END PROCESS;
142 END GENERATE all_reg_full;
143
144 -----------------------------------------------------------------------------
145 -- EMPTY
146 -----------------------------------------------------------------------------
147 o_empty <= NOT reg_full;
148
149 -----------------------------------------------------------------------------
150 -- EMPTY_ALMOST
151 -----------------------------------------------------------------------------
152 o_empty_almost <= s_empty_almost;
153
154 all_empty_almost: FOR I IN 3 DOWNTO 0 GENERATE
155 PROCESS (clk, rstn)
156 BEGIN -- PROCESS
157 IF rstn = '0' THEN -- asynchronous reset (active low)
158 s_empty_almost(I) <= '1';
159 ELSIF clk'event AND clk = '1' THEN -- rising clock edge
160 -- IF s_ren_reg(I) = '0' THEN
161 IF s_ren(I) = '0' THEN
162 s_empty_almost(I) <= i_empty_almost(I);
163 ELSIF o_data_ren(I) = '0' THEN
164 s_empty_almost(I) <= '1';
165 ELSE
166 IF i_empty_almost(I) = '0' THEN
167 s_empty_almost(I) <= '0';
168 END IF;
169 END IF;
170 END IF;
171 END PROCESS;
172 END GENERATE all_empty_almost;
173
174 END ARCHITECTURE;
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
Show file before | Show file after | Hide comments
@@ -499,7 +499,7 BEGIN
499 pirq_ms => 6,
499 pirq_ms => 6,
500 pirq_wfp => 14,
500 pirq_wfp => 14,
501 hindex => 2,
501 hindex => 2,
502 top_lfr_version => X"00000007")
502 top_lfr_version => X"00000008")
503 PORT MAP (
503 PORT MAP (
504 clk => clkm,
504 clk => clkm,
505 rstn => rstn,
505 rstn => rstn,
Show file before | Show file after | Hide comments
@@ -176,25 +176,19 BEGIN -- beh
176 IO5 <= '0';
176 IO5 <= '0';
177 IO6 <= '0';
177 IO6 <= '0';
178 IO7 <= '0';
178 IO7 <= '0';
179 IO8 <= '0';
179 IO8 <= '1';
180 IO9 <= '0';
181 IO10 <= '0';
182 IO11 <= '0';
183 ELSIF clk_25'event AND clk_25 = '1' THEN -- rising clock edge
180 ELSIF clk_25'event AND clk_25 = '1' THEN -- rising clock edge
184 LED0 <= '0';
181 LED0 <= '0';
185 LED1 <= '1';
182 LED1 <= '1';
186 LED2 <= BP0;
183 LED2 <= BP0;
187 IO1 <= '1';
184 IO1 <= '1';
188 IO2 <= SPW_NOM_DIN OR SPW_NOM_SIN OR SPW_RED_DIN OR SPW_RED_SIN;
185 IO2 <= SPW_NOM_DIN OR SPW_NOM_SIN OR SPW_RED_DIN OR SPW_RED_SIN;
189 IO3 <= ADC_SDO(0);
186 IO3 <= ADC_SDO(0) OR ADC_SDO(1);
190 IO4 <= ADC_SDO(1);
187 IO4 <= ADC_SDO(2) OR ADC_SDO(1);
191 IO5 <= ADC_SDO(2);
188 IO5 <= ADC_SDO(3) OR ADC_SDO(4);
192 IO6 <= ADC_SDO(3);
189 IO6 <= ADC_SDO(5) OR ADC_SDO(6) OR ADC_SDO(7);
193 IO7 <= ADC_SDO(4);
190 IO7 <= BP1 OR nDTR2 OR nRTS2 OR nRTS1;
194 IO8 <= ADC_SDO(5);
191 IO8 <= '0';
195 IO9 <= ADC_SDO(6);
196 IO10 <= ADC_SDO(7);
197 IO11 <= BP1 OR nDTR2 OR nRTS2 OR nRTS1;
198 END IF;
192 END IF;
199 END PROCESS;
193 END PROCESS;
200
194
@@ -239,7 +233,11 BEGIN -- beh
239 ahbmi => ahbi_m_ext ,
233 ahbmi => ahbi_m_ext ,
240 ahbmo => ahbo_m_ext(1),
234 ahbmo => ahbo_m_ext(1),
241 apbi => apbi_ext,
235 apbi => apbi_ext,
242 apbo => apbo_ext(5));
236 apbo => apbo_ext(5),
237 out_ren => IO11,
238 out_send => IO10,
239 out_done => IO9
240 );
243
241
244 -----------------------------------------------------------------------------
242 -----------------------------------------------------------------------------
245
243
@@ -263,7 +261,7 BEGIN -- beh
263 ENABLE_GPT => 1,
261 ENABLE_GPT => 1,
264 NB_AHB_MASTER => NB_AHB_MASTER,
262 NB_AHB_MASTER => NB_AHB_MASTER,
265 NB_AHB_SLAVE => NB_AHB_SLAVE,
263 NB_AHB_SLAVE => NB_AHB_SLAVE,
266 NB_APB_SLAVE => NB_APB_SLAVE)
264 NB_APB_SLAVE => NB_APB_SLAVE)
267 PORT MAP (
265 PORT MAP (
268 clk => clk_25,
266 clk => clk_25,
269 reset => reset,
267 reset => reset,
@@ -289,4 +287,4 BEGIN -- beh
289 ahbi_m_ext => ahbi_m_ext,
287 ahbi_m_ext => ahbi_m_ext,
290 ahbo_m_ext => ahbo_m_ext);
288 ahbo_m_ext => ahbo_m_ext);
291
289
292 END beh; No newline at end of file
290 END beh;
Show file before | Show file after | Hide comments
@@ -59,7 +59,11 ENTITY lpp_debug_dma_singleOrBurst IS
59 ahbmo : OUT AHB_Mst_Out_Type;
59 ahbmo : OUT AHB_Mst_Out_Type;
60 -- AMBA AHB Master Interface
60 -- AMBA AHB Master Interface
61 apbi : IN apb_slv_in_type;
61 apbi : IN apb_slv_in_type;
62 apbo : OUT apb_slv_out_type
62 apbo : OUT apb_slv_out_type;
63 -- observation SIGNAL
64 out_ren : OUT STD_LOGIC;
65 out_send : OUT STD_LOGIC;
66 out_done : OUT STD_LOGIC
63 );
67 );
64 END;
68 END;
65
69
@@ -94,6 +98,9 ARCHITECTURE Behavioral OF lpp_debug_dma
94 SIGNAL prdata : STD_LOGIC_VECTOR(31 DOWNTO 0);
98 SIGNAL prdata : STD_LOGIC_VECTOR(31 DOWNTO 0);
95
99
96 BEGIN
100 BEGIN
101 out_ren <= ren;
102 out_send <= send;
103 out_done <= done;
97
104
98 lpp_dma_singleOrBurst_1 : lpp_dma_singleOrBurst
105 lpp_dma_singleOrBurst_1 : lpp_dma_singleOrBurst
99 GENERIC MAP (
106 GENERIC MAP (
@@ -130,7 +137,7 BEGIN
130 reg.ren <= '0';
137 reg.ren <= '0';
131 reg.addr <= (OTHERS => '0');
138 reg.addr <= (OTHERS => '0');
132 reg.data <= (OTHERS => '0');
139 reg.data <= (OTHERS => '0');
133 reg.nb_ren <= (OTHERS => '0');
140 reg.nb_ren <= (OTHERS => '0');
134
141
135 apbo.pirq <= (OTHERS => '0');
142 apbo.pirq <= (OTHERS => '0');
136 ELSIF HCLK'EVENT AND HCLK = '1' THEN -- rising clock edge
143 ELSIF HCLK'EVENT AND HCLK = '1' THEN -- rising clock edge
@@ -167,14 +174,14 BEGIN
167 -- APB DMA WRITE --
174 -- APB DMA WRITE --
168 CASE paddr(7 DOWNTO 2) IS
175 CASE paddr(7 DOWNTO 2) IS
169 --
176 --
170 WHEN "000000" => reg.run <= apbi.pwdata(0);
177 WHEN "000000" => reg.run <= apbi.pwdata(0);
171 reg.send <= apbi.pwdata(1);
178 reg.send <= apbi.pwdata(1);
172 reg.valid_burst <= apbi.pwdata(2);
179 reg.valid_burst <= apbi.pwdata(2);
173 reg.done <= apbi.pwdata(3);
180 reg.done <= apbi.pwdata(3);
174 reg.ren <= apbi.pwdata(4);
181 reg.ren <= apbi.pwdata(4);
175 WHEN "000001" => reg.addr <= apbi.pwdata;
182 WHEN "000001" => reg.addr <= apbi.pwdata;
176 WHEN "000010" => reg.data <= apbi.pwdata;
183 WHEN "000010" => reg.data <= apbi.pwdata;
177 WHEN "000011" => reg.nb_ren <= apbi.pwdata;
184 --WHEN "000011" => reg.nb_ren <= apbi.pwdata;
178 WHEN OTHERS => NULL;
185 WHEN OTHERS => NULL;
179 END CASE;
186 END CASE;
180 END IF;
187 END IF;
@@ -189,4 +196,4 BEGIN
189
196
190
197
191
198
192 END Behavioral; No newline at end of file
199 END Behavioral;
Show file before | Show file after | Hide comments
@@ -40,7 +40,10 PACKAGE lpp_debug_lfr_pkg IS
40 ahbmi : IN AHB_Mst_In_Type;
40 ahbmi : IN AHB_Mst_In_Type;
41 ahbmo : OUT AHB_Mst_Out_Type;
41 ahbmo : OUT AHB_Mst_Out_Type;
42 apbi : IN apb_slv_in_type;
42 apbi : IN apb_slv_in_type;
43 apbo : OUT apb_slv_out_type);
43 apbo : OUT apb_slv_out_type;
44 out_ren : OUT STD_LOGIC;
45 out_send : OUT STD_LOGIC;
46 out_done : OUT STD_LOGIC );
44 END COMPONENT;
47 END COMPONENT;
45
48
46 END;
49 END;
Show file before | Show file after | Hide comments
@@ -167,10 +167,17 BEGIN -- beh
167
167
168 DMAIn.Data <= data;
168 DMAIn.Data <= data;
169
169
170 ren <= '0' WHEN DMAOut.OKAY = '1' AND state = SEND_DATA ELSE
171 '1';
172 -- \/ JC - 10/12/2013 \/
170 --ren <= '0' WHEN DMAOut.OKAY = '1' AND state = SEND_DATA ELSE
173 --ren <= '0' WHEN DMAOut.OKAY = '1' AND state = SEND_DATA ELSE
171 -- '0' WHEN state = REQUEST_BUS AND DMAOut.Grant = '1' ELSE
174 -- '0' WHEN state = REQUEST_BUS AND DMAOut.Grant = '1' ELSE
172 -- '1';
175 -- '1';
173 ren <= '0' WHEN state = SEND_DATA ELSE
176 -- /\ JC - 10/12/2013 /\
174 '1';
177
178 -- \/ JC - 09/12/2013 \/
179 --ren <= '0' WHEN state = SEND_DATA ELSE
180 -- '1';
181 -- /\ JC - 09/12/2013 /\
175
182
176 END beh;
183 END beh;
Show file before | Show file after | Hide comments
@@ -39,7 +39,7 ENTITY lpp_lfr IS
39
39
40 hindex : INTEGER := 2;
40 hindex : INTEGER := 2;
41
41
42 top_lfr_version : STD_LOGIC_VECTOR(31 DOWNTO 0)
42 top_lfr_version : STD_LOGIC_VECTOR(31 DOWNTO 0) := (OTHERS => '0')
43
43
44 );
44 );
45 PORT (
45 PORT (
@@ -354,10 +354,10 BEGIN
354 debug_reg6 <= sample_f0_data(32*2-1 DOWNTO 32*1);
354 debug_reg6 <= sample_f0_data(32*2-1 DOWNTO 32*1);
355 debug_reg7 <= sample_f0_data(32*3-1 DOWNTO 32*2);
355 debug_reg7 <= sample_f0_data(32*3-1 DOWNTO 32*2);
356 -----------------------------------------------------------------------------
356 -----------------------------------------------------------------------------
357 sample_f0_data_debug <= x"01234567" & x"89ABCDEF" & x"02481357"; -- TODO : debug
357 --sample_f0_data_debug <= x"01234567" & x"89ABCDEF" & x"02481357"; -- TODO : debug
358 sample_f1_data_debug <= x"00112233" & x"44556677" & x"8899AABB"; -- TODO : debug
358 --sample_f1_data_debug <= x"00112233" & x"44556677" & x"8899AABB"; -- TODO : debug
359 sample_f2_data_debug <= x"CDEF1234" & x"ABBAEFFE" & x"01103773"; -- TODO : debug
359 --sample_f2_data_debug <= x"CDEF1234" & x"ABBAEFFE" & x"01103773"; -- TODO : debug
360 sample_f3_data_debug <= x"FEDCBA98" & x"76543210" & x"78945612"; -- TODO : debug
360 --sample_f3_data_debug <= x"FEDCBA98" & x"76543210" & x"78945612"; -- TODO : debug
361
361
362
362
363 -----------------------------------------------------------------------------
363 -----------------------------------------------------------------------------
@@ -405,19 +405,19 BEGIN
405 --f0
405 --f0
406 addr_data_f0 => addr_data_f0,
406 addr_data_f0 => addr_data_f0,
407 data_f0_in_valid => sample_f0_val,
407 data_f0_in_valid => sample_f0_val,
408 data_f0_in => sample_f0_data_debug, -- TODO : debug
408 data_f0_in => sample_f0_data, -- sample_f0_data_debug, -- TODO : debug
409 --f1
409 --f1
410 addr_data_f1 => addr_data_f1,
410 addr_data_f1 => addr_data_f1,
411 data_f1_in_valid => sample_f1_val,
411 data_f1_in_valid => sample_f1_val,
412 data_f1_in => sample_f1_data_debug, -- TODO : debug,
412 data_f1_in => sample_f1_data, -- sample_f1_data_debug, -- TODO : debug,
413 --f2
413 --f2
414 addr_data_f2 => addr_data_f2,
414 addr_data_f2 => addr_data_f2,
415 data_f2_in_valid => sample_f2_val,
415 data_f2_in_valid => sample_f2_val,
416 data_f2_in => sample_f2_data_debug, -- TODO : debug,
416 data_f2_in => sample_f2_data, -- sample_f2_data_debug, -- TODO : debug,
417 --f3
417 --f3
418 addr_data_f3 => addr_data_f3,
418 addr_data_f3 => addr_data_f3,
419 data_f3_in_valid => sample_f3_val,
419 data_f3_in_valid => sample_f3_val,
420 data_f3_in => sample_f3_data_debug, -- TODO : debug,
420 data_f3_in => sample_f3_data, -- sample_f3_data_debug, -- TODO : debug,
421 -- OUTPUT -- DMA interface
421 -- OUTPUT -- DMA interface
422 --f0
422 --f0
423 data_f0_addr_out => data_f0_addr_out_s,
423 data_f0_addr_out => data_f0_addr_out_s,
Show file before | Show file after | Hide comments
@@ -180,14 +180,14 PACKAGE lpp_lfr_pkg IS
180 addr_data_f3 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
180 addr_data_f3 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
181 start_date : OUT STD_LOGIC_VECTOR(30 DOWNTO 0);
181 start_date : OUT STD_LOGIC_VECTOR(30 DOWNTO 0);
182 ---------------------------------------------------------------------------
182 ---------------------------------------------------------------------------
183 debug_reg0 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
183 debug_reg0 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
184 debug_reg1 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
184 debug_reg1 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
185 debug_reg2 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
185 debug_reg2 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
186 debug_reg3 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
186 debug_reg3 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
187 debug_reg4 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
187 debug_reg4 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
188 debug_reg5 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
188 debug_reg5 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
189 debug_reg6 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
189 debug_reg6 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
190 debug_reg7 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0));
190 debug_reg7 : IN STD_LOGIC_VECTOR(31 DOWNTO 0));
191 END COMPONENT;
191 END COMPONENT;
192
192
193 COMPONENT lpp_top_ms
193 COMPONENT lpp_top_ms
Show file before | Show file after | Hide comments
@@ -39,13 +39,13 USE techmap.gencomp.ALL;
39 ENTITY lpp_waveform IS
39 ENTITY lpp_waveform IS
40
40
41 GENERIC (
41 GENERIC (
42 tech : INTEGER := inferred;
42 tech : INTEGER := inferred;
43 data_size : INTEGER := 96; --16*6
43 data_size : INTEGER := 96; --16*6
44 nb_data_by_buffer_size : INTEGER := 11;
44 nb_data_by_buffer_size : INTEGER := 11;
45 nb_word_by_buffer_size : INTEGER := 11;
45 nb_word_by_buffer_size : INTEGER := 11;
46 nb_snapshot_param_size : INTEGER := 11;
46 nb_snapshot_param_size : INTEGER := 11;
47 delta_vector_size : INTEGER := 20;
47 delta_vector_size : INTEGER := 20;
48 delta_vector_size_f0_2 : INTEGER := 3);
48 delta_vector_size_f0_2 : INTEGER := 3);
49
49
50 PORT (
50 PORT (
51 clk : IN STD_LOGIC;
51 clk : IN STD_LOGIC;
@@ -75,32 +75,32 ENTITY lpp_waveform IS
75
75
76 nb_data_by_buffer : IN STD_LOGIC_VECTOR(nb_data_by_buffer_size-1 DOWNTO 0);
76 nb_data_by_buffer : IN STD_LOGIC_VECTOR(nb_data_by_buffer_size-1 DOWNTO 0);
77 nb_word_by_buffer : IN STD_LOGIC_VECTOR(nb_word_by_buffer_size-1 DOWNTO 0);
77 nb_word_by_buffer : IN STD_LOGIC_VECTOR(nb_word_by_buffer_size-1 DOWNTO 0);
78 nb_snapshot_param : IN STD_LOGIC_VECTOR(nb_snapshot_param_size-1 DOWNTO 0);
78 nb_snapshot_param : IN STD_LOGIC_VECTOR(nb_snapshot_param_size-1 DOWNTO 0);
79 status_full : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
79 status_full : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
80 status_full_ack : IN STD_LOGIC_VECTOR(3 DOWNTO 0);
80 status_full_ack : IN STD_LOGIC_VECTOR(3 DOWNTO 0);
81 status_full_err : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
81 status_full_err : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
82 status_new_err : OUT STD_LOGIC_VECTOR(3 DOWNTO 0); -- New data f(i) before the current data is write by dma
82 status_new_err : OUT STD_LOGIC_VECTOR(3 DOWNTO 0); -- New data f(i) before the current data is write by dma
83 ---------------------------------------------------------------------------
83 ---------------------------------------------------------------------------
84 -- INPUT
84 -- INPUT
85 coarse_time : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
85 coarse_time : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
86 fine_time : IN STD_LOGIC_VECTOR(15 DOWNTO 0);
86 fine_time : IN STD_LOGIC_VECTOR(15 DOWNTO 0);
87
87
88 --f0
88 --f0
89 addr_data_f0 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
89 addr_data_f0 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
90 data_f0_in_valid : IN STD_LOGIC;
90 data_f0_in_valid : IN STD_LOGIC;
91 data_f0_in : IN STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
91 data_f0_in : IN STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
92 --f1
92 --f1
93 addr_data_f1 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
93 addr_data_f1 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
94 data_f1_in_valid : IN STD_LOGIC;
94 data_f1_in_valid : IN STD_LOGIC;
95 data_f1_in : IN STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
95 data_f1_in : IN STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
96 --f2
96 --f2
97 addr_data_f2 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
97 addr_data_f2 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
98 data_f2_in_valid : IN STD_LOGIC;
98 data_f2_in_valid : IN STD_LOGIC;
99 data_f2_in : IN STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
99 data_f2_in : IN STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
100 --f3
100 --f3
101 addr_data_f3 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
101 addr_data_f3 : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
102 data_f3_in_valid : IN STD_LOGIC;
102 data_f3_in_valid : IN STD_LOGIC;
103 data_f3_in : IN STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
103 data_f3_in : IN STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
104
104
105 ---------------------------------------------------------------------------
105 ---------------------------------------------------------------------------
106 -- OUTPUT
106 -- OUTPUT
@@ -109,35 +109,35 ENTITY lpp_waveform IS
109 data_f0_data_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
109 data_f0_data_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
110 data_f0_data_out_valid : OUT STD_LOGIC;
110 data_f0_data_out_valid : OUT STD_LOGIC;
111 data_f0_data_out_valid_burst : OUT STD_LOGIC;
111 data_f0_data_out_valid_burst : OUT STD_LOGIC;
112 data_f0_data_out_ren : IN STD_LOGIC;
112 data_f0_data_out_ren : IN STD_LOGIC;
113 --f1
113 --f1
114 data_f1_addr_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
114 data_f1_addr_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
115 data_f1_data_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
115 data_f1_data_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
116 data_f1_data_out_valid : OUT STD_LOGIC;
116 data_f1_data_out_valid : OUT STD_LOGIC;
117 data_f1_data_out_valid_burst : OUT STD_LOGIC;
117 data_f1_data_out_valid_burst : OUT STD_LOGIC;
118 data_f1_data_out_ren : IN STD_LOGIC;
118 data_f1_data_out_ren : IN STD_LOGIC;
119 --f2
119 --f2
120 data_f2_addr_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
120 data_f2_addr_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
121 data_f2_data_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
121 data_f2_data_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
122 data_f2_data_out_valid : OUT STD_LOGIC;
122 data_f2_data_out_valid : OUT STD_LOGIC;
123 data_f2_data_out_valid_burst : OUT STD_LOGIC;
123 data_f2_data_out_valid_burst : OUT STD_LOGIC;
124 data_f2_data_out_ren : IN STD_LOGIC;
124 data_f2_data_out_ren : IN STD_LOGIC;
125 --f3
125 --f3
126 data_f3_addr_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
126 data_f3_addr_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
127 data_f3_data_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
127 data_f3_data_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
128 data_f3_data_out_valid : OUT STD_LOGIC;
128 data_f3_data_out_valid : OUT STD_LOGIC;
129 data_f3_data_out_valid_burst : OUT STD_LOGIC;
129 data_f3_data_out_valid_burst : OUT STD_LOGIC;
130 data_f3_data_out_ren : IN STD_LOGIC;
130 data_f3_data_out_ren : IN STD_LOGIC;
131
131
132 --debug
132 --debug
133 debug_f0_data : OUT STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
133 debug_f0_data : OUT STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
134 debug_f0_data_valid : OUT STD_LOGIC;
134 debug_f0_data_valid : OUT STD_LOGIC;
135 debug_f1_data : OUT STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
135 debug_f1_data : OUT STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
136 debug_f1_data_valid : OUT STD_LOGIC;
136 debug_f1_data_valid : OUT STD_LOGIC;
137 debug_f2_data : OUT STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
137 debug_f2_data : OUT STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
138 debug_f2_data_valid : OUT STD_LOGIC;
138 debug_f2_data_valid : OUT STD_LOGIC;
139 debug_f3_data : OUT STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
139 debug_f3_data : OUT STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
140 debug_f3_data_valid : OUT STD_LOGIC
140 debug_f3_data_valid : OUT STD_LOGIC
141 );
141 );
142
142
143 END lpp_waveform;
143 END lpp_waveform;
@@ -167,10 +167,10 ARCHITECTURE beh OF lpp_waveform IS
167 SIGNAL data_wen : STD_LOGIC_VECTOR(3 DOWNTO 0);
167 SIGNAL data_wen : STD_LOGIC_VECTOR(3 DOWNTO 0);
168 SIGNAL time_wen : STD_LOGIC_VECTOR(3 DOWNTO 0);
168 SIGNAL time_wen : STD_LOGIC_VECTOR(3 DOWNTO 0);
169 SIGNAL wdata : STD_LOGIC_VECTOR(31 DOWNTO 0);
169 SIGNAL wdata : STD_LOGIC_VECTOR(31 DOWNTO 0);
170 SIGNAL full_almost : STD_LOGIC_VECTOR(3 DOWNTO 0);
170 SIGNAL full_almost : STD_LOGIC_VECTOR(3 DOWNTO 0);
171 SIGNAL full : STD_LOGIC_VECTOR(3 DOWNTO 0);
171 SIGNAL full : STD_LOGIC_VECTOR(3 DOWNTO 0);
172 SIGNAL empty_almost : STD_LOGIC_VECTOR(3 DOWNTO 0);
172 SIGNAL empty_almost : STD_LOGIC_VECTOR(3 DOWNTO 0);
173 SIGNAL empty : STD_LOGIC_VECTOR(3 DOWNTO 0);
173 SIGNAL empty : STD_LOGIC_VECTOR(3 DOWNTO 0);
174 --
174 --
175 SIGNAL data_ren : STD_LOGIC_VECTOR(3 DOWNTO 0);
175 SIGNAL data_ren : STD_LOGIC_VECTOR(3 DOWNTO 0);
176 SIGNAL time_ren : STD_LOGIC_VECTOR(3 DOWNTO 0);
176 SIGNAL time_ren : STD_LOGIC_VECTOR(3 DOWNTO 0);
@@ -179,13 +179,19 ARCHITECTURE beh OF lpp_waveform IS
179 --
179 --
180 SIGNAL run : STD_LOGIC;
180 SIGNAL run : STD_LOGIC;
181 --
181 --
182 TYPE TIME_VECTOR IS ARRAY (NATURAL RANGE <>) OF STD_LOGIC_VECTOR(47 DOWNTO 0);
182 TYPE TIME_VECTOR IS ARRAY (NATURAL RANGE <>) OF STD_LOGIC_VECTOR(47 DOWNTO 0);
183 SIGNAL data_out : Data_Vector(3 DOWNTO 0, 95 DOWNTO 0);
183 SIGNAL data_out : Data_Vector(3 DOWNTO 0, 95 DOWNTO 0);
184 SIGNAL time_out_2 : Data_Vector(3 DOWNTO 0, 47 DOWNTO 0);
184 SIGNAL time_out_2 : Data_Vector(3 DOWNTO 0, 47 DOWNTO 0);
185 SIGNAL time_out : TIME_VECTOR(3 DOWNTO 0);
185 SIGNAL time_out : TIME_VECTOR(3 DOWNTO 0);
186 SIGNAL time_out_debug : TIME_VECTOR(3 DOWNTO 0); -- TODO : debug
186 SIGNAL time_out_debug : TIME_VECTOR(3 DOWNTO 0); -- TODO : debug
187 SIGNAL time_reg1 : STD_LOGIC_VECTOR(47 DOWNTO 0);
187 SIGNAL time_reg1 : STD_LOGIC_VECTOR(47 DOWNTO 0);
188 SIGNAL time_reg2 : STD_LOGIC_VECTOR(47 DOWNTO 0);
188 SIGNAL time_reg2 : STD_LOGIC_VECTOR(47 DOWNTO 0);
189 --
190
191 SIGNAL s_empty_almost : STD_LOGIC_VECTOR(3 DOWNTO 0); --occupancy is lesser than 16 * 32b
192 SIGNAL s_empty : STD_LOGIC_VECTOR(3 DOWNTO 0);
193 SIGNAL s_data_ren : STD_LOGIC_VECTOR(3 DOWNTO 0);
194 SIGNAL s_rdata : STD_LOGIC_VECTOR(31 DOWNTO 0);
189
195
190 BEGIN -- beh
196 BEGIN -- beh
191
197
@@ -228,7 +234,7 BEGIN -- beh
228 data_in_valid => data_f0_in_valid,
234 data_in_valid => data_f0_in_valid,
229 data_out => data_f0_out,
235 data_out => data_f0_out,
230 data_out_valid => data_f0_out_valid);
236 data_out_valid => data_f0_out_valid);
231
237
232 nb_snapshot_param_more_one <= ('0' & nb_snapshot_param) + 1;
238 nb_snapshot_param_more_one <= ('0' & nb_snapshot_param) + 1;
233
239
234 lpp_waveform_snapshot_f1 : lpp_waveform_snapshot
240 lpp_waveform_snapshot_f1 : lpp_waveform_snapshot
@@ -295,12 +301,12 BEGIN -- beh
295 IF rstn = '0' THEN -- asynchronous reset (active low)
301 IF rstn = '0' THEN -- asynchronous reset (active low)
296 time_reg1 <= (OTHERS => '0');
302 time_reg1 <= (OTHERS => '0');
297 time_reg2 <= (OTHERS => '0');
303 time_reg2 <= (OTHERS => '0');
298 ELSIF clk'event AND clk = '1' THEN -- rising clock edge
304 ELSIF clk'EVENT AND clk = '1' THEN -- rising clock edge
299 time_reg1 <= fine_time & coarse_time;
305 time_reg1 <= fine_time & coarse_time;
300 time_reg2 <= time_reg1;
306 time_reg2 <= time_reg1;
301 END IF;
307 END IF;
302 END PROCESS;
308 END PROCESS;
303
309
304 valid_in <= data_f3_out_valid & data_f2_out_valid & data_f1_out_valid & data_f0_out_valid;
310 valid_in <= data_f3_out_valid & data_f2_out_valid & data_f1_out_valid & data_f0_out_valid;
305 all_input_valid : FOR i IN 3 DOWNTO 0 GENERATE
311 all_input_valid : FOR i IN 3 DOWNTO 0 GENERATE
306 lpp_waveform_dma_genvalid_I : lpp_waveform_dma_genvalid
312 lpp_waveform_dma_genvalid_I : lpp_waveform_dma_genvalid
@@ -310,46 +316,48 BEGIN -- beh
310 run => run,
316 run => run,
311 valid_in => valid_in(I),
317 valid_in => valid_in(I),
312 ack_in => valid_ack(I),
318 ack_in => valid_ack(I),
313 time_in => time_reg2, -- Todo
319 time_in => time_reg2, -- Todo
314 valid_out => valid_out(I),
320 valid_out => valid_out(I),
315 time_out => time_out(I), -- Todo
321 time_out => time_out(I), -- Todo
316 error => status_new_err(I));
322 error => status_new_err(I));
317 END GENERATE all_input_valid;
323 END GENERATE all_input_valid;
318
324
319 all_bit_of_data_out: FOR I IN 95 DOWNTO 0 GENERATE
325 all_bit_of_data_out : FOR I IN 95 DOWNTO 0 GENERATE
320 data_out(0,I) <= data_f0_out(I);
326 data_out(0, I) <= data_f0_out(I);
321 data_out(1,I) <= data_f1_out(I);
327 data_out(1, I) <= data_f1_out(I);
322 data_out(2,I) <= data_f2_out(I);
328 data_out(2, I) <= data_f2_out(I);
323 data_out(3,I) <= data_f3_out(I);
329 data_out(3, I) <= data_f3_out(I);
324 END GENERATE all_bit_of_data_out;
330 END GENERATE all_bit_of_data_out;
325
331
326 -----------------------------------------------------------------------------
332 -----------------------------------------------------------------------------
327 -- TODO : debug
333 -- TODO : debug
328 -----------------------------------------------------------------------------
334 -----------------------------------------------------------------------------
329 --all_bit_of_time_out: FOR I IN 47 DOWNTO 0 GENERATE
335 all_bit_of_time_out: FOR I IN 47 DOWNTO 0 GENERATE
330 -- all_sample_of_time_out: FOR J IN 3 DOWNTO 0 GENERATE
336 all_sample_of_time_out: FOR J IN 3 DOWNTO 0 GENERATE
331 -- time_out_2(J,I) <= time_out(J)(I);
337 time_out_2(J,I) <= time_out(J)(I);
338 END GENERATE all_sample_of_time_out;
339 END GENERATE all_bit_of_time_out;
340
341 -- DEBUG --
342 --time_out_debug(0) <= x"0A0A" & x"0A0A0A0A";
343 --time_out_debug(1) <= x"1B1B" & x"1B1B1B1B";
344 --time_out_debug(2) <= x"2C2C" & x"2C2C2C2C";
345 --time_out_debug(3) <= x"3D3D" & x"3D3D3D3D";
346
347 --all_bit_of_time_out : FOR I IN 47 DOWNTO 0 GENERATE
348 -- all_sample_of_time_out : FOR J IN 3 DOWNTO 0 GENERATE
349 -- time_out_2(J, I) <= time_out_debug(J)(I);
332 -- END GENERATE all_sample_of_time_out;
350 -- END GENERATE all_sample_of_time_out;
333 --END GENERATE all_bit_of_time_out;
351 --END GENERATE all_bit_of_time_out;
334
352 -- DEBUG --
335 time_out_debug(0) <= x"0A0A" & x"0A0A0A0A";
336 time_out_debug(1) <= x"1B1B" & x"1B1B1B1B";
337 time_out_debug(2) <= x"2C2C" & x"2C2C2C2C";
338 time_out_debug(3) <= x"3D3D" & x"3D3D3D3D";
339
340 all_bit_of_time_out: FOR I IN 47 DOWNTO 0 GENERATE
341 all_sample_of_time_out: FOR J IN 3 DOWNTO 0 GENERATE
342 time_out_2(J,I) <= time_out_debug(J)(I);
343 END GENERATE all_sample_of_time_out;
344 END GENERATE all_bit_of_time_out;
345
353
346 lpp_waveform_fifo_arbiter_1 : lpp_waveform_fifo_arbiter
354 lpp_waveform_fifo_arbiter_1 : lpp_waveform_fifo_arbiter
347 GENERIC MAP (tech => tech,
355 GENERIC MAP (tech => tech,
348 nb_data_by_buffer_size =>nb_data_by_buffer_size)
356 nb_data_by_buffer_size => nb_data_by_buffer_size)
349 PORT MAP (
357 PORT MAP (
350 clk => clk,
358 clk => clk,
351 rstn => rstn,
359 rstn => rstn,
352 run => run,
360 run => run,
353 nb_data_by_buffer => nb_data_by_buffer,
361 nb_data_by_buffer => nb_data_by_buffer,
354 data_in_valid => valid_out,
362 data_in_valid => valid_out,
355 data_in_ack => valid_ack,
363 data_in_ack => valid_ack,
@@ -358,33 +366,53 BEGIN -- beh
358
366
359 data_out => wdata,
367 data_out => wdata,
360 data_out_wen => data_wen,
368 data_out_wen => data_wen,
361 full_almost => full_almost,
369 full_almost => full_almost,
362 full => full);
370 full => full);
363
371
364 lpp_waveform_fifo_1 : lpp_waveform_fifo
372 lpp_waveform_fifo_1 : lpp_waveform_fifo
365 GENERIC MAP (tech => tech)
373 GENERIC MAP (tech => tech)
366 PORT MAP (
374 PORT MAP (
367 clk => clk,
375 clk => clk,
368 rstn => rstn,
376 rstn => rstn,
369 run => run,
377 run => run,
370
378
371 empty => empty,
379 empty => s_empty,
372 empty_almost => empty_almost,
380 empty_almost => s_empty_almost,
373
381 data_ren => s_data_ren,
374 data_ren => data_ren,
382 rdata => s_rdata,
375 rdata => rdata,
376
383
377
384
378 full_almost => full_almost,
385 full_almost => full_almost,
379 full => full,
386 full => full,
380 data_wen => data_wen,
387 data_wen => data_wen,
381 wdata => wdata);
388 wdata => wdata);
382
389
383 data_f0_data_out <= rdata;
390 lpp_waveform_fifo_headreg_1 : lpp_waveform_fifo_headreg
384 data_f1_data_out <= rdata;
391 GENERIC MAP (tech => tech)
385 data_f2_data_out <= rdata;
392 PORT MAP (
386 data_f3_data_out <= rdata;
393 clk => clk,
387
394 rstn => rstn,
395 run => run,
396 o_empty_almost => empty_almost,
397 o_empty => empty,
398
399 o_data_ren => data_ren,
400 o_rdata_0 => data_f0_data_out,
401 o_rdata_1 => data_f1_data_out,
402 o_rdata_2 => data_f2_data_out,
403 o_rdata_3 => data_f3_data_out,
404
405 i_empty_almost => s_empty_almost,
406 i_empty => s_empty,
407 i_data_ren => s_data_ren,
408 i_rdata => s_rdata);
409
410
411 --data_f0_data_out <= rdata;
412 --data_f1_data_out <= rdata;
413 --data_f2_data_out <= rdata;
414 --data_f3_data_out <= rdata;
415
388 data_ren <= data_f3_data_out_ren &
416 data_ren <= data_f3_data_out_ren &
389 data_f2_data_out_ren &
417 data_f2_data_out_ren &
390 data_f1_data_out_ren &
418 data_f1_data_out_ren &
@@ -401,12 +429,12 BEGIN -- beh
401 -------------------------------------------------------------------------
429 -------------------------------------------------------------------------
402 -- CONFIG
430 -- CONFIG
403 -------------------------------------------------------------------------
431 -------------------------------------------------------------------------
404 nb_data_by_buffer => nb_word_by_buffer,
432 nb_data_by_buffer => nb_word_by_buffer,
405
433
406 addr_data_f0 => addr_data_f0,
434 addr_data_f0 => addr_data_f0,
407 addr_data_f1 => addr_data_f1,
435 addr_data_f1 => addr_data_f1,
408 addr_data_f2 => addr_data_f2,
436 addr_data_f2 => addr_data_f2,
409 addr_data_f3 => addr_data_f3,
437 addr_data_f3 => addr_data_f3,
410 -------------------------------------------------------------------------
438 -------------------------------------------------------------------------
411 -- CTRL
439 -- CTRL
412 -------------------------------------------------------------------------
440 -------------------------------------------------------------------------
@@ -414,14 +442,14 BEGIN -- beh
414 empty => empty,
442 empty => empty,
415 empty_almost => empty_almost,
443 empty_almost => empty_almost,
416 data_ren => data_ren,
444 data_ren => data_ren,
417
445
418 -------------------------------------------------------------------------
446 -------------------------------------------------------------------------
419 -- STATUS
447 -- STATUS
420 -------------------------------------------------------------------------
448 -------------------------------------------------------------------------
421 status_full => status_full,
449 status_full => status_full,
422 status_full_ack => status_full_ack,
450 status_full_ack => status_full_ack,
423 status_full_err => status_full_err,
451 status_full_err => status_full_err,
424
452
425 -------------------------------------------------------------------------
453 -------------------------------------------------------------------------
426 -- ADDR DATA OUT
454 -- ADDR DATA OUT
427 -------------------------------------------------------------------------
455 -------------------------------------------------------------------------
@@ -429,16 +457,16 BEGIN -- beh
429 data_f1_data_out_valid_burst => data_f1_data_out_valid_burst,
457 data_f1_data_out_valid_burst => data_f1_data_out_valid_burst,
430 data_f2_data_out_valid_burst => data_f2_data_out_valid_burst,
458 data_f2_data_out_valid_burst => data_f2_data_out_valid_burst,
431 data_f3_data_out_valid_burst => data_f3_data_out_valid_burst,
459 data_f3_data_out_valid_burst => data_f3_data_out_valid_burst,
432
460
433 data_f0_data_out_valid => data_f0_data_out_valid,
461 data_f0_data_out_valid => data_f0_data_out_valid,
434 data_f1_data_out_valid => data_f1_data_out_valid,
462 data_f1_data_out_valid => data_f1_data_out_valid,
435 data_f2_data_out_valid => data_f2_data_out_valid,
463 data_f2_data_out_valid => data_f2_data_out_valid,
436 data_f3_data_out_valid => data_f3_data_out_valid,
464 data_f3_data_out_valid => data_f3_data_out_valid,
437
465
438 data_f0_addr_out => data_f0_addr_out,
466 data_f0_addr_out => data_f0_addr_out,
439 data_f1_addr_out => data_f1_addr_out,
467 data_f1_addr_out => data_f1_addr_out,
440 data_f2_addr_out => data_f2_addr_out,
468 data_f2_addr_out => data_f2_addr_out,
441 data_f3_addr_out => data_f3_addr_out
469 data_f3_addr_out => data_f3_addr_out
442 );
470 );
443
471
444 END beh;
472 END beh;
Show file before | Show file after | Hide comments
@@ -251,6 +251,26 PACKAGE lpp_waveform_pkg IS
251 wdata : IN STD_LOGIC_VECTOR(31 DOWNTO 0));
251 wdata : IN STD_LOGIC_VECTOR(31 DOWNTO 0));
252 END COMPONENT;
252 END COMPONENT;
253
253
254 COMPONENT lpp_waveform_fifo_headreg
255 GENERIC (
256 tech : INTEGER);
257 PORT (
258 clk : IN STD_LOGIC;
259 rstn : IN STD_LOGIC;
260 run : IN STD_LOGIC;
261 o_empty_almost : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
262 o_empty : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
263 o_data_ren : IN STD_LOGIC_VECTOR(3 DOWNTO 0);
264 o_rdata_0 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
265 o_rdata_1 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
266 o_rdata_2 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
267 o_rdata_3 : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
268 i_empty_almost : IN STD_LOGIC_VECTOR(3 DOWNTO 0);
269 i_empty : IN STD_LOGIC_VECTOR(3 DOWNTO 0);
270 i_data_ren : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
271 i_rdata : IN STD_LOGIC_VECTOR(31 DOWNTO 0));
272 END COMPONENT;
273
254 COMPONENT lpp_waveform_fifo_latencyCorrection
274 COMPONENT lpp_waveform_fifo_latencyCorrection
255 GENERIC (
275 GENERIC (
256 tech : INTEGER);
276 tech : INTEGER);
Show file before | Show file after | Hide comments
@@ -6,6 +6,7 lpp_waveform_fifo_latencyCorrection.vhd
6 lpp_waveform_fifo.vhd
6 lpp_waveform_fifo.vhd
7 lpp_waveform_fifo_arbiter.vhd
7 lpp_waveform_fifo_arbiter.vhd
8 lpp_waveform_fifo_ctrl.vhd
8 lpp_waveform_fifo_ctrl.vhd
9 lpp_waveform_fifo_headreg.vhd
9 lpp_waveform_snapshot.vhd
10 lpp_waveform_snapshot.vhd
10 lpp_waveform_snapshot_controler.vhd
11 lpp_waveform_snapshot_controler.vhd
11 lpp_waveform_genaddress.vhd
12 lpp_waveform_genaddress.vhd
General Comments 0
You need to be logged in to leave comments. Login now