Changeset 11485 for firmware/FTM/ethernet

Timestamp:

07/20/11 14:54:17 (14 years ago)

Author:

weitzel

Message:

FTM firmware features now the config_single_FTU command (to be tested); also some defaults were changed

Location:

firmware/FTM/ethernet

Files:

• ethernet_modul_beha.vhd (modified) (5 diffs)
• w5300_modul.vhd (modified) (6 diffs)

firmware/FTM/ethernet/ethernet_modul_beha.vhd ¶

@@ -2 +2 @@
 --
 -- Created:
---          by - kai.users (tpkw.local.priv)
---          at - 11:20:56 04/20/11
+--          by - kai.UNKNOWN (E5PCXX)
+--          at - 13:50:41 30.06.2011
 --
 -- Generated by Mentor Graphics' HDL Designer(TM) 2009.1 (Build 12)
@@ -10 +10 @@
 USE ieee.std_logic_1164.all;
 USE ieee.std_logic_arith.all;
-
 library ftm_definitions;
 USE ftm_definitions.ftm_array_types.all;
@@ -118 +117 @@
       current_cc_state       : IN     std_logic_vector (15 DOWNTO 0);
       start_run_param        : OUT    std_logic_vector (15 DOWNTO 0) := (others => '0');
-      start_run_num_events   : OUT    std_logic_vector (31 DOWNTO 0) := (others => '0')
+      start_run_num_events   : OUT    std_logic_vector (31 DOWNTO 0) := (others => '0');
+      new_config_ftu         : OUT    std_logic                      := '0';
+      new_config_ftu_ack     : IN     std_logic;
+      new_config_ftu_param   : OUT    std_logic_vector (15 DOWNTO 0) := (others => '0')
    );
 
@@ -459 +461 @@
       crate_reset              : OUT    std_logic                      := '0';
       crate_reset_ack          : IN     std_logic ;
-      crate_reset_param        : OUT    std_logic_vector (15 DOWNTO 0) := (others => '0')
+      crate_reset_param        : OUT    std_logic_vector (15 DOWNTO 0) := (others => '0');
+      new_config_ftu           : OUT    std_logic                      := '0';
+      new_config_ftu_ack       : IN     std_logic ;
+      new_config_ftu_param     : OUT    std_logic_vector (15 DOWNTO 0) := (others => '0')
    );
    END COMPONENT;
@@ -717 +722 @@
          crate_reset              => crate_reset,
          crate_reset_ack          => crate_reset_ack,
-         crate_reset_param        => crate_reset_param
+         crate_reset_param        => crate_reset_param,
+         new_config_ftu           => new_config_ftu,
+         new_config_ftu_ack       => new_config_ftu_ack,
+         new_config_ftu_param     => new_config_ftu_param
       );
 

firmware/FTM/ethernet/w5300_modul.vhd ¶

@@ -23 +23 @@
 USE IEEE.STD_LOGIC_ARITH.all;
 USE IEEE.STD_LOGIC_UNSIGNED.all;
-
 library ftm_definitions;
 USE ftm_definitions.ftm_array_types.all;
@@ -108 +107 @@
     crate_reset               : OUT std_logic := '0';
     crate_reset_ack           : IN  std_logic;
-    crate_reset_param         : OUT std_logic_vector (15 DOWNTO 0) := (others => '0')
+    crate_reset_param         : OUT std_logic_vector (15 DOWNTO 0) := (others => '0');
+    new_config_ftu            : OUT std_logic := '0';
+    new_config_ftu_ack        : IN  std_logic;
+    new_config_ftu_param      : OUT std_logic_vector (15 DOWNTO 0) := (others => '0')
+    
   );
+
 END w5300_modul ;
 
@@ -327 +331 @@
               ftu_error_send_ack <= '1';
               ftu_error_send_ready <= '1';
+              --
+              start_run <= '0';
+              stop_run <= '0';
+              crate_reset <= '0';
+              new_config_ftu <= '0';
               -- set internal signals
               new_config_flag <= '0';
@@ -769 +778 @@
                     crate_reset <= '1';
                     crate_reset_param <= cmd_array (2);
+--                    led_int <= cmd_array (2) (7 downto 0);
                     if (crate_reset_ack = '1') then
                       crate_reset <= '0';
@@ -776 +786 @@
                     end if;
 
+                  when CMD_CONFIG_FTU =>
+                    new_config_ftu <= '1';
+                    new_config_ftu_param <= cmd_array (2);
+--                    led_int <= cmd_array (2) (7 downto 0);
+                    if (new_config_ftu_ack = '1') then
+                      new_config_ftu <= '0';
+                      state_read_data <= RD_5;
+                    else
+                      state_init <= MAIN;
+                    end if;
+                    
                   when CMD_WRITE =>
                     case cmd_array (2) is
@@ -897 +918 @@
                   next_packet_data_cnt <= 0;
                   wait_for_data_flag <= '0';
+                  next_state_read_data <= RD_CMD;
                   new_config_flag <= '1';
-                  next_state_read_data <= RD_CMD;
                 end if;