diff options
| author | Josh Blum <josh@joshknows.com> | 2011-05-09 16:47:04 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-05-09 16:47:04 -0700 |
| commit | 91e32eaea25b023ec33b0efc80a653dac5a676df (patch) | |
| tree | 0b1841b9a95a8ff22e47ec48387decd4005ca8db /fpga/usrp2/vrt/trigger_context_pkt.v | |
| parent | 9daf1f0a7be5f6a2cc220e0c2f746e65dc649568 (diff) | |
| parent | d8aae182ffdafdd61bbd0100f845d7c93e6ec591 (diff) | |
| download | uhd-91e32eaea25b023ec33b0efc80a653dac5a676df.tar.gz uhd-91e32eaea25b023ec33b0efc80a653dac5a676df.tar.bz2 uhd-91e32eaea25b023ec33b0efc80a653dac5a676df.zip | |
Merge branch 'next' into use_vita_length
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; |