]> jspc29.x-matter.uni-frankfurt.de Git - trbnet.git/commitdiff
*** empty log message ***
authorhadeshyp <hadeshyp>
Fri, 9 Dec 2011 13:16:40 +0000 (13:16 +0000)
committerhadeshyp <hadeshyp>
Fri, 9 Dec 2011 13:16:40 +0000 (13:16 +0000)
trb_net16_hub_base.vhd
trb_net16_hub_func.vhd
trb_net16_hub_streaming_port_sctrl.vhd

index a8572f431376341e150da111f55dc4f8be395723..c8843a8f65b7bb1d185668f9c0765d99161d15df 100644 (file)
@@ -1660,7 +1660,9 @@ HUB_MED_CONNECTED(31 downto MII_NUMBER) <= (others => '1');
   STAT_CTRL_REGS        <= HC_CTRL_REGS(255 downto 0);
   HUB_STAT_CHANNEL      <= buf_HUB_STAT_CHANNEL;
   STAT_DEBUG            <= buf_STAT_DEBUG;
-  HUB_STAT_GEN          <= (others => '0');
+  
+  HUB_STAT_GEN(3 downto 0)  <= HUB_locked;
+  HUB_STAT_GEN(31 downto 4) <= (others => '0');
 
   TIMER_TICKS_OUT(0) <= timer_us_tick;
   TIMER_TICKS_OUT(1) <= timer_us_tick;
index 3bc99b1c5a674598b5feb40ad80822fc982ec01e..e27b99f0d879b46ee8f2adeb6e111c60b95543cc 100644 (file)
@@ -680,7 +680,8 @@ component trb_net16_hub_streaming_port_sctrl is
     GSC_REPLY_DATA_OUT           : out std_logic_vector(15 downto 0);
     GSC_REPLY_PACKET_NUM_OUT     : out std_logic_vector(2 downto 0);
     GSC_REPLY_READ_IN            : in  std_logic;
-
+    GSC_BUSY_OUT                 : out std_logic;
+    
   --status and control ports
     HUB_STAT_CHANNEL             : out std_logic_vector (2**(c_MUX_WIDTH-1)*16-1 downto 0);
     HUB_STAT_GEN                 : out std_logic_vector (31 downto 0);
index eac5703eeb12578ac9867230eb15a4bf07c7296c..babd31f0aac7cf3217c1e86af5660e0068d77988 100644 (file)
@@ -120,6 +120,7 @@ entity trb_net16_hub_streaming_port_sctrl is
     GSC_REPLY_DATA_OUT           : out std_logic_vector(15 downto 0);
     GSC_REPLY_PACKET_NUM_OUT     : out std_logic_vector(2 downto 0);
     GSC_REPLY_READ_IN            : in  std_logic;
+    GSC_BUSY_OUT                 : out std_logic;
 
   --status and control ports
     HUB_STAT_CHANNEL             : out std_logic_vector (2**(c_MUX_WIDTH-1)*16-1 downto 0);
@@ -193,6 +194,7 @@ signal hub_make_network_reset : std_logic;
 signal hub_got_network_reset  : std_logic;
 signal timer_ticks            : std_logic_vector(1 downto 0);
 signal hub_ctrl_debug         : std_logic_vector(31 downto 0);
+signal buf_HUB_STAT_GEN       : std_logic_vector(31 downto 0);
 
 begin
 
@@ -318,12 +320,13 @@ begin
       COMMON_STAT_REGS   => common_stat,
       MPLEX_CTRL         => (others => '0'),
       CTRL_DEBUG         => hub_ctrl_debug,
-      STAT_DEBUG         => STAT_DEBUG
+      STAT_DEBUG         => STAT_DEBUG,
+      HUB_STAT_GEN       => buf_HUB_STAT_GEN
       );
 
   hub_ctrl_debug(2 downto 0) <= not io_error_in;
   hub_ctrl_debug(31 downto 3) <= (others => '0');
-
+  HUB_STAT_GEN <= buf_HUB_STAT_GEN;
 ---------------------------------------------------------------------
 -- I/O Buffers
 ---------------------------------------------------------------------
@@ -645,6 +648,7 @@ begin
     GSC_REPLY_DATA_OUT                    <= hub_reply_data_out(63 downto 48);
     GSC_REPLY_PACKET_NUM_OUT              <= hub_reply_packet_num_out(11 downto 9);
     hub_reply_read_in(3)                  <= GSC_REPLY_READ_IN;       
+    GSC_BUSY_OUT                          <= buf_HUB_STAT_GEN(3);
 
 ---------------------------------------------------------------------
 -- Debug