@@ -118,7 +118,7 ARCHITECTURE beh OF LFR_EQM IS | |||||
118 | CONSTANT CFG_PADTECH : INTEGER := inferred; |
|
118 | CONSTANT CFG_PADTECH : INTEGER := inferred; | |
119 | CONSTANT NB_APB_SLAVE : INTEGER := 11; -- 3 = grspw + waveform picker + time manager, 11 allows pindex = f |
|
119 | CONSTANT NB_APB_SLAVE : INTEGER := 11; -- 3 = grspw + waveform picker + time manager, 11 allows pindex = f | |
120 | CONSTANT NB_AHB_SLAVE : INTEGER := 1; |
|
120 | CONSTANT NB_AHB_SLAVE : INTEGER := 1; | |
121 |
CONSTANT NB_AHB_MASTER : INTEGER := |
|
121 | CONSTANT NB_AHB_MASTER : INTEGER := 3; -- 2 = grspw + waveform picker | |
122 |
|
122 | |||
123 | SIGNAL apbi_ext : apb_slv_in_type; |
|
123 | SIGNAL apbi_ext : apb_slv_in_type; | |
124 | SIGNAL apbo_ext : soc_apb_slv_out_vector(NB_APB_SLAVE-1+5 DOWNTO 5) := (OTHERS => apb_none); |
|
124 | SIGNAL apbo_ext : soc_apb_slv_out_vector(NB_APB_SLAVE-1+5 DOWNTO 5) := (OTHERS => apb_none); | |
@@ -424,6 +424,43 BEGIN -- beh | |||||
424 | data_shaping_BW => bias_fail_sw, |
|
424 | data_shaping_BW => bias_fail_sw, | |
425 | debug_vector => OPEN, |
|
425 | debug_vector => OPEN, | |
426 | debug_vector_ms => OPEN); --, |
|
426 | debug_vector_ms => OPEN); --, | |
|
427 | ||||
|
428 | lpp_lfr_2 : lpp_lfr | |||
|
429 | GENERIC MAP ( | |||
|
430 | Mem_use => use_RAM, | |||
|
431 | nb_data_by_buffer_size => 32, | |||
|
432 | --nb_word_by_buffer_size => 30, | |||
|
433 | nb_snapshot_param_size => 32, | |||
|
434 | delta_vector_size => 32, | |||
|
435 | delta_vector_size_f0_2 => 7, -- log2(96) | |||
|
436 | pindex => 14, | |||
|
437 | paddr => 14, | |||
|
438 | pmask => 16#fff#, | |||
|
439 | pirq_ms => 6, | |||
|
440 | pirq_wfp => 14, | |||
|
441 | hindex => 3, | |||
|
442 | top_lfr_version => X"020145") -- aa.bb.cc version | |||
|
443 | -- AA : BOARD NUMBER | |||
|
444 | -- 0 => MINI_LFR | |||
|
445 | -- 1 => EM | |||
|
446 | -- 2 => EQM (with A3PE3000) | |||
|
447 | PORT MAP ( | |||
|
448 | clk => clk_25, | |||
|
449 | rstn => LFR_rstn, | |||
|
450 | sample_B => sample_s(2 DOWNTO 0), | |||
|
451 | sample_E => sample_s(7 DOWNTO 3), | |||
|
452 | sample_val => sample_val, | |||
|
453 | ||||
|
454 | apbi => apbi_ext, | |||
|
455 | apbo => apbo_ext(14), | |||
|
456 | ||||
|
457 | ahbi => ahbi_m_ext, | |||
|
458 | ahbo => ahbo_m_ext(3), | |||
|
459 | coarse_time => coarse_time, | |||
|
460 | fine_time => fine_time, | |||
|
461 | data_shaping_BW => OPEN,--bias_fail_sw, | |||
|
462 | debug_vector => OPEN, | |||
|
463 | debug_vector_ms => OPEN); --, | |||
427 | --observation_vector_0 => OPEN, |
|
464 | --observation_vector_0 => OPEN, | |
428 | --observation_vector_1 => OPEN, |
|
465 | --observation_vector_1 => OPEN, | |
429 | --observation_reg => observation_reg); |
|
466 | --observation_reg => observation_reg); |
@@ -489,7 +489,7 BEGIN | |||||
489 | ahb0 : ahbctrl -- AHB arbiter/multiplexer |
|
489 | ahb0 : ahbctrl -- AHB arbiter/multiplexer | |
490 | GENERIC MAP (defmast => CFG_DEFMST, split => CFG_SPLIT, |
|
490 | GENERIC MAP (defmast => CFG_DEFMST, split => CFG_SPLIT, | |
491 | rrobin => CFG_RROBIN, ioaddr => CFG_AHBIO, |
|
491 | rrobin => CFG_RROBIN, ioaddr => CFG_AHBIO, | |
492 | ioen => 0, nahbm => maxahbmsp, nahbs => 8) |
|
492 | ioen => 0, nahbm => maxahbmsp, nahbs => 8, fixbrst => 0) | |
493 | PORT MAP (rstn, clkm, ahbmi, ahbmo, ahbsi, ahbso); |
|
493 | PORT MAP (rstn, clkm, ahbmi, ahbmo, ahbsi, ahbso); | |
494 |
|
494 | |||
495 | ---------------------------------------------------------------------- |
|
495 | ---------------------------------------------------------------------- |
General Comments 0
You need to be logged in to leave comments.
Login now