]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/commitdiff
CTS: Clock select based on config-constant
authorManuel Penschuck <manuel.penschuck@stud.uni-frankfurt.de>
Tue, 2 Dec 2014 21:37:51 +0000 (22:37 +0100)
committerManuel Penschuck <manuel.penschuck@stud.uni-frankfurt.de>
Tue, 2 Dec 2014 21:37:51 +0000 (22:37 +0100)
cts/trb3_central.vhd

index d78ddad4953a2390b2cd92ad593026cb14913bec..576d00b20c5bdd58c193e11a4b38c2b9a01b35a3 100644 (file)
@@ -880,7 +880,6 @@ begin
       hub_cts_readout_finished <= gbe_cts_readout_finished;
       hub_fee_read             <= gbe_fee_read;
       
-      trb_reset_in <= reset_via_gbe or MED_STAT_OP(4*16+13); --_delayed(2)
       LED_TRIGGER_GREEN              <= not med_stat_op(4*16+9);
       LED_TRIGGER_RED                <= not (med_stat_op(4*16+11) or med_stat_op(4*16+10));
       
@@ -1572,7 +1571,7 @@ begin
       PROGRAMN  => PROGRAMN
    );
 
-   do_reboot_i <= common_ctrl_regs(15) or killswitch_reboot_i;
+   do_reboot_i <= common_ctrl_regs(15); -- or killswitch_reboot_i;
    
    -- if jttl(15) is stabily high for 1.28us: issue reboot
    THE_KILLSWITCH_PROC: process
@@ -1746,7 +1745,7 @@ begin
    );
 
    TRIGGER_SELECT <= '1';
-   CLOCK_SELECT   <='1'; --use on-board oscillator
+   CLOCK_SELECT   <= '1' when USE_EXTERNAL_CLOCK = c_YES else '0'; --use on-board oscillator
    CLK_MNGR1_USER <= select_tc_i(19 downto 16);
    CLK_MNGR2_USER <= select_tc_i(27 downto 24);