Changeset 10138 for firmware/FAD/FACT_FAD_20MHz_VAR_PS/FACT_FAD_lib/hdl

Timestamp:

02/08/11 11:54:22 (14 years ago)

Author:

neise

Message:

 

Location:

firmware/FAD/FACT_FAD_20MHz_VAR_PS/FACT_FAD_lib/hdl

Files:

• data_generator.vhd (modified) (1 diff)
• drs_pulser_dummy.vhd (modified) (1 diff)
• fad_definitions.vhd (modified) (1 diff)
• w5300_modul.vhd (modified) (7 diffs)

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

@@ -172 +172 @@
           when CONFIG7 =>
             if (drs_srin_write_ready = '1') then
+              drs_channel_id <= DRS_ADDR_IDLE; -- to make sure not to write accidentally into DRS shift registers
               roi_max_int <= roi_max;
               state_generate <= WRITE_DATA_IDLE;

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

@@ -85 +85 @@
         when SRIN_WRITE_END =>
           SRCLK_EN <= '0';
-          srin_out <= '1';
+          srin_out <= '0';
           srin_write_ready <= '1';
           srin_write_ack <= '0';

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

@@ -163 +163 @@
 
 -- DRS Registers
+  constant DRS_ADDR_IDLE : std_logic_vector := "1001";
   constant DRS_CONFIG_REG : std_logic_vector := "1100";  
   constant DRS_WRITE_SHIFT_REG : std_logic_vector := "1101";  

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

@@ -144 +144 @@
 signal local_fifo_channels : std_logic_vector (3 downto 0);
 
-signal data_valid_int : std_logic := '0';
+
 
 
@@ -162 +162 @@
         -- signals for synching in asynchronous input signals
         ------------------------------------------------------------------------------
-        signal w5300_interrupt_sr : std_logic_vector(1 downto 0); 
+        signal w5300_interrupt_sr : std_logic_vector(1 downto 0) := "11";
+         --?? not sure if this init value is good
+         -- but should be no problem, because interrupt_ignore is not true during the first 2 clock cycles.
+         -- I hope!
+        signal data_valid_sr : std_logic_vector(1 downto 0) := "00"; 
         ------------------------------------------------------------------------------
 
@@ -187 +191 @@
                 -- synch asynchronous input in:
                 w5300_interrupt_sr <= w5300_interrupt_sr(1) & int;
+                data_valid_sr <= data_valid_sr(1) & data_valid;
                 
                         -- interrupt is handled synchronously
                         -- W5300 pulls low its interrpt line in case of:
-                        --      ??? I don't know ... connection loss ???
+                        --      When Sockets time out and 
+                        -- When sockets receive disconnection request.
                         
                         if (w5300_interrupt_sr = "01") and (interrupt_ignore = '0') then
@@ -560 +566 @@
                                             state_init <= MAIN;
                                           end if;
-                                        
-          -- main "loop"
+                                        -----------------------------------------
+          -- MAIN "loop" --------------------------
+          -----------------------------------------
+          
                                         when MAIN =>
                                           socks_waiting <= '0';
@@ -573 +581 @@
             data_valid_ack <= '0';
             state_init <= MAIN1;
-            data_valid_int <= data_valid;
+            --data_valid_int <= data_valid;
                                         when MAIN1 =>
             if (chk_recv_cntr = 1000) then
@@ -586 +594 @@
           when MAIN2 =>
             busy <= '0';
-                                          if (data_valid = '1') then
-                                            data_valid_int <= '0';
+                                          --if (data_valid = '1') then
+                                          if (data_valid_sr = "01" or data_valid_sr = "11") then
+                                            --data_valid_int <= '0';
                                             busy <= '1';
               local_write_length <= write_length;
@@ -607 +616 @@
             next_state <= MAIN;
             state_init <= WRITE_DATA;
+
+            -----------------------------------------
+            -- END OF MAIN         ------------------
+            -----------------------------------------
+