From: Andreas Neiser Date: Thu, 16 Apr 2015 13:30:52 +0000 (+0200) Subject: Another fix for readout words, run with 24 cores only X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=f01753305df4ff0fab1829793e3696ed5414dc9b;p=trb3.git Another fix for readout words, run with 24 cores only --- diff --git a/ADC/nodelist.txt b/ADC/nodelist.txt index d5e65c5..69960b7 100644 --- a/ADC/nodelist.txt +++ b/ADC/nodelist.txt @@ -1,4 +1,4 @@ [lxhadeb07] system = linux -corenum = 32 +corenum = 24 workdir = /home/aneiser/trb3/ADC/workdir diff --git a/ADC/source/adc_processor_cfd_ch.vhd b/ADC/source/adc_processor_cfd_ch.vhd index c121ab4..5d234a8 100644 --- a/ADC/source/adc_processor_cfd_ch.vhd +++ b/ADC/source/adc_processor_cfd_ch.vhd @@ -260,7 +260,7 @@ begin elsif CONF.DebugMode /= 0 and RAM_BSY_IN = '1' then -- at least one word is always dumped into the RAM -- don't move the ram pointer yet, it's already at next position - RAM_DATA(31 downto 24) <= x"cd"; + RAM_DATA(31 downto 24) <= x"00"; RAM_DATA(23 downto 20) <= std_logic_vector(to_unsigned(DEVICE, 4)); RAM_DATA(19 downto 16) <= std_logic_vector(to_unsigned(CHANNEL, 4)); RAM_DATA(15 downto 0) <= debug_mux; @@ -299,7 +299,7 @@ begin when WRITE1 => - RAM_DATA(31 downto 24) <= x"c0"; + RAM_DATA(31 downto 24) <= x"d0"; RAM_DATA(23 downto 20) <= std_logic_vector(to_unsigned(DEVICE, 4)); RAM_DATA(19 downto 16) <= std_logic_vector(to_unsigned(CHANNEL, 4)); RAM_DATA(15 downto 8) <= std_logic_vector(resize(epoch_counter_save(epoch_counter_save'high downto 16),8));