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

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

(MINI-LFR) 0.1.48...
pellion -
r511:86256eafc431 (MINI-LFR) WFP_MS-0-1-48 JC
parent child
Show More
Show file before | Show file after | Hide comments
@@ -195,10 +195,6 ARCHITECTURE beh OF MINI_LFR_top IS
195 195
196 196 --
197 197 SIGNAL SRAM_CE_s : STD_LOGIC_VECTOR(1 DOWNTO 0);
198
199 --
200 SIGNAL sample_hk : STD_LOGIC_VECTOR(15 DOWNTO 0);
201 SIGNAL HK_SEL : STD_LOGIC_VECTOR( 1 DOWNTO 0);
202 198
203 199 BEGIN -- beh
204 200
@@ -515,7 +511,7 BEGIN -- beh
515 511 pirq_ms => 6,
516 512 pirq_wfp => 14,
517 513 hindex => 2,
518 top_lfr_version => X"00012E") -- aa.bb.cc version
514 top_lfr_version => X"000130") -- aa.bb.cc version
519 515 PORT MAP (
520 516 clk => clk_25,
521 517 rstn => LFR_rstn,
@@ -578,28 +574,6 BEGIN -- beh
578 574 ADC_CLK <= ADC_CLK_sig;
579 575 ADC_SDO_sig <= ADC_SDO;
580 576
581 lpp_lfr_hk_1: lpp_lfr_hk
582 GENERIC MAP (
583 pindex => 7,
584 paddr => 7,
585 pmask => 16#fff#)
586 PORT MAP (
587 clk => clk_25,
588 rstn => rstn_25,
589
590 apbi => apbi_ext,
591 apbo => apbo_ext(7),
592
593 sample_val => sample_val,
594 sample => sample_hk,
595 HK_SEL => HK_SEL);
596
597 sample_hk <= "0001000100010001" WHEN HK_SEL = "00" ELSE
598 "0010001000100010" WHEN HK_SEL = "10" ELSE
599 "0100010001000100" WHEN HK_SEL = "10" ELSE
600 (OTHERS => '0');
601
602
603 577 ----------------------------------------------------------------------
604 578 --- GPIO -----------------------------------------------------------
605 579 ----------------------------------------------------------------------
@@ -727,7 +701,7 BEGIN -- beh
727 701 --
728 702 -----------------------------------------------------------------------------
729 703 all_apbo_ext : FOR I IN NB_APB_SLAVE-1+5 DOWNTO 5 GENERATE
730 apbo_ext_not_used : IF I /= 5 AND I /= 6 AND I /= 7 AND I /= 11 AND I /= 15 GENERATE
704 apbo_ext_not_used : IF I /= 5 AND I /= 6 AND I /= 11 AND I /= 15 GENERATE
731 705 apbo_ext(I) <= apb_none;
732 706 END GENERATE apbo_ext_not_used;
733 707 END GENERATE all_apbo_ext;
Show file before | Show file after | Hide comments
@@ -36,7 +36,7 USE techmap.gencomp.ALL;
36 36 ENTITY cic_lfr IS
37 37 GENERIC(
38 38 tech : INTEGER := 0;
39 use_RAM_nCEL : INTEGER := 0 -- 1 => RAM(tech) , 0 => RAM_CEL
39 use_RAM_nCEL : INTEGER := 1 -- 1 => RAM(tech) , 0 => RAM_CEL
40 40 );
41 41 PORT (
42 42 clk : IN STD_LOGIC;
@@ -382,4 +382,3 BEGIN
382 382 END GENERATE all_channel_out_v;
383 383
384 384 END beh;
385
General Comments 0
You need to be logged in to leave comments. Login now