# HG changeset patch # User pellion # Date 2015-02-09 13:39:46 # Node ID ba59fa3696fbabe7dcee0083df2d2bbe50bf1556 # Parent 38ae5b4bc50b07311f07a5680d56caef6da337fd modif alexis - CNA diff --git a/designs/LFR-em-WFP_MS/LFR-em.vhd b/designs/LFR-em-WFP_MS/LFR-em.vhd --- a/designs/LFR-em-WFP_MS/LFR-em.vhd +++ b/designs/LFR-em-WFP_MS/LFR-em.vhd @@ -391,7 +391,7 @@ BEGIN -- beh pirq_ms => 6, pirq_wfp => 14, hindex => 2, - top_lfr_version => X"01013D") -- aa.bb.cc version + top_lfr_version => X"01013E") -- aa.bb.cc version -- AA : BOARD NUMBER -- 0 => MINI_LFR -- 1 => EM diff --git a/lib/lpp/lpp_cna/SPI_DAC_DRIVER.vhd b/lib/lpp/lpp_cna/SPI_DAC_DRIVER.vhd --- a/lib/lpp/lpp_cna/SPI_DAC_DRIVER.vhd +++ b/lib/lpp/lpp_cna/SPI_DAC_DRIVER.vhd @@ -65,11 +65,11 @@ BEGIN PROCESS(clk, rstn) BEGIN IF rstn = '0' then - shifting_R <= '0'; +-- shifting_R <= '0'; SMP_CLK_R <= '0'; ELSIF clk'EVENT AND clk = '1' then SMP_CLK_R <= SMP_CLK; - shifting_R <= shifting; +-- shifting_R <= shifting; END IF; END PROCESS;