HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/PELLION/VHD_Lib Commit - r573:6b86feeb81a3

test avec 2 LFR

pellion -

r573:6b86feeb81a3 simu_double_DMA

parent child

Context file:

r573:6b86feeb81a3

Collapse all files

designs/LFR-EQM-WFP_MS/LFR-EQM.vhd +38 -1

                CONSTANT CFG_PADTECH   : INTEGER := inferred;
                CONSTANT NB_APB_SLAVE  : INTEGER := 11;  -- 3 = grspw + waveform picker + time manager, 11 allows pindex = f
                CONSTANT NB_AHB_SLAVE  : INTEGER := 1;
-               CONSTANT NB_AHB_MASTER : INTEGER := 2;   -- 2 = grspw + waveform picker
+               CONSTANT NB_AHB_MASTER : INTEGER := 3;   -- 2 = grspw + waveform picker
                SIGNAL apbi_ext   : apb_slv_in_type;
                SIGNAL apbo_ext   : soc_apb_slv_out_vector(NB_APB_SLAVE-1+5 DOWNTO 5)  := (OTHERS => apb_none);
                    data_shaping_BW => bias_fail_sw,
                    debug_vector    => OPEN,
                    debug_vector_ms => OPEN);     --,
+               lpp_lfr_2 : lpp_lfr
+                 GENERIC MAP (
+                   Mem_use                => use_RAM,
+                   nb_data_by_buffer_size => 32,
+                   --nb_word_by_buffer_size => 30,
+                   nb_snapshot_param_size => 32,
+                   delta_vector_size      => 32,
+                   delta_vector_size_f0_2 => 7,          -- log2(96)
+                   pindex                 => 14,
+                   paddr                  => 14,
+                   pmask                  => 16#fff#,
+                   pirq_ms                => 6,
+                   pirq_wfp               => 14,
+                   hindex                 => 3,
+                   top_lfr_version        => X"020145")  -- aa.bb.cc version
+                                                         -- AA : BOARD NUMBER
+                                                         --      0 => MINI_LFR
+                                                         --      1 => EM
+                                                         --      2 => EQM (with A3PE3000)
+                 PORT MAP (
+                   clk             => clk_25,
+                   rstn            => LFR_rstn,
+                   sample_B        => sample_s(2 DOWNTO 0),
+                   sample_E        => sample_s(7 DOWNTO 3),
+                   sample_val      => sample_val,
+                   apbi            => apbi_ext,
+                   apbo            => apbo_ext(14),
+                   ahbi            => ahbi_m_ext,
+                   ahbo            => ahbo_m_ext(3),
+                   coarse_time     => coarse_time,
+                   fine_time       => fine_time,
+                   data_shaping_BW => OPEN,--bias_fail_sw,
+                   debug_vector    => OPEN,
+                   debug_vector_ms => OPEN);     --,
                --observation_vector_0 => OPEN,
                --observation_vector_1 => OPEN,
                --observation_reg => observation_reg);

lib/lpp/lpp_leon3_soc/leon3_soc.vhd +1 -1

                ahb0 : ahbctrl                        -- AHB arbiter/multiplexer
                  GENERIC MAP (defmast => CFG_DEFMST, split => CFG_SPLIT,
                               rrobin  => CFG_RROBIN, ioaddr => CFG_AHBIO,
-                              ioen    => 0, nahbm => maxahbmsp, nahbs => 8)
+                              ioen    => 0, nahbm => maxahbmsp, nahbs => 8, fixbrst => 0)
                  PORT MAP (rstn, clkm, ahbmi, ahbmo, ahbsi, ahbso);
              ----------------------------------------------------------------------

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