From: Ludwig Maier Date: Sat, 23 Aug 2014 16:34:12 +0000 (+0200) Subject: try modified nx_data_receiver merge handler, nx clock gets priority2 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=4a4005d7b9f901df81a2de364d8d8ca900b36074;p=trb3.git try modified nx_data_receiver merge handler, nx clock gets priority2 --- diff --git a/nxyter/source/nx_data_receiver.vhd b/nxyter/source/nx_data_receiver.vhd index 78a1ea5..184bc48 100644 --- a/nxyter/source/nx_data_receiver.vhd +++ b/nxyter/source/nx_data_receiver.vhd @@ -1997,7 +1997,8 @@ begin case SLV_ADDR_IN is when x"0001" => reset_handler_start_r <= SLV_DATA_IN(0); - disable_resets <= SLV_DATA_IN(2); + disable_adc_resets <= SLV_DATA_IN(2); + disable_resets <= SLV_DATA_IN(3); slv_ack_o <= '1'; when x"0004" =>