From: Jan Michel Date: Fri, 12 Apr 2013 13:04:09 +0000 (+0200) Subject: small changes (LED & ID) X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=9b8d86ad376e108af822ef3ddc2527b1458e2ffb;p=soda.git small changes (LED & ID) --- diff --git a/soda_slave/trb3_periph_sodaslave.vhd b/soda_slave/trb3_periph_sodaslave.vhd index baeb574..61a780c 100644 --- a/soda_slave/trb3_periph_sodaslave.vhd +++ b/soda_slave/trb3_periph_sodaslave.vhd @@ -319,7 +319,7 @@ end generate; BROADCAST_BITMASK => x"FF", BROADCAST_SPECIAL_ADDR => x"45", REGIO_COMPILE_TIME => std_logic_vector(to_unsigned(VERSION_NUMBER_TIME, 32)), - REGIO_HARDWARE_VERSION => x"91000000", + REGIO_HARDWARE_VERSION => x"9100b000", REGIO_INIT_ADDRESS => x"f351", REGIO_USE_VAR_ENDPOINT_ID => c_YES, CLOCK_FREQUENCY => CLOCK_FREQUENCY, @@ -578,17 +578,20 @@ THE_SODA_INPUT : med_ecp3_sfp_sync LED_GREEN <= not med_stat_op(9); LED_RED <= not (med_stat_op(10) or med_stat_op(11)); - LED_LINKOK(1) <= not med_stat_op(9); - LED_TX(1) <= not med_stat_op(10); - LED_RX(1) <= not med_stat_op(11); + LED_LINKOK(1) <= not med_stat_op(9); --link established + LED_TX(1) <= not (med_stat_op(10) or med_stat_op(11)); --data RX or TX + LED_RX(1) <= not med_stat_op(12); --DLM RX LED_LINKOK(6 downto 2) <= "11111"; LED_TX(6 downto 2) <= "11111"; LED_RX(6 downto 2) <= "11111"; -FPGA5_COMM(3) <= '0'; -FPGA5_COMM(2) <= '0'; - + --no link to central FPGA + FPGA5_COMM(3) <= '0'; + FPGA5_COMM(2) <= '0'; + + + --------------------------------------------------------------------------- -- Test Connector --------------------------------------------------------------------------- diff --git a/soda_source/trb3_periph_sodasource.vhd b/soda_source/trb3_periph_sodasource.vhd index 4fff284..dddc764 100644 --- a/soda_source/trb3_periph_sodasource.vhd +++ b/soda_source/trb3_periph_sodasource.vhd @@ -548,9 +548,9 @@ THE_SODA_SOURCE : med_ecp3_sfp_sync LED_GREEN <= not med_stat_op(9); LED_RED <= not (med_stat_op(10) or med_stat_op(11)); - LED_LINKOK(1) <= not med_stat_op(16+9); - LED_TX(1) <= not med_stat_op(16+10); - LED_RX(1) <= not med_stat_op(16+11); + LED_LINKOK(1) <= not med_stat_op(16+9); --link established + LED_TX(1) <= not (med_stat_op(16+10) or med_stat_op(16+11)); --data RX or TX + LED_RX(1) <= not med_stat_op(16+12); --DLM RX LED_LINKOK(6 downto 2) <= "11111"; LED_TX(6 downto 2) <= "11111";