summaryrefslogtreecommitdiff
path: root/usrp/fpga/toplevel
diff options
context:
space:
mode:
authorjcorgan2007-11-01 23:56:59 +0000
committerjcorgan2007-11-01 23:56:59 +0000
commit3db1ec114a99512786c4b165d573ed2b10f8d47f (patch)
tree8c823d431a21c9b3d9f9a466f5200e71253f501e /usrp/fpga/toplevel
parenta5f7fe576829f66d1a33ab339f406a9c3b18cf72 (diff)
downloadgnuradio-3db1ec114a99512786c4b165d573ed2b10f8d47f.tar.gz
gnuradio-3db1ec114a99512786c4b165d573ed2b10f8d47f.tar.bz2
gnuradio-3db1ec114a99512786c4b165d573ed2b10f8d47f.zip
Merged r6766:6775 from jcorgan/t195. Fixes ticket:195. NOTE: this removes 8 bit sample width support on receive. Synthesized with 7.1SP1.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6776 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp/fpga/toplevel')
-rw-r--r--usrp/fpga/toplevel/usrp_std/usrp_std.v5
1 files changed, 2 insertions, 3 deletions
diff --git a/usrp/fpga/toplevel/usrp_std/usrp_std.v b/usrp/fpga/toplevel/usrp_std/usrp_std.v
index 4b92cfb16..8b29a9c21 100644
--- a/usrp/fpga/toplevel/usrp_std/usrp_std.v
+++ b/usrp/fpga/toplevel/usrp_std/usrp_std.v
@@ -93,8 +93,7 @@ module usrp_std
wire [2:0] tx_numchan;
wire [7:0] interp_rate, decim_rate;
- wire [15:0] rx_debugbus;
- wire [31:0] tx_debugbus;
+ wire [31:0] tx_debugbus, rx_debugbus;
wire enable_tx, enable_rx;
wire tx_dsp_reset, rx_dsp_reset, tx_bus_reset, rx_bus_reset;
@@ -318,7 +317,7 @@ module usrp_std
.tx_empty(tx_empty),
//.debug_0(rx_a_a),.debug_1(ddc0_in_i),
.debug_0(tx_debugbus[15:0]),.debug_1(tx_debugbus[31:16]),
- .debug_2({rx_sample_strobe,strobe_decim,serial_strobe,serial_addr}),.debug_3({rx_dsp_reset,tx_dsp_reset,rx_bus_reset,tx_bus_reset,enable_rx,tx_underrun,rx_overrun,decim_rate}),
+ .debug_2(rx_debugbus[15:0]),.debug_3(rx_debugbus[31:16]),
.reg_0(reg_0),.reg_1(reg_1),.reg_2(reg_2),.reg_3(reg_3) );
io_pins io_pins