HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/PELLION/VHD_Lib Commit - r484:5ac3ea1d915f

(MINI-LFR) WFP_MS_0-1-39...

pellion -

r484:5ac3ea1d915f JC

parent child

Context file:

r484:5ac3ea1d915f

Collapse all files

designs/MINI-LFR_WFP_MS/testbench.vhd +1 0

                                        X"4000D000");
                 UART_WRITE(TXD1   ,txp,ADDR_BASE_LFR & ADDR_LFR_WP_LENGTH,         X"0000000F");
+                UART_WRITE(TXD1   ,txp,ADDR_BASE_LFR & ADDR_LFR_WP_DATA_IN_BUFFER, X"00000050");
                 message_simu <= "4 - GO GO GO !!";
                 UART_WRITE            (TXD1 ,txp,ADDR_BASE_LFR & ADDR_LFR_WP_START_DATE,X"00000000");

lib/lpp/lpp_waveform/lpp_waveform.vhd +7 -2

               SIGNAL fifo_buffer_time : STD_LOGIC_VECTOR(48*4-1 DOWNTO 0);
+              SIGNAL fifo_buffer_time_s : STD_LOGIC_VECTOR(48*4-1 DOWNTO 0);
             BEGIN  -- beh
               -----------------------------------------------------------------------------
                     IF run = '0' THEN
                       fifo_buffer_time(48*(I+1)-1 DOWNTO 48*I) <= (OTHERS => '0');
                     ELSE
-                      IF arbiter_time_out_new(I) = '0' THEN
+                      IF arbiter_time_out_new(I) = '1' THEN  -- modif JC 15-01-2015
                         fifo_buffer_time(48*(I+1)-1 DOWNTO 48*I) <= arbiter_time_out;
                       END IF;
                     END IF;
                   END IF;
                 END PROCESS;
+                fifo_buffer_time_s(48*(I+1)-1 DOWNTO 48*I) <= arbiter_time_out WHEN arbiter_time_out_new(I) = '1' ELSE
+                                                              fifo_buffer_time(48*(I+1)-1 DOWNTO 48*I);
                 lpp_waveform_fsmdma_I: lpp_waveform_fsmdma
                   PORT MAP (
                     clk                  => clk,
                     rstn                 => rstn,
                     run                  => run,
-                    fifo_buffer_time     => fifo_buffer_time(48*(I+1)-1 DOWNTO 48*I),
+                    fifo_buffer_time     => fifo_buffer_time_s(48*(I+1)-1 DOWNTO 48*I),
                     fifo_data            => s_rdata_v(32*(I+1)-1 DOWNTO 32*I),
                     fifo_empty           => empty(I),

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