##// END OF EJS Templates
(MINI-LFR) WFP_MS_0-1-39...
pellion -
r484:5ac3ea1d915f JC
parent child
Show More
@@ -202,6 +202,7 BEGIN
202 X"4000D000");
202 X"4000D000");
203
203
204 UART_WRITE(TXD1 ,txp,ADDR_BASE_LFR & ADDR_LFR_WP_LENGTH, X"0000000F");
204 UART_WRITE(TXD1 ,txp,ADDR_BASE_LFR & ADDR_LFR_WP_LENGTH, X"0000000F");
205 UART_WRITE(TXD1 ,txp,ADDR_BASE_LFR & ADDR_LFR_WP_DATA_IN_BUFFER, X"00000050");
205
206
206 message_simu <= "4 - GO GO GO !!";
207 message_simu <= "4 - GO GO GO !!";
207 UART_WRITE (TXD1 ,txp,ADDR_BASE_LFR & ADDR_LFR_WP_START_DATE,X"00000000");
208 UART_WRITE (TXD1 ,txp,ADDR_BASE_LFR & ADDR_LFR_WP_START_DATE,X"00000000");
@@ -188,6 +188,8 ARCHITECTURE beh OF lpp_waveform IS
188
188
189 SIGNAL fifo_buffer_time : STD_LOGIC_VECTOR(48*4-1 DOWNTO 0);
189 SIGNAL fifo_buffer_time : STD_LOGIC_VECTOR(48*4-1 DOWNTO 0);
190
190
191 SIGNAL fifo_buffer_time_s : STD_LOGIC_VECTOR(48*4-1 DOWNTO 0);
192
191 BEGIN -- beh
193 BEGIN -- beh
192
194
193 -----------------------------------------------------------------------------
195 -----------------------------------------------------------------------------
@@ -429,12 +431,15 BEGIN -- beh
429 IF run = '0' THEN
431 IF run = '0' THEN
430 fifo_buffer_time(48*(I+1)-1 DOWNTO 48*I) <= (OTHERS => '0');
432 fifo_buffer_time(48*(I+1)-1 DOWNTO 48*I) <= (OTHERS => '0');
431 ELSE
433 ELSE
432 IF arbiter_time_out_new(I) = '0' THEN
434 IF arbiter_time_out_new(I) = '1' THEN -- modif JC 15-01-2015
433 fifo_buffer_time(48*(I+1)-1 DOWNTO 48*I) <= arbiter_time_out;
435 fifo_buffer_time(48*(I+1)-1 DOWNTO 48*I) <= arbiter_time_out;
434 END IF;
436 END IF;
435 END IF;
437 END IF;
436 END IF;
438 END IF;
437 END PROCESS;
439 END PROCESS;
440
441 fifo_buffer_time_s(48*(I+1)-1 DOWNTO 48*I) <= arbiter_time_out WHEN arbiter_time_out_new(I) = '1' ELSE
442 fifo_buffer_time(48*(I+1)-1 DOWNTO 48*I);
438
443
439 lpp_waveform_fsmdma_I: lpp_waveform_fsmdma
444 lpp_waveform_fsmdma_I: lpp_waveform_fsmdma
440 PORT MAP (
445 PORT MAP (
@@ -442,7 +447,7 BEGIN -- beh
442 rstn => rstn,
447 rstn => rstn,
443 run => run,
448 run => run,
444
449
445 fifo_buffer_time => fifo_buffer_time(48*(I+1)-1 DOWNTO 48*I),
450 fifo_buffer_time => fifo_buffer_time_s(48*(I+1)-1 DOWNTO 48*I),
446
451
447 fifo_data => s_rdata_v(32*(I+1)-1 DOWNTO 32*I),
452 fifo_data => s_rdata_v(32*(I+1)-1 DOWNTO 32*I),
448 fifo_empty => empty(I),
453 fifo_empty => empty(I),
General Comments 0
You need to be logged in to leave comments. Login now