*** empty log message ***

diff --git a/lattice/ecp2m/trb_net16_fifo_arch.vhd b/lattice/ecp2m/trb_net16_fifo_arch.vhd
index 3d7763b209b756af2228f6ed3beaa2dd1735f222..e5a720cba24d2c3f1bea4f04aeda51a0eeec7ad5 100644 (file)
--- a/lattice/ecp2m/trb_net16_fifo_arch.vhd
+++ b/lattice/ecp2m/trb_net16_fifo_arch.vhd
@@ -21,8 +21,7 @@ entity trb_net16_fifo is
       PACKET_NUM_OUT  : out std_logic_vector(1 downto 0);  -- Input data
       READ_ENABLE_IN  : in  std_logic;
       FULL_OUT        : out std_logic;    -- Full Flag
-      EMPTY_OUT       : out std_logic;
-      DEPTH_OUT       : out std_logic_vector(7 downto 0)
+      EMPTY_OUT       : out std_logic
       );
 end entity;
 
@@ -91,7 +90,6 @@ begin
   din(c_DATA_WIDTH + 1 downto c_DATA_WIDTH) <= PACKET_NUM_IN;
   DATA_OUT <= dout(c_DATA_WIDTH - 1 downto 0);
   PACKET_NUM_OUT <= dout(c_DATA_WIDTH + 1 downto c_DATA_WIDTH);
-  DEPTH_OUT <= std_logic_vector(to_unsigned(DEPTH,8));
 
   gen_FIFO6 : if DEPTH = 6  generate
     fifo:lattice_ecp2m_fifo_18x1k

diff --git a/lattice/ecp2m/trb_net_fifo_16bit_bram_dualport.vhd b/lattice/ecp2m/trb_net_fifo_16bit_bram_dualport.vhd
index 5278d22397bbdce6dc98b16d517008a5ea622269..1a790828710d62d485c38cd054d14ba3504ff9e7 100644 (file)
--- a/lattice/ecp2m/trb_net_fifo_16bit_bram_dualport.vhd
+++ b/lattice/ecp2m/trb_net_fifo_16bit_bram_dualport.vhd
@@ -52,7 +52,8 @@ BEGIN
       Empty => buf_empty_out,
       Full => buf_full_out
       );
-
+empty_out <= buf_empty_out;
+full_out  <= buf_full_out;
 almost_empty_out <= buf_empty_out;
 almost_full_out  <= buf_full_out;
 fifostatus_out <= (others => '0');

diff --git a/trb_net16_addresses.vhd b/trb_net16_addresses.vhd
index 2124823490d65b498dd6e94d007de8b6ef040ef9..96f7ae2970e2468fcda9ad9c2e9fc47597ad16c3 100644 (file)
--- a/trb_net16_addresses.vhd
+++ b/trb_net16_addresses.vhd
@@ -148,7 +148,7 @@ begin
       end if;
     end process;
 
-  send_ack : process(state, API_READ_IN, ram_read_dout, read_UNIQUE_ID, last_ram_read_addr2, sending_state)
+  send_ack : process(state, API_READ_IN, ram_read_dout, last_ram_read_addr2, sending_state)
     begin
       next_state <= state;
       API_DATA_OUT <= ram_read_dout;

diff --git a/trb_net16_med_ecp_sfp.vhd b/trb_net16_med_ecp_sfp.vhd
index b4ae653e7dd28aef7eef4624c3b37a774633f7bd..a7771efc82f709c21cc390208883633a5b25c2fd 100644 (file)
--- a/trb_net16_med_ecp_sfp.vhd
+++ b/trb_net16_med_ecp_sfp.vhd
@@ -11,7 +11,8 @@ library work;
 use work.trb_net_std.all;
 
 entity trb_net16_med_ecp_sfp is
-port( CLK        : in  std_logic;
+  port(
+    CLK        : in  std_logic;
     RESET        : in  std_logic;  -- synchronous reset
     CLK_EN       : in  std_logic;
     --Internal Connection

diff --git a/trb_net16_obuf.vhd b/trb_net16_obuf.vhd
index 70cea13c29c8c7c8a775b63a8bd496d51fc22aeb..b0c86cbbc039ff169cb6910e5cdeb4197570bac4 100644 (file)
--- a/trb_net16_obuf.vhd
+++ b/trb_net16_obuf.vhd
@@ -263,7 +263,7 @@ begin
   --the EOB and ACK flags must be available when the last packet is sent.
   --full buffers (despite the sbuf) can only occur on the last packet.
   COMB_NEXT_TRANSFER : process(comb_dataready, transfer_counter, current_NOP_word,
-                               CURRENT_DATA_COUNT, reg_SEND_ACK_IN, INT_DATAREADY_IN, INT_DATA_IN,
+                               INT_DATAREADY_IN,
                                reg_INT_READ_OUT, saved_packet_type, sending_state,
                                current_DATA_word, send_ACK, send_EOB, sbuf_free, RESET,
                                current_ACK_word, current_EOB_word, INT_PACKET_NUM_IN,
@@ -436,4 +436,5 @@ STAT_DEBUG(14 downto 13) <= TRANSMITTED_BUFFERS;
 STAT_DEBUG(17 downto 15) <= REC_BUFFER_SIZE_IN(2 downto 0);
 STAT_DEBUG(19 downto 18) <= transfer_counter(1 downto 0);
 STAT_DEBUG(20) <= '1';
+STAT_DEBUG(31 downto 21) <= (others => '0');
 end architecture;
\ No newline at end of file

diff --git a/trb_net16_regIO.vhd b/trb_net16_regIO.vhd
index b5dd7aea4315567925940d14657fb4566b98b87a..58a496797bfa87d3f7a8458c2c8d7dd0506c779f 100644 (file)
--- a/trb_net16_regIO.vhd
+++ b/trb_net16_regIO.vhd
@@ -44,7 +44,6 @@ entity trb_net16_regIO is
     API_DTYPE_OUT          : out std_logic_vector (3 downto 0);
     API_ERROR_PATTERN_OUT  : out std_logic_vector (31 downto 0);
     API_SEND_OUT           : out std_logic;
-    API_TARGET_ADDRESS_OUT : out std_logic_vector (15 downto 0);
     -- Receiver port
     API_DATA_IN         : in  std_logic_vector (c_DATA_WIDTH-1 downto 0);
     API_PACKET_NUM_IN   : in  std_logic_vector (c_NUM_WIDTH-1  downto 0);
@@ -243,7 +242,7 @@ begin
                 buf_API_SEND_OUT, next_packet_counter, buf_API_DATA_OUT, buf_API_SHORT_TRANSFER_OUT,
                 REGISTERS_IN, buf_REGISTERS_OUT, reg_enable_pattern, DAT_NO_MORE_DATA_IN,
                 DAT_DATAREADY_IN, buf_DAT_DATA_IN, ADR_REJECTED,
-                ADR_READ_OUT, ADR_DATAREADY_OUT, ADR_DATA_OUT, ADR_PACKET_NUM_OUT, length, dont_understand,
+                ADR_READ_OUT, ADR_DATAREADY_OUT, ADR_DATA_OUT, length, dont_understand,
                 buf_rom_read_addr, ADR_SEND_OUT, rom_read_dout, COMMON_STAT_REG_IN, buf_COMMON_CTRL_REG_OUT
 --              ,  HDR_F1, HDR_F2, HDR_F3
                 )
@@ -725,7 +724,6 @@ begin
   API_SHORT_TRANSFER_OUT <= buf_API_SHORT_TRANSFER_OUT;
   API_DTYPE_OUT          <= saved_operation;
   API_ERROR_PATTERN_OUT  <= buf_API_ERROR_PATTERN_OUT;
-  API_TARGET_ADDRESS_OUT <= (others => '0');
   DAT_DATA_OUT           <= buf_DAT_DATA_OUT;
   DAT_READ_ENABLE_OUT    <= buf_DAT_READ_ENABLE_OUT;
   DAT_WRITE_ENABLE_OUT   <= buf_DAT_WRITE_ENABLE_OUT;

diff --git a/trb_net_sbuf.vhd b/trb_net_sbuf.vhd
index e9f210ead79189642ab2cc9dfab65c8b82464a11..c7f06e728bac318832e30a733b94abf78ff87aad 100644 (file)
--- a/trb_net_sbuf.vhd
+++ b/trb_net_sbuf.vhd
@@ -91,10 +91,9 @@ begin
     next_b2_buffer <= COMB_DATA_IN;
   end generate;
 
-  COMB: process (current_buffer_state, COMB_DATAREADY_IN, COMB_READ_IN,
-                 SYN_READ_IN, COMB_DATA_IN, current_b1_buffer, current_b2_buffer,
+  COMB: process (current_buffer_state, SYN_READ_IN, COMB_DATA_IN,
                  current_SYN_DATAREADY_OUT, current_got_overflow,
-                 combined_COMB_DATAREADY_IN, current_next_READ_OUT)
+                 combined_COMB_DATAREADY_IN)
   begin  -- process COMB
     next_buffer_state <= current_buffer_state;
     next_next_READ_OUT <= '1';