diff options
author | Matt Ettus <matt@ettus.com> | 2011-03-27 22:11:51 -0700 |
---|---|---|
committer | Matt Ettus <matt@ettus.com> | 2011-03-27 22:11:51 -0700 |
commit | 81e5fd49a57a6875d89737da3f1c2e203c3fa0b7 (patch) | |
tree | c91e133f2f0a0d5d694bb8d426a65578b9431278 /usrp2/vrt/vita_tx_control.v | |
parent | be2c1b95c1d6f4ad2ea663bb926a04463edb9358 (diff) | |
parent | 8fa7187ca8ea16207e93f27b46406f20f75da8d8 (diff) | |
download | uhd-81e5fd49a57a6875d89737da3f1c2e203c3fa0b7.tar.gz uhd-81e5fd49a57a6875d89737da3f1c2e203c3fa0b7.tar.bz2 uhd-81e5fd49a57a6875d89737da3f1c2e203c3fa0b7.zip |
Merge branch 'master' into next
* master:
u2p: N200 Makefile
u1e: use icarus verilog for lint
clean up a bunch of warnings and incorrect bus widths
Diffstat (limited to 'usrp2/vrt/vita_tx_control.v')
-rw-r--r-- | usrp2/vrt/vita_tx_control.v | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usrp2/vrt/vita_tx_control.v b/usrp2/vrt/vita_tx_control.v index e966d987c..14b97a215 100644 --- a/usrp2/vrt/vita_tx_control.v +++ b/usrp2/vrt/vita_tx_control.v @@ -71,7 +71,7 @@ module vita_tx_control wire [31:0] error_policy; setting_reg #(.my_addr(BASE+3)) sr_error_policy - (.clk(clk),.rst(rst),.strobe(set_stb),.addr(set_addr), + (.clk(clk),.rst(reset),.strobe(set_stb),.addr(set_addr), .in(set_data),.out(error_policy),.changed()); wire policy_wait = error_policy[0]; |