diff options
author | Josh Blum <josh@joshknows.com> | 2011-05-16 11:58:03 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-05-16 11:58:03 -0700 |
commit | 13be023531fa1be8d43b999c3ea5ab477f101fdc (patch) | |
tree | 9a24a949aa0d30b9a992d89c232ae1b812b3c09f /fpga/usrp2/vrt/trigger_context_pkt.v | |
parent | e6e010e02a12359a31e70ac7fe2ae7c39fa3e9d6 (diff) | |
parent | c8565df0e51922443426a0392f5f1fb4e3743ce1 (diff) | |
download | uhd-13be023531fa1be8d43b999c3ea5ab477f101fdc.tar.gz uhd-13be023531fa1be8d43b999c3ea5ab477f101fdc.tar.bz2 uhd-13be023531fa1be8d43b999c3ea5ab477f101fdc.zip |
Merge branch 'use_vita_length' into next
Diffstat (limited to 'fpga/usrp2/vrt/trigger_context_pkt.v')
-rw-r--r-- | fpga/usrp2/vrt/trigger_context_pkt.v | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fpga/usrp2/vrt/trigger_context_pkt.v b/fpga/usrp2/vrt/trigger_context_pkt.v index 226ec45f2..1d456814b 100644 --- a/fpga/usrp2/vrt/trigger_context_pkt.v +++ b/fpga/usrp2/vrt/trigger_context_pkt.v @@ -10,7 +10,7 @@ module trigger_context_pkt wire [15:0] packets; wire [6:0] dummy1; wire [14:0] dummy2; - wire enable_timed, enable_consumed; + wire enable_cycle, enable_consumed; reg [30:0] cycle_count, packet_count; |