diff options
| author | Matt Ettus <matt@ettus.com> | 2010-01-25 13:24:53 -0800 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-01-25 13:24:53 -0800 |
| commit | 058780d92f776bcba0a384b5e4c4aa948d64c6f4 (patch) | |
| tree | 265ec9cbeb67bdbc0529b22209eb37f57008dc25 /usrp2/vrt | |
| parent | a8ceedc34bb66c870964e4430c098a2cdaf9d429 (diff) | |
| parent | 8d19387a8642caf74179bdcb7eddf1936f473e53 (diff) | |
| download | uhd-058780d92f776bcba0a384b5e4c4aa948d64c6f4.tar.gz uhd-058780d92f776bcba0a384b5e4c4aa948d64c6f4.tar.bz2 uhd-058780d92f776bcba0a384b5e4c4aa948d64c6f4.zip | |
Merge commit '8d19387a8642caf74179bdcb7eddf1936f473e53' into udp
Merge latest VRT changes into UDP branch. Merged from 1 behind the
head of VRT because the head moved things around and confused git
Conflicts:
usrp2/timing/time_64bit.v
usrp2/top/u2_core/u2_core.v
Diffstat (limited to 'usrp2/vrt')
| -rw-r--r-- | usrp2/vrt/vita_tx_control.v | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usrp2/vrt/vita_tx_control.v b/usrp2/vrt/vita_tx_control.v index 6776e26e5..bffc64e52 100644 --- a/usrp2/vrt/vita_tx_control.v +++ b/usrp2/vrt/vita_tx_control.v @@ -29,10 +29,13 @@ module vita_tx_control wire sob = sample_fifo_i[66]; wire send_at = sample_fifo_i[67]; wire now, early, late, too_early; - + + // FIXME ignore too_early for now for timing reasons + assign too_early = 0; time_compare time_compare (.time_now(vita_time), .trigger_time(send_time), .now(now), .early(early), - .late(late), .too_early(too_early)); + .late(late), .too_early()); +// .late(late), .too_early(too_early)); localparam IBS_IDLE = 0; localparam IBS_RUN = 1; // FIXME do we need this? |