some minor changes to different files, Jan

diff --git a/trb_net_active_api.vhd b/trb_net_active_api.vhd
index c3a23e6c8e9278893d9635e4bdb6a571086efbbe..bfcc47ccb1ec57a17553c7b283ba5fd22242762f 100644 (file)
--- a/trb_net_active_api.vhd
+++ b/trb_net_active_api.vhd
@@ -374,7 +374,7 @@ next_APL_DATA_OUT <= fifo_to_apl_data_out(DWORD_POSITION);
 next_APL_TYP_OUT <= fifo_to_apl_data_out(TYPE_POSITION);
 
        process (out_select, combined_header, registered_trailer,
-                fifo_to_int_data_out)
+                fifo_to_int_data_out, combined_trailer)
        begin
          if out_select = HDR then
            next_INT_INIT_DATA_OUT(TYPE_POSITION) <= TYPE_HDR;

diff --git a/trb_net_active_apimbuf.vhd b/trb_net_active_apimbuf.vhd
index 2e707a612acc58b78613e8ea079ce0b930bfee9b..dcf21c41afbb09e2ae6b3f7edbbdbbd34793eb34 100644 (file)
--- a/trb_net_active_apimbuf.vhd
+++ b/trb_net_active_apimbuf.vhd
@@ -72,7 +72,9 @@ entity trb_net_active_apimbuf is
     CTRL_LOCKED:       in  STD_LOGIC_VECTOR (31 downto 0); 
     STAT_CTRL_INIT_BUFFER:  in  STD_LOGIC_VECTOR (31 downto 0); 
     STAT_CTRL_REPLY_BUFFER: in  STD_LOGIC_VECTOR (31 downto 0);
-    MPLEX_CTRL: in  STD_LOGIC_VECTOR (31 downto 0)
+    MPLEX_CTRL: in  STD_LOGIC_VECTOR (31 downto 0);
+    API_STAT_FIFO_TO_INT: out std_logic_vector(31 downto 0);
+    API_STAT_FIFO_TO_APL: out std_logic_vector(31 downto 0)
     );
 END trb_net_active_apimbuf;
 
@@ -203,10 +205,11 @@ component trb_net_active_api is
 
     INT_REPLY_DATAREADY_IN:  in  STD_LOGIC;
     INT_REPLY_DATA_IN:       in  STD_LOGIC_VECTOR (50 downto 0); -- Data word
-    INT_REPLY_READ_OUT:      out STD_LOGIC
+    INT_REPLY_READ_OUT:      out STD_LOGIC;
 
     -- Status and control port
-    -- not needed now, but later
+    STAT_FIFO_TO_INT: out std_logic_vector(31 downto 0);
+    STAT_FIFO_TO_APL: out std_logic_vector(31 downto 0)
     );
 END component;
 
@@ -354,16 +357,17 @@ begin
 
     INT_REPLY_DATAREADY_IN => buf_to_apl_REPLY_DATAREADY,
     INT_REPLY_DATA_IN      => buf_to_apl_REPLY_DATA,
-    INT_REPLY_READ_OUT     => buf_to_apl_REPLY_READ
+    INT_REPLY_READ_OUT     => buf_to_apl_REPLY_READ,
 
     -- Status and control port
-    -- not needed now, but later
+    STAT_FIFO_TO_INT => api_stat_fifo_to_int,
+    STAT_FIFO_TO_APL => api_stat_fifo_to_apl
     );
 
 STAT_api_control_signals(2 downto 0)  <= APL_DATA_IN(2 downto 0);
 STAT_api_control_signals(3)           <= APL_WRITE_IN;
 STAT_api_control_signals(4)           <= APL_SEND_IN;
-STAT_api_control_signals(7 downto 5)  <= "000";
+STAT_api_control_signals(7 downto 5)  <= (others => '0');
 STAT_api_control_signals(10 downto 8) <= apl_to_buf_INIT_DATA(2 downto 0);
 STAT_api_control_signals(11)           <= apl_to_buf_INIT_DATAREADY;
 STAT_api_control_signals(12)           <= apl_to_buf_INIT_READ;

diff --git a/trb_net_med_13bit_slow.vhd b/trb_net_med_13bit_slow.vhd
index 9da30ecd022750d2b5c1c275c35f24bc6e721709..2763616b13d6e4db78aba563af2065f6a93413bb 100755 (executable)
--- a/trb_net_med_13bit_slow.vhd
+++ b/trb_net_med_13bit_slow.vhd
@@ -3,8 +3,6 @@
 --first 56bit via Bus are for dataword, transmitted Bits 64 downto 56 Bits 
 --are for debugging
 
---parity bit is not used for parity but as an indicator for the first packet 
---of a transmission
 
 library IEEE;
 use IEEE.STD_LOGIC_1164.ALL;

diff --git a/trb_net_std.vhd b/trb_net_std.vhd
index 6c4f2f8a20338073050ac74d5bc18d58b104fbbc..44bab754416d96b53b45cd56e8211c13916db9ae 100644 (file)
--- a/trb_net_std.vhd
+++ b/trb_net_std.vhd
@@ -24,11 +24,11 @@ package trb_net_std is
   constant TYPE_ACK : std_logic_vector(2 downto 0) := "101";
   constant TYPE_ILLEGAL : std_logic_vector(2 downto 0) := "111";
   
-  constant ERROR_OK  : std_logic_vector(2 downto 0) := "000"; --transmission ok
-  constant ERROR_ENC : std_logic_vector(2 downto 0) := "001"; --transmission error by encoding
-  constant ERROR_REC : std_logic_vector(2 downto 0) := "010"; --transmission error, reconstructed
-  constant ERROR_FAT : std_logic_vector(2 downto 0) := "011"; --transmission error, fatal
-  constant ERROR_NC  : std_logic_vector(2 downto 0) := "101"; --media not connected
+  constant ERROR_OK     : std_logic_vector(2 downto 0) := "000"; --transmission ok
+  constant ERROR_ENCOD  : std_logic_vector(2 downto 0) := "001"; --transmission error by encoding
+  constant ERROR_RECOV  : std_logic_vector(2 downto 0) := "010"; --transmission error, reconstructed
+  constant ERROR_FATAL  : std_logic_vector(2 downto 0) := "011"; --transmission error, fatal
+  constant ERROR_NC     : std_logic_vector(2 downto 0) := "101"; --media not connected
   
   subtype F1_POSITION is integer range 47 downto 32;
   subtype F2_POSITION is integer range 31 downto 16;

diff --git a/trb_net_term.vhd b/trb_net_term.vhd
index 960ae5f4ddc047c2125ae54973a6c08d5f1937eb..25a8fbfac317f71aff8f6539e31a878ece5c6441 100644 (file)
--- a/trb_net_term.vhd
+++ b/trb_net_term.vhd
@@ -140,7 +140,8 @@ end generate CHECK_BUFFER2;
                                     fifo_term_buffer_empty, fifo_term_buffer_data_out,
                                     INT_READ_IN, tb_registered_target,
                                     reg_APL_DTYPE_OUT, reg_APL_ERROR_PATTERN_OUT,
-                                    reg_APL_SEQNR_OUT, reg_APL_GOT_TRM)
+                                    reg_APL_SEQNR_OUT, reg_APL_GOT_TRM,APL_MY_ADDRESS_IN, 
+                                    APL_HOLD_TRM, APL_DTYPE_IN, APL_ERROR_PATTERN_IN)
     begin  -- process
       INT_READ_OUT <= '0';
       fifo_term_buffer_data_in(TYPE_POSITION) <= TYPE_ILLEGAL;