Some minor changes of FrameGen. Should work now...

diff --git a/mupix/Mupix8/sources/FrameGenMux2.vhd b/mupix/Mupix8/sources/FrameGenMux2.vhd
index d636176b9e46aa108a6516d60b69a2c763a648b4..d9f5d13afe431eaca491fd6b38be85822e0f87aa 100644 (file)
--- a/mupix/Mupix8/sources/FrameGenMux2.vhd
+++ b/mupix/Mupix8/sources/FrameGenMux2.vhd
@@ -121,7 +121,7 @@ signal gen_start   : std_logic := '0';
 signal gen_num     : std_logic_vector(31 downto 0) := (others => '0');
 signal gen_pause   : std_logic_vector(31 downto 0) := (others => '0');
 signal gen_down    : std_logic_vector(31 downto 0) := (others => '0');
-signal gen_wren    : std_logic := '0';
+signal gen_wren    : std_logic_vector(3 downto 0) := (others => '0');
 signal gen_chansel : chan_type := ("00", "01", "10", "11");
 signal gen_data    : data_type;
 
@@ -149,7 +149,7 @@ begin -- Behavioral
             data_pause => gen_pause,
             data_down  => gen_down,
             chan_sel   => gen_chansel(J),
-            writeEn    => gen_wren,
+            writeEn    => gen_wren(J),
             data_out   => gen_data(J)
         );
         
@@ -161,7 +161,7 @@ begin -- Behavioral
         port map(
             CLK     => clk,
             RST     => reset,
-            WriteEn => gen_wren,
+            WriteEn => gen_wren(J),
             ReadEn  => fifo_rden(J),
             DataIn  => gen_data(J),
             DataOut => fifo_data(J),

diff --git a/mupix/Mupix8/trb3_periph.prj b/mupix/Mupix8/trb3_periph.prj
index 5f0ff9401eb5e9320f6a7edce3c882c2be7580bf..834d67305521776e9d8e1922598abd3bde4d6bfc 100644 (file)
--- a/mupix/Mupix8/trb3_periph.prj
+++ b/mupix/Mupix8/trb3_periph.prj
@@ -174,3 +174,6 @@ add_file -vhdl -lib "work" "sources/DataMux.vhd"
 add_file -vhdl -lib "work" "sources/MupixDataLink.vhd"
 add_file -vhdl -lib "work" "sources/TriggerHandler.vhd"
 add_file -vhdl -lib "work" "sources/Arbiter.vhd"
+add_file -vhdl -lib "work" "sources/DatasourceSelector.vhd"
+add_file -vhdl -lib "work" "sources/FrameGenMux2.vhd"
+add_file -vhdl -lib "work" "sources/Generator3.vhd"