Changeset 10156 for firmware/FAD/FACT_FAD_20MHz_VAR_PS/FACT_FAD_lib

Timestamp:

02/16/11 08:02:46 (14 years ago)

Author:

neise

Message:

still unstable

Location:

firmware/FAD/FACT_FAD_20MHz_VAR_PS/FACT_FAD_lib/hdl

Files:

• fad_definitions.vhd (modified) (1 diff)
• memory_manager_beha.vhd (modified) (3 diffs)

firmware/FAD/FACT_FAD_20MHz_VAR_PS/FACT_FAD_lib/hdl/fad_definitions.vhd

@@ -55 +55 @@
   constant PACKAGE_SUB_VERSION : std_logic_vector(7 downto 0) := X"02";
   constant PACKAGE_HEADER_LENGTH : integer := 22;
+  constant PACKAGE_HEADER_ZEROS : integer := 6;  
   constant PACKAGE_END_LENGTH : integer := 2; -- CRC and END-Flag
+  constant PACKAGE_END_ZEROS : integer := 2;
   constant CHANNEL_HEADER_SIZE : integer := 3; 
+  constant NUMBER_OF_DRS : integer := 4; 
   
   constant W5300_S_INC : std_logic_vector(6 downto 0) := "1000000"; -- socket address offset

firmware/FAD/FACT_FAD_20MHz_VAR_PS/FACT_FAD_lib/hdl/memory_manager_beha.vhd

@@ -166 +166 @@
             channel_id <= 0;
             fifo_package_size_ram <= (others => 0);
-            fifo_package_size_ram (0) <= PACKAGE_HEADER_LENGTH + 6; 
+            fifo_package_size_ram (0) <= PACKAGE_HEADER_LENGTH + PACKAGE_HEADER_ZEROS; 
             event_size_ram <= 0;
             event_size_ram_64b <= 0;
@@ -176 +176 @@
           if (package_index < number_of_packages) then
             if (channel_index < fifo_channels_array (package_index)) then
-              fifo_package_size_ram (package_index) <= fifo_package_size_ram (package_index) + ((roi_max_array (channel_id) + 3) * 4);
+              fifo_package_size_ram (package_index) <= 
+                          fifo_package_size_ram (package_index) + ((roi_max_array (channel_id) + CHANNEL_HEADER_SIZE) * NUMBER_OF_DRS);
               channel_index <= channel_index + 1;
               channel_id <= channel_id + 1;
@@ -185 +186 @@
             end if;
           else
-            fifo_package_size_ram (package_index - 1) <= fifo_package_size_ram (package_index - 1) + 4;
-            event_size_ram <= event_size_ram + 4; -- Size of Event in RAM (16 Bit), + CRC + Endflag + 2 Spare               
+            fifo_package_size_ram (package_index - 1) <= fifo_package_size_ram (package_index - 1) + PACKAGE_END_LENGTH + PACKAGE_END_ZEROS;
+            event_size_ram <= event_size_ram + PACKAGE_END_LENGTH + PACKAGE_END_ZEROS;
             state_mm <= RAM_CALC1;
           end if;