*** empty log message ***

diff --git a/trb_net16_hub_func.vhd b/trb_net16_hub_func.vhd
index 4f015a2673402e63cd97695b22d81109d1cdb8c8..2577eb46d696825a0ff550a2b76c607585fc7512 100644 (file)
--- a/trb_net16_hub_func.vhd
+++ b/trb_net16_hub_func.vhd
@@ -191,6 +191,7 @@ component trb_net16_hub_streaming_port is
     COMPILE_TIME            : std_logic_vector(31 downto 0) := x"00000000";
     COMPILE_VERSION         : std_logic_vector(15 downto 0) := x"0001";
     HARDWARE_VERSION        : std_logic_vector(31 downto 0) := x"12345678";
+    INIT_ENDPOINT_ID        : std_logic_vector(15 downto 0)  := x"0001";
     CLOCK_FREQUENCY         : integer range 1 to 200 := 100;
     USE_ONEWIRE             : integer range 0 to 2 := c_YES;
   --media interfaces

diff --git a/trb_net16_hub_ipu_logic.vhd b/trb_net16_hub_ipu_logic.vhd
index 695cf15e65497516bb0d430f8c8471786edbf352..8d7d015f1c6f6daf1c4170dd304c531bfdb18c63 100644 (file)
--- a/trb_net16_hub_ipu_logic.vhd
+++ b/trb_net16_hub_ipu_logic.vhd
@@ -196,6 +196,10 @@ architecture trb_net16_hub_ipu_logic_arch of trb_net16_hub_ipu_logic is
   signal timeout_counter_reset : std_logic_vector(POINT_NUMBER-1 downto 0);
   signal connection_timed_out  : std_logic_vector(POINT_NUMBER-1 downto 0);
 
+  signal saved_auto_reading_DHDR      : std_logic_vector(POINT_NUMBER-1 downto 0);
+  signal last_REPLY_PACKET_NUM_IN     : std_logic_vector(POINT_NUMBER*3-1 downto 0);
+
+
 begin
 
 ----------------------------------
@@ -469,20 +473,63 @@ begin
       end process;
 
 
---Problematic stuff here... needing reply_packet_num_in to determine read_out ...
-    PROC_auto_read_DHDR : process(current_reply_reading_DHDR, current_reply_reading_HDR, REPLY_PACKET_NUM_IN)
+
+    PROC_last_reply_packet_num : process(CLK)
+      begin
+        if rising_edge(CLK) then
+          if REPLY_DATAREADY_IN(i) = '1' and buf_REPLY_READ_OUT(i) = '1' then
+            last_REPLY_PACKET_NUM_IN(i*c_NUM_WIDTH+2 downto i*c_NUM_WIDTH) <= REPLY_PACKET_NUM_IN(i*c_NUM_WIDTH+2 downto i*c_NUM_WIDTH);
+          end if;
+        end if;
+      end process;
+
+
+    PROC_save_auto_reading_DHDR : process(CLK)
+      begin
+        if rising_edge(CLK) then
+          saved_auto_reading_DHDR(i) <= reg_current_reply_auto_reading_DHDR(i);
+        end if;
+      end process;
+
+
+    PROC_auto_read_DHDR : process(reg_current_reply_reading_HDR, enable_packing,
+                                  last_REPLY_PACKET_NUM_IN, saved_auto_reading_DHDR)
       begin
-        if (reg_current_reply_reading_DHDR(i) = '1' and REPLY_PACKET_NUM_IN(i*c_NUM_WIDTH+1) = '0')  --reg_
-            or reg_current_reply_reading_HDR(i) = '1' then  --reg_
+        reg_current_reply_auto_reading_DHDR(i) <= '0';
+        if reg_current_reply_reading_HDR(i) = '1' then
           reg_current_reply_auto_reading_DHDR(i) <= '1';
-        else
-          reg_current_reply_auto_reading_DHDR(i) <= '0';
+        elsif reg_current_reply_reading_DHDR(i) = '1' then
+--           if enable_packing = '0' then
+            if    last_REPLY_PACKET_NUM_IN(i*3+2 downto i*3) = c_F1
+               or last_REPLY_PACKET_NUM_IN(i*3+2 downto i*3) = c_F2
+               or last_REPLY_PACKET_NUM_IN(i*3+2 downto i*3) = c_F3 then
+              reg_current_reply_auto_reading_DHDR(i) <= '0';
+            else
+              reg_current_reply_auto_reading_DHDR(i) <= '1';
+            end if;
+--           else
+--             if last_REPLY_PACKET_NUM_IN(i*3+2 downto i*3) = c_F3 then
+--               reg_current_reply_auto_reading_DHDR(i) <= '0';
+--             else
+--               reg_current_reply_auto_reading_DHDR(i) <= '1';
+--             end if;
+--           end if;
         end if;
       end process;
 
   end generate;
 
 
+
+--         if (reg_current_reply_reading_DHDR(i) = '1'
+--              and (last_REPLY_PACKET_NUM_IN(i*c_NUM_WIDTH+1) = '0')
+--             or reg_current_reply_reading_HDR(i) = '1' then
+--           reg_current_reply_auto_reading_DHDR(i) <= '1';
+--         else
+--           reg_current_reply_auto_reading_DHDR(i) <= '0';
+--         end if;
+
+
 ----------------------------------
 --Check for Timeouts
 ----------------------------------
@@ -896,7 +943,7 @@ begin
               comb_REPLY_POOL_DATAREADY <= REPLY_POOL_next_read;
             when c_F2 =>
               comb_REPLY_POOL_DATAREADY <= '0';
-              if not_reading_HDR = '1' then --implicit not waiting_for_reply
+              if not_reading_HDR = '1' and got_all_DHDR = '1' then --implicit not waiting_for_reply
                 next_state <= GEN_LENGTH;
                 next_reply_adder_start <= '1';
               end if;
@@ -905,7 +952,11 @@ begin
 
         when GEN_LENGTH =>  --now, all HDR are stored, calc sum of HDR lengths
           dhdr_addr <= "010";
-          next_reply_adder_final_result <= std_logic_vector(unsigned(reply_adder_result) - number_of_replies + 2);
+--           if enable_packing = '0' then
+            next_reply_adder_final_result <= std_logic_vector(unsigned(reply_adder_result) - number_of_replies + 2);
+--           else
+--             next_reply_adder_final_result <= std_logic_vector(unsigned(reply_adder_result) - number_of_replies - number_of_replies + 2);
+--           end if;
           comb_REPLY_POOL_DATAREADY <= '0';
 
           case packet_counter is
@@ -948,7 +999,11 @@ begin
               end if;
             when c_F2 =>
               dhdr_addr <= "110";
-              next_reply_adder_final_result <= std_logic_vector(unsigned(reply_adder_result) + number_of_replies);
+--               if enable_packing = '0' then
+                next_reply_adder_final_result <= std_logic_vector(unsigned(reply_adder_result) + number_of_replies);
+--               else
+--                 next_reply_adder_final_result <= std_logic_vector(unsigned(reply_adder_result));
+--               end if;
               if last_reply_adder_ready = '1' then
                 comb_REPLY_POOL_DATA <= reply_adder_final_result;
                 comb_REPLY_POOL_DATAREADY <= REPLY_POOL_next_read;

diff --git a/trb_net16_hub_streaming_port.vhd b/trb_net16_hub_streaming_port.vhd
index e174e6669260108819b87f72f8d0495f80fe44d0..1b338ba77917c23c6d89af1cebbf36b0de5fa61c 100644 (file)
--- a/trb_net16_hub_streaming_port.vhd
+++ b/trb_net16_hub_streaming_port.vhd
@@ -24,6 +24,7 @@ entity trb_net16_hub_streaming_port is
     COMPILE_TIME            : std_logic_vector(31 downto 0) := x"00000000";
     COMPILE_VERSION         : std_logic_vector(15 downto 0) := x"0001";
     HARDWARE_VERSION        : std_logic_vector(31 downto 0) := x"12345678";
+    INIT_ENDPOINT_ID        : std_logic_vector(15 downto 0)  := x"0001";
     CLOCK_FREQUENCY         : integer range 1 to 200 := 100;
     USE_ONEWIRE             : integer range 0 to 2 := c_YES;
   --media interfaces
@@ -209,6 +210,7 @@ begin
       MII_IBUF_DEPTH          => MII_IBUF_DEPTH,
       MII_IS_UPLINK           => MII_IS_UPLINK,
       MII_IS_DOWNLINK         => MII_IS_DOWNLINK,
+      INIT_ENDPOINT_ID        => INIT_ENDPOINT_ID,
       INT_NUMBER              => 3,
       INT_CHANNELS            => (0=>0,1=>1,2=>3,others=>0)
       )