From: Jan Michel <j.michel@gsi.de>
Date: Thu, 27 Feb 2014 18:53:48 +0000 (+0100)
Subject: the rest
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=3dc7111635e21648b05c17f16b9c24030718d543;p=trb3.git

the rest
---

diff --git a/base/code/input_statistics.vhd b/base/code/input_statistics.vhd
index 19f9b97..e384db9 100644
--- a/base/code/input_statistics.vhd
+++ b/base/code/input_statistics.vhd
@@ -36,6 +36,9 @@ signal enable : std_logic_vector(31 downto 0);
 signal invert : std_logic_vector(31 downto 0);
 signal rate   : unsigned(31 downto 0);
 
+signal fifo_read : std_logic_vector(31 downto 0);
+signal fifo_select : integer range 0 to 31;
+
 begin
 
 
@@ -46,6 +49,8 @@ begin
   ACK_OUT  <= '0';
   NACK_OUT <= '0';
   trigger_fifo  <= '0';
+  fifo_read     <= (others => '0');
+  fifo_select   <= 0;
   if WRITE_IN = '1' then
     if ADDR_IN(6 downto 4) = "000" then
       ACK_OUT <= '1';
@@ -57,6 +62,8 @@ begin
                        reset_cnt    <= DATA_IN(1);
         when others => NACK_OUT <= '1'; ACK_OUT <= '0';
       end case;
+    else 
+      NACK_OUT <= '1';
     end if;
   elsif READ_IN = '1' then
     if ADDR_IN(6 downto 4) = "000" then
@@ -68,6 +75,9 @@ begin
         when x"e"   => DATA_OUT(INPUTS-1 downto 0)  <= inp_reg; DATA_OUT(31 downto INPUTS) <= (others => '0');
         when others => DATA_OUT <= (others => '0');
       end case;
+    elsif ADDR_IN(6 downto 4) = "001" or ADDR_IN(6 downto 5) = "010" then
+      fifo_read(to_integer(unsigned(ADDR_IN(4 downto 0)))) <= '1';
+      fifo_select <= to_integer(unsigned(ADDR_IN(4 downto 0)));
     end if;
   end if;
 end process;
diff --git a/hadesstart/trb3_periph_hadesstart.vhd b/hadesstart/trb3_periph_hadesstart.vhd
index a2f6bd8..e0da721 100644
--- a/hadesstart/trb3_periph_hadesstart.vhd
+++ b/hadesstart/trb3_periph_hadesstart.vhd
@@ -366,7 +366,7 @@ begin
       REGIO_NUM_STAT_REGS       => REGIO_NUM_STAT_REGS,
       REGIO_NUM_CTRL_REGS       => REGIO_NUM_CTRL_REGS,
       ADDRESS_MASK              => x"FFFF",
-      BROADCAST_BITMASK         => x"48",
+      BROADCAST_BITMASK         => x"ff",
       BROADCAST_SPECIAL_ADDR    => BROADCAST_SPECIAL_ADDR,
       REGIO_COMPILE_TIME        => std_logic_vector(to_unsigned(VERSION_NUMBER_TIME, 32)),
       REGIO_HARDWARE_VERSION    => HARDWARE_INFO,