*** empty log message ***

diff --git a/trb_net16_hub_streaming_port_sctrl.vhd b/trb_net16_hub_streaming_port_sctrl.vhd
index a8bcad45158bc797e9680dce0d9d9581fe17f630..c4ae61a2443bab7e34ce725fb9886687e4142391 100644 (file)
--- a/trb_net16_hub_streaming_port_sctrl.vhd
+++ b/trb_net16_hub_streaming_port_sctrl.vhd
@@ -336,7 +336,7 @@ begin
       HUB_STAT_GEN       => buf_HUB_STAT_GEN
       );
 
-  hub_ctrl_debug(2 downto 0) <= not ERROR_OK;
+  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;
   TIMER_TICKS_OUT <= timer_ticks;

diff --git a/trb_net_components.vhd b/trb_net_components.vhd
index 7f8af1a3bb693f9450914483386204f763d3ddea..09bf815799a0a4959a147c6adb5366729c74d89f 100644 (file)
--- a/trb_net_components.vhd
+++ b/trb_net_components.vhd
@@ -2308,6 +2308,7 @@ end component;
 component trb_net_onewire is\r
 generic(\r
   USE_TEMPERATURE_READOUT : integer range 0 to 1 := 1;\r
+  PARASITIC_MODE : integer range 0 to 1 := c_NO;\r
   CLK_PERIOD : integer := 10  --clk period in ns\r
   );\r
 port(\r

diff --git a/trb_net_std.vhd b/trb_net_std.vhd
index 7b35e5a901ea81d77714e8642fbb442e82661669..fda449c4c410ff965f5b327dd8a84c6461631327 100644 (file)
--- a/trb_net_std.vhd
+++ b/trb_net_std.vhd
@@ -252,6 +252,15 @@ package body trb_net_std is
           when 1200   => if t(7)  = '1' then i := 1; end if;
           when others => if timer >= time/period then i := 1; end if;
         end case;
+      elsif period = 40 then
+        case time is
+          when 1300000000 => if t(25) = '1' then i := 1; end if;
+          when 640000 => if t(14) = '1' then i := 1; end if;
+          when 80000  => if t(11) = '1' then i := 1; end if;
+          when 10000  => if t(8) = '1' then i := 1; end if;
+          when 1200   => if t(5)  = '1' then i := 1; end if;
+          when others => if timer >= time/period then i := 1; end if;
+        end case;
       else
         if timer = time/period then i := 1; end if;
       end if;