*** empty log message ***

diff --git a/trb_net16_endpoint_0_trg_1_api.vhd b/trb_net16_endpoint_0_trg_1_api.vhd
index ed029f03a6c15cf8eefa8bf6a6dd66beb2c74297..14085b3d61179b9ebdc9e1aebcd49b718d5b3f64 100644 (file)
--- a/trb_net16_endpoint_0_trg_1_api.vhd
+++ b/trb_net16_endpoint_0_trg_1_api.vhd
@@ -544,7 +544,9 @@ 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;
-STAT_api_control_signals(28 downto 13) <= (others => '0');
+STAT_api_control_signals(19 downto 16) <= MED_INIT_DATA_OUT(3 downto 0);
+STAT_api_control_signals(21 downto 20) <= MED_INIT_PACKET_NUM_OUT(1 downto 0);
+--STAT_api_control_signals(30 downto 13) <= (others => '0');
 
 STAT_api_control_signals(31)           <= buf_to_apl_INIT_READ;
 --STAT_api_control_signals(30)           <= buf_to_apl_INIT_PACKET_NUM(0);

diff --git a/trb_net16_hub_base.vhd b/trb_net16_hub_base.vhd
index 2a547825aed6f436a870aea858a4e9b2b01ca9c0..507a5d1d6a0ee33ec86a82046bec4fe5c78abb88 100644 (file)
--- a/trb_net16_hub_base.vhd
+++ b/trb_net16_hub_base.vhd
@@ -19,7 +19,7 @@ entity trb_net16_hub_base is
     IBUF_SECURE_MODE        : integer range 0 to 1 := c_NO;
     HUB_ADDRESS             : std_logic_vector(15 downto 0) := x"F003";
   --media interfaces
-    MII_NUMBER              : integer range 2 to c_MAX_MII_PER_HUB := 12;
+    MII_NUMBER              : integer range 2 to c_MAX_MII_PER_HUB := 4;
     MII_INIT_DEPTH          : hub_iobuf_config_t := std_HUB_INIT_DEPTH;
     MII_REPLY_DEPTH         : hub_iobuf_config_t := std_HUB_REPLY_DEPTH;
   -- settings for apis

diff --git a/trb_net16_med_tlk.vhd b/trb_net16_med_tlk.vhd
index 04c5cd2075157c84aff9c93a886f2fa58d859f78..3faf6ce19e294d4c4ed08d82ef367d71aee76bac 100644 (file)
--- a/trb_net16_med_tlk.vhd
+++ b/trb_net16_med_tlk.vhd
@@ -179,8 +179,8 @@ begin
   STAT(44 downto 41) <= fifo_status_m;
   STAT(48 downto 45) <= fifo_dout_m(3 downto 0);
   STAT(50 downto 49) <= fifo_dout_m(17 downto 16);
-  STAT(54 downto 51) <= fifo_dout_a(3 downto 0);
-  STAT(56 downto 55) <= fifo_dout_a(17 downto 16);
+  STAT(54 downto 51) <= fifo_din_a(3 downto 0);
+  STAT(56 downto 55) <= fifo_din_a(17 downto 16);
   STAT(63 downto 57) <= (others => '0');
   
   process(CLK)

diff --git a/trb_net16_obuf.vhd b/trb_net16_obuf.vhd
index 77c22ceee1ec81f8a93f81c98a45e061c1cf7de6..8a13851f3819ff6bd2299cfcdee355a3720be4c2 100644 (file)
--- a/trb_net16_obuf.vhd
+++ b/trb_net16_obuf.vhd
@@ -289,7 +289,7 @@ begin
         next_INT_READ_OUT <= '0';
       end if;
 
-      if  sbuf_free = '0' or send_DATA = '0' then
+      if sbuf_free = '0' or send_DATA = '0' then
         next_INT_READ_OUT <= '0';
       end if;
     end process;
@@ -344,7 +344,8 @@ begin
         begin
          if rising_edge(CLK) then
             if RESET = '1' then
-              max_DATA_COUNT_minus_one <= (0 => '1', others => '0');
+              max_DATA_COUNT_minus_one <= (others => '0');
+              max_DATA_COUNT_minus_one(0) <= '1';
             else
               case REC_BUFFER_SIZE_IN is
                 when "-010" => max_DATA_COUNT_minus_one <= conv_std_logic_vector(3, DATA_COUNT_WIDTH);

diff --git a/trb_net16_obuf_nodata.vhd b/trb_net16_obuf_nodata.vhd
index 32d2671f2ec5f8c56c3daee34d6e2b997f3e139c..ae316b287a8c0d9c59e2147f1c4acb31638778fc 100644 (file)
--- a/trb_net16_obuf_nodata.vhd
+++ b/trb_net16_obuf_nodata.vhd
@@ -53,7 +53,7 @@ begin
   MED_PACKET_NUM_OUT <= buf_MED_PACKET_NUM_OUT;
   MED_DATA_OUT <= buf_MED_DATA_OUT;
 
-  process(current_NOP_word, send_ACK, SEND_ACK, current_ACK_word, transfer_counter, MED_READ_IN)
+  process(current_NOP_word, SEND_ACK, current_ACK_word, transfer_counter, MED_READ_IN)
     begin
       next_MED_DATA_OUT <= current_NOP_word;
       next_MED_DATAREADY_OUT <= '0';

diff --git a/trb_net_std.vhd b/trb_net_std.vhd
index 7e0cc306fa25ce5163baf3f0cfe8e87d2c522602..0cc87bd91ef8f41df06362e84370dc18750a5a72 100644 (file)
--- a/trb_net_std.vhd
+++ b/trb_net_std.vhd
@@ -14,7 +14,7 @@ package trb_net_std is
 
   constant c_DATA_WIDTH        : integer   := 16;
   constant c_NUM_WIDTH         : integer   := 2;
-  constant c_MUX_WIDTH         : integer   := 1; --!!!
+  constant c_MUX_WIDTH         : integer   := 3; --!!!
 
 
 --assigning channel names  

diff --git a/xilinx/trb_net_fifo_16bit_bram_dualport_arch.vhd b/xilinx/trb_net_fifo_16bit_bram_dualport_arch.vhd
index f4a4eb3f97593e992a884fe02e3adce414fa28f2..1c90bf08eced97afa4b01871a935bc323fbc813f 100644 (file)
--- a/xilinx/trb_net_fifo_16bit_bram_dualport_arch.vhd
+++ b/xilinx/trb_net_fifo_16bit_bram_dualport_arch.vhd
@@ -39,7 +39,23 @@ use UNISIM.VComponents.all;
 library work;
 use work.trb_net_std.all;
 
-
+entity trb_net_fifo_16bit_bram_dualport is
+   generic(
+     USE_STATUS_FLAGS : integer  := c_YES
+     );
+   port (
+     read_clock_in:   IN  std_logic;
+     write_clock_in:  IN  std_logic;
+     read_enable_in:  IN  std_logic;
+     write_enable_in: IN  std_logic;
+     fifo_gsr_in:     IN  std_logic;
+     write_data_in:   IN  std_logic_vector(17 downto 0);
+     read_data_out:   OUT std_logic_vector(17 downto 0);
+     full_out:        OUT std_logic;
+     empty_out:       OUT std_logic;
+     fifostatus_out:  OUT std_logic_vector(3 downto 0) --counter for 1/16th of fifo
+    ); 
+end entity trb_net_fifo_16bit_bram_dualport;
 
 architecture trb_net_fifo_16bit_bram_dualport_arch of trb_net_fifo_16bit_bram_dualport is
    signal read_clock:            std_logic;