From f6506f8964ad69550a193b57dda1057ed9ef0d27 Mon Sep 17 00:00:00 2001 From: hadeshyp Date: Wed, 12 Sep 2012 17:39:37 +0000 Subject: [PATCH] *** empty log message *** --- trb_net16_hub_streaming_port_sctrl.vhd | 2 +- trb_net_components.vhd | 1 + trb_net_std.vhd | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/trb_net16_hub_streaming_port_sctrl.vhd b/trb_net16_hub_streaming_port_sctrl.vhd index a8bcad4..c4ae61a 100644 --- 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 7f8af1a..09bf815 100644 --- a/trb_net_components.vhd +++ b/trb_net_components.vhd @@ -2308,6 +2308,7 @@ end component; component trb_net_onewire is generic( USE_TEMPERATURE_READOUT : integer range 0 to 1 := 1; + PARASITIC_MODE : integer range 0 to 1 := c_NO; CLK_PERIOD : integer := 10 --clk period in ns ); port( diff --git a/trb_net_std.vhd b/trb_net_std.vhd index 7b35e5a..fda449c 100644 --- 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; -- 2.43.0