From: Andreas Neiser Date: Fri, 6 Feb 2015 15:28:20 +0000 (+0100) Subject: Use registers economically X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=97d15476258a78ffdeea7a8d726b66bbde7c302d;p=trb3.git Use registers economically --- diff --git a/ADC/source/adc_handler.vhd b/ADC/source/adc_handler.vhd index 129cd01..9b8b55c 100644 --- a/ADC/source/adc_handler.vhd +++ b/ADC/source/adc_handler.vhd @@ -267,8 +267,8 @@ PROC_BUS : process begin when x"1a" => BUS_TX.data(31 downto 0) <= config.channel_disable(31 downto 0); when x"1b" => BUS_TX.data(15 downto 0) <= config.channel_disable(47 downto 32); when x"1c" => BUS_TX.data(1 downto 0) <= std_logic_vector(to_unsigned(config.processing_mode,2)); - when x"1d" => BUS_TX.data(7 downto 0) <= std_logic_vector(config.cfd_window); - when x"1e" => BUS_TX.data(3 downto 0) <= std_logic_vector(config.cfd_delay); + when x"1d" => BUS_TX.data(7 downto 0) <= std_logic_vector(config.cfd_window); + BUS_TX.data(11 downto 8) <= std_logic_vector(config.cfd_delay); when others => BUS_TX.ack <= '0'; BUS_TX.unknown <= '1'; end case; elsif BUS_RX.addr >= x"0020" and BUS_RX.addr <= x"002f" then @@ -320,8 +320,8 @@ PROC_BUS : process begin when x"1a" => config.channel_disable(31 downto 0) <= BUS_RX.data(31 downto 0); when x"1b" => config.channel_disable(47 downto 32) <= BUS_RX.data(15 downto 0); when x"1c" => config.processing_mode <= to_integer(unsigned(BUS_RX.data(1 downto 0))); - when x"1d" => config.cfd_window <= unsigned(BUS_RX.data(7 downto 0)); - when x"1e" => config.cfd_delay <= unsigned(BUS_RX.data(3 downto 0)); + when x"1d" => config.cfd_window <= unsigned(BUS_RX.data( 7 downto 0)); + config.cfd_delay <= unsigned(BUS_RX.data(11 downto 8)); when others => BUS_TX.ack <= '0'; BUS_TX.unknown <= '1'; end case; elsif BUS_RX.addr >= x"0020" and BUS_RX.addr <= x"002f" then