diff options
| author | Matt Ettus <matt@ettus.com> | 2010-06-14 11:59:19 -0700 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-06-14 11:59:19 -0700 |
| commit | 81ad405f9ddecf13e1238bdc53a251b0b71022b5 (patch) | |
| tree | 999d7ebf90ad86e8e56aa8f06a44d5b74fa4833f /usrp2/top/u2_rev3/u2_core.v | |
| parent | fb704918b285a7d039cda27daf35f628442a7dca (diff) | |
| parent | 1935f2a4ed0d0abc90bb3fe7fed745ff84ab6d7c (diff) | |
| download | uhd-81ad405f9ddecf13e1238bdc53a251b0b71022b5.tar.gz uhd-81ad405f9ddecf13e1238bdc53a251b0b71022b5.tar.bz2 uhd-81ad405f9ddecf13e1238bdc53a251b0b71022b5.zip | |
Merge branch 'master' into u2p
* master:
produces good bin files
first attempt at cleaning up the build system
Diffstat (limited to 'usrp2/top/u2_rev3/u2_core.v')
| -rw-r--r--[-rwxr-xr-x] | usrp2/top/u2_rev3/u2_core.v | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usrp2/top/u2_rev3/u2_core.v b/usrp2/top/u2_rev3/u2_core.v index c2e1bab63..b67d8edd6 100755..100644 --- a/usrp2/top/u2_rev3/u2_core.v +++ b/usrp2/top/u2_rev3/u2_core.v @@ -582,8 +582,7 @@ module u2_core .fifo_occupied(dsp_rx_occ),.fifo_full(dsp_rx_full),.fifo_empty(dsp_rx_empty), .debug_rx(debug_rx) ); - // dummy_rx dsp_core_rx - dsp_core_rx dsp_core_rx + dsp_core_rx_old dsp_core_rx_old (.clk(dsp_clk),.rst(dsp_rst), .set_stb(set_stb_dsp),.set_addr(set_addr_dsp),.set_data(set_data_dsp), .adc_a(adc_a),.adc_ovf_a(adc_ovf_a),.adc_b(adc_b),.adc_ovf_b(adc_ovf_b), |