diff options
author | Josh Blum <josh@joshknows.com> | 2012-04-21 11:06:38 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2012-04-21 11:06:38 -0700 |
commit | f84d7579aecaf2a90965331b200f6b298cd0c1d4 (patch) | |
tree | 4787f725f7c6b0a7efd5d91a4719b12f1591e6cc /fpga/usrp2/vrt/vita_tx_deframer.v | |
parent | 20ea7b7bc90c02a61f5284d38d18969b9710302a (diff) | |
parent | 00f515da98ccd2b123e15d7e724a9d91ad5c46d9 (diff) | |
download | uhd-f84d7579aecaf2a90965331b200f6b298cd0c1d4.tar.gz uhd-f84d7579aecaf2a90965331b200f6b298cd0c1d4.tar.bz2 uhd-f84d7579aecaf2a90965331b200f6b298cd0c1d4.zip |
Merge branch 'timed_cmds_work_fpga' into timed_cmds_work
Diffstat (limited to 'fpga/usrp2/vrt/vita_tx_deframer.v')
-rw-r--r-- | fpga/usrp2/vrt/vita_tx_deframer.v | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fpga/usrp2/vrt/vita_tx_deframer.v b/fpga/usrp2/vrt/vita_tx_deframer.v index 6919da11a..ed3916311 100644 --- a/fpga/usrp2/vrt/vita_tx_deframer.v +++ b/fpga/usrp2/vrt/vita_tx_deframer.v @@ -43,10 +43,11 @@ module vita_tx_deframer localparam FIFOWIDTH = 5+64+16+(32*MAXCHAN); - wire [1:0] numchan; + wire [1:0] numchan = 0;/* setting_reg #(.my_addr(BASE), .at_reset(0), .width(2)) sr_numchan (.clk(clk),.rst(reset),.strobe(set_stb),.addr(set_addr), .in(set_data),.out(numchan),.changed()); + */ reg [3:0] vita_state; wire has_streamid, has_classid, has_secs, has_tics, has_trailer; |